AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SkBicubicImageFilter, and all related tests.

Browse Source 
Now that we have SkResizeImageFilter, and the bicubic
resizing is part of skia proper, there's no need for a
specialized image filter.

BUG=skia:
R=bsalomon@google.com

Author: senorblanco@chromium.org

Review URL: https://codereview.chromium.org/357793002
This commit is contained in:
senorblanco 2014-06-25 14:39:05 -07:00 committed by Commit bot
parent f372321de3
commit 7bf1068473
71 changed files with 59 additions and 3101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bench/BicubicBench.cpp
View File

@ -1,58 +0,0 @@
/*
* Copyright 2013 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "Benchmark.h"
#include "SkBicubicImageFilter.h"
#include "SkCanvas.h"
#include "SkShader.h"
#include "SkString.h"
// This bench exercises SkBicubicImageFilter, upsampling a 40x40 input to
// 100x100, 400x100, 100x400, and 400x400.
class BicubicBench : public Benchmark {
SkSize fScale;
SkString fName;
public:
BicubicBench(float x, float y)
: fScale(SkSize::Make(x, y)) {
fName.printf("bicubic_%gx%g",
SkScalarToFloat(fScale.fWidth), SkScalarToFloat(fScale.fHeight));
}
protected:
virtual const char* onGetName() {
return fName.c_str();
}
virtual void onDraw(const int loops, SkCanvas* canvas) {
SkPaint paint;
this->setupPaint(&paint);
paint.setAntiAlias(true);
SkRect r = SkRect::MakeWH(40, 40);
SkAutoTUnref<SkImageFilter> bicubic(SkBicubicImageFilter::CreateMitchell(fScale));
paint.setImageFilter(bicubic);
for (int i = 0; i < loops; i++) {
canvas->save();
canvas->clipRect(r);
canvas->drawOval(r, paint);
canvas->restore();
}
}
private:
typedef Benchmark INHERITED;
};
DEF_BENCH( return new BicubicBench(10.0f, 10.0f); )
DEF_BENCH( return new BicubicBench(2.5f, 10.0f); )
DEF_BENCH( return new BicubicBench(10.0f, 2.5f); )
DEF_BENCH( return new BicubicBench(2.5f, 2.5f); )

26
expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
View File

@ -195,30 +195,6 @@
],
"ignore-failure": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -7393,4 +7369,4 @@
"reviewed-by-human": true
}
}
}
}

26
expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
View File

@ -195,30 +195,6 @@
],
"ignore-failure": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -7385,4 +7361,4 @@
"reviewed-by-human": true
}
}
}
}

38
expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
View File

@ -275,42 +275,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
17080656068138564372
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -9187,4 +9151,4 @@
"reviewed-by-human": true
}
}
}
}

38
expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
View File

@ -275,42 +275,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
17080656068138564372
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -9185,4 +9149,4 @@
"reviewed-by-human": true
}
}
}
}

47
expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
View File

@ -396,51 +396,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -13330,4 +13285,4 @@
"reviewed-by-human": false
}
}
}
}

47
expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
View File

@ -396,51 +396,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -13330,4 +13285,4 @@
"reviewed-by-human": false
}
}
}
}

44
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
View File

@ -350,48 +350,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
7986799885106602241
]
],
"reviewed-by-human": true
},
"bicubicfilter_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
7986799885106602241
]
],
"reviewed-by-human": true
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -11759,4 +11717,4 @@
"reviewed-by-human": true
}
}
}
}

44
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
View File

@ -350,48 +350,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
7986799885106602241
]
],
"reviewed-by-human": true
},
"bicubicfilter_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
7986799885106602241
]
],
"reviewed-by-human": true
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -11759,4 +11717,4 @@
"reviewed-by-human": true
}
}
}
}

38
expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
View File

@ -261,42 +261,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12488185918270960759
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -9451,4 +9415,4 @@
"reviewed-by-human": true
}
}
}
}

38
expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
View File

@ -261,42 +261,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12488185918270960759
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -9451,4 +9415,4 @@
"reviewed-by-human": true
}
}
}
}

35
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
View File

@ -261,39 +261,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
9345454686226166633
]
],
"reviewed-by-human": true
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -8705,4 +8672,4 @@
"reviewed-by-human": true
}
}
}
}

35
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
View File

@ -261,39 +261,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
9345454686226166633
]
],
"reviewed-by-human": true
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -8705,4 +8672,4 @@
"reviewed-by-human": true
}
}
}
}

26
expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
View File

@ -218,30 +218,6 @@
]
]
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -7367,4 +7343,4 @@
"reviewed-by-human": true
}
}
}
}

26
expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
View File

@ -218,30 +218,6 @@
]
]
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -7367,4 +7343,4 @@
"reviewed-by-human": true
}
}
}
}

50
expectations/gm/Test-Android-RazrI-SGX540-x86-Debug/expected-results.json
View File

@ -294,54 +294,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13582928607956785164
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
4845416958200328807
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bigmatrix_565.png": {
"allowed-digests": [
[
@ -10903,4 +10855,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Android-RazrI-SGX540-x86-Release/expected-results.json
View File

@ -294,54 +294,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13582928607956785164
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
4845416958200328807
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bigmatrix_565.png": {
"allowed-digests": [
[
@ -10855,4 +10807,4 @@
"reviewed-by-human": false
}
}
}
}

35
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
View File

@ -273,39 +273,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
2270603732178876438
]
],
"reviewed-by-human": true
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -8785,4 +8752,4 @@
"reviewed-by-human": true
}
}
}
}

35
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
View File

@ -273,39 +273,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1759
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
2270603732178876438
]
],
"reviewed-by-human": true
},
"bigblurs_565.png": {
"allowed-digests": [
[
@ -8785,4 +8752,4 @@
"reviewed-by-human": true
}
}
}
}

20
expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
View File

@ -132,24 +132,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": true
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -6458,4 +6440,4 @@
"reviewed-by-human": false
}
}
}
}

20
expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
View File

@ -132,24 +132,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": true
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -6450,4 +6432,4 @@
"reviewed-by-human": false
}
}
}
}

26
expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
View File

@ -138,30 +138,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -6624,4 +6600,4 @@
"reviewed-by-human": false
}
}
}
}

26
expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
View File

@ -138,30 +138,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -6624,4 +6600,4 @@
"reviewed-by-human": false
}
}
}
}

26
expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
View File

@ -138,30 +138,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -6618,4 +6594,4 @@
"reviewed-by-human": false
}
}
}
}

26
expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
View File

@ -138,30 +138,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -6618,4 +6594,4 @@
"reviewed-by-human": false
}
}
}
}

26
expectations/gm/Test-Linux-Bare-NoGPU-Arm8_64-Debug/expected-results.json
View File

@ -131,30 +131,6 @@
"ignore-failure": false,
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -6309,4 +6285,4 @@
"reviewed-by-human": true
}
}
}
}

62
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
View File

@ -412,66 +412,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -16688,4 +16628,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
View File

@ -364,54 +364,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -15264,4 +15216,4 @@
"reviewed-by-human": false
}
}
}
}

62
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
View File

@ -412,66 +412,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -16679,4 +16619,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
View File

@ -352,54 +352,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -14469,4 +14421,4 @@
"reviewed-by-human": false
}
}
}
}

62
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
View File

@ -412,66 +412,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -17208,4 +17148,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
View File

@ -376,54 +376,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -15876,4 +15828,4 @@
"reviewed-by-human": false
}
}
}
}

62
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
View File

@ -412,66 +412,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -17216,4 +17156,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
View File

@ -352,54 +352,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -15036,4 +14988,4 @@
"reviewed-by-human": false
}
}
}
}

62
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
View File

@ -390,66 +390,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -16380,4 +16320,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
View File

@ -366,54 +366,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -15331,4 +15283,4 @@
"reviewed-by-human": false
}
}
}
}

62
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
View File

@ -390,66 +390,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -16380,4 +16320,4 @@
"reviewed-by-human": false
}
}
}
}

59
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
View File

@ -384,63 +384,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-mac.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12055561269186852835
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-native.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10563148403190576093
]
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -16957,4 +16900,4 @@
"reviewed-by-human": false
}
}
}
}

65
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
View File

@ -480,69 +480,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": true
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12332389189099053788
]
],
"reviewed-by-human": true
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19292,4 +19229,4 @@
"reviewed-by-human": true
}
}
}
}

65
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
View File

@ -480,69 +480,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": true
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12332389189099053788
]
],
"reviewed-by-human": true
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19520,4 +19457,4 @@
"reviewed-by-human": true
}
}
}
}

71
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
View File

@ -514,75 +514,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12332389189099053788
]
],
"reviewed-by-human": true
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19563,4 +19494,4 @@
"reviewed-by-human": true
}
}
}
}

71
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
View File

@ -514,75 +514,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
2325
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12332389189099053788
]
],
"reviewed-by-human": true
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19661,4 +19592,4 @@
"reviewed-by-human": true
}
}
}
}

38
expectations/gm/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
View File

@ -226,42 +226,6 @@
],
"reviewed-by-human": false
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -10851,4 +10815,4 @@
"reviewed-by-human": false
}
}
}
}

62
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
View File

@ -426,66 +426,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
5515466835202955433
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
17527609633242467013
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_angle.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -15471,4 +15411,4 @@
"reviewed-by-human": false
}
}
}
}

44
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
View File

@ -304,48 +304,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": true
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -12578,4 +12536,4 @@
"reviewed-by-human": false
}
}
}
}

44
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
View File

@ -302,48 +302,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": true
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -12559,4 +12517,4 @@
"reviewed-by-human": false
}
}
}
}

62
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
View File

@ -426,66 +426,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
5515466835202955433
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
17527609633242467013
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_angle.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -15463,4 +15403,4 @@
"reviewed-by-human": false
}
}
}
}

44
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
View File

@ -304,48 +304,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"reviewed-by-human": true
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -12571,4 +12529,4 @@
"reviewed-by-human": false
}
}
}
}

44
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
View File

@ -288,48 +288,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10856972031325180110
]
],
"reviewed-by-human": true
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
2608489731912387182
]
],
"reviewed-by-human": true
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
8154155218608892427
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13916889568279826355
]
],
"bugs": [
2146
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -12731,4 +12689,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
View File

@ -301,54 +301,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -12655,4 +12607,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
View File

@ -301,54 +301,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10573214378214332517
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1578
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -12655,4 +12607,4 @@
"reviewed-by-human": false
}
}
}
}

71
expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
View File

@ -501,75 +501,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19971,4 +19902,4 @@
"reviewed-by-human": false
}
}
}
}

71
expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
View File

@ -501,75 +501,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19963,4 +19894,4 @@
"reviewed-by-human": false
}
}
}
}

71
expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
View File

@ -501,75 +501,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19969,4 +19900,4 @@
"reviewed-by-human": false
}
}
}
}

71
expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
View File

@ -501,75 +501,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
16647433105813638439
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
14528482862946863016
]
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -19970,4 +19901,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
View File

@ -315,54 +315,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
15950576281929256616
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -13680,4 +13632,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
View File

@ -315,54 +315,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
15950576281929256616
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -13672,4 +13624,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
View File

@ -315,54 +315,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
15950576281929256616
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -13678,4 +13630,4 @@
"reviewed-by-human": false
}
}
}
}

50
expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
View File

@ -315,54 +315,6 @@
],
"reviewed-by-human": true
},
"bicubicfilter_565.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
13864700347231029854
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
10469536215464879914
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
15950576281929256616
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bicubicfilter_pdf-poppler.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
12297352892272012287
]
],
"bugs": [
1935
],
"reviewed-by-human": false
},
"bigbitmaprect_i_565.png": {
"allowed-digests": [
[
@ -13678,4 +13630,4 @@
"reviewed-by-human": false
}
}
}
}

1
experimental/webtry/templates/template.cpp
View File

@ -10,7 +10,6 @@
#include "SkArithmeticMode.h"
#include "SkAvoidXfermode.h"
#include "SkBBHFactory.h"
#include "SkBicubicImageFilter.h"
#include "SkBitmapDevice.h"
#include "SkBitmap.h"
#include "SkBitmapSource.h"

86
gm/bicubicfilter.cpp
View File

@ -1,86 +0,0 @@
/*
* Copyright 2013 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "gm.h"
#include "SkColor.h"
#include "SkBicubicImageFilter.h"
namespace skiagm {
class BicubicGM : public GM {
public:
BicubicGM() : fInitialized(false) {
this->setBGColor(0x00000000);
}
protected:
virtual uint32_t onGetFlags() const SK_OVERRIDE {
return kSkipTiled_Flag;
}
virtual SkString onShortName() {
return SkString("bicubicfilter");
}
void make_checkerboard(int width, int height) {
SkASSERT(width % 2 == 0);
SkASSERT(height % 2 == 0);
fCheckerboard.allocN32Pixels(width, height);
for (int y = 0; y < height; y += 2) {
SkPMColor* s = fCheckerboard.getAddr32(0, y);
for (int x = 0; x < width; x += 2) {
*s++ = 0xFFFFFFFF;
*s++ = 0xFF000000;
}
s = fCheckerboard.getAddr32(0, y + 1);
for (int x = 0; x < width; x += 2) {
*s++ = 0xFF000000;
*s++ = 0xFFFFFFFF;
}
}
}
virtual SkISize onISize() {
return SkISize::Make(400, 300);
}
virtual void onDraw(SkCanvas* canvas) {
if (!fInitialized) {
make_checkerboard(4, 4);
fInitialized = true;
}
SkScalar sk32 = SkIntToScalar(32);
canvas->clear(0x00000000);
SkPaint bilinearPaint, bicubicPaint;
SkSize scale = SkSize::Make(sk32, sk32);
canvas->save();
canvas->scale(sk32, sk32);
bilinearPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
canvas->drawBitmap(fCheckerboard, 0, 0, &bilinearPaint);
canvas->restore();
SkAutoTUnref<SkImageFilter> bicubic(SkBicubicImageFilter::CreateMitchell(scale));
bicubicPaint.setImageFilter(bicubic);
SkRect srcBounds;
fCheckerboard.getBounds(&srcBounds);
canvas->translate(SkIntToScalar(140), 0);
canvas->saveLayer(&srcBounds, &bicubicPaint);
canvas->drawBitmap(fCheckerboard, 0, 0);
canvas->restore();
}
private:
typedef GM INHERITED;
SkBitmap fCheckerboard;
bool fInitialized;
};
//////////////////////////////////////////////////////////////////////////////
static GM* MyFactory(void*) { return new BicubicGM; }
static GMRegistry reg(MyFactory);
}

1
gyp/bench.gypi
View File

@ -23,7 +23,6 @@
'../bench/Benchmark.h',
'../bench/AAClipBench.cpp',
'../bench/BicubicBench.cpp',
'../bench/BitmapBench.cpp',
'../bench/BitmapRectBench.cpp',
'../bench/BitmapScaleBench.cpp',

1
gyp/effects.gypi
View File

@ -12,7 +12,6 @@
'<(skia_src_path)/effects/SkAlphaThresholdFilter.cpp',
'<(skia_src_path)/effects/SkArithmeticMode.cpp',
'<(skia_src_path)/effects/SkAvoidXfermode.cpp',
'<(skia_src_path)/effects/SkBicubicImageFilter.cpp',
'<(skia_src_path)/effects/SkBitmapSource.cpp',
'<(skia_src_path)/effects/SkBlurDrawLooper.cpp',
'<(skia_src_path)/effects/SkBlurMask.cpp',

1
gyp/gmslides.gypi
View File

@ -18,7 +18,6 @@
'../gm/arcofzorro.cpp',
'../gm/arithmode.cpp',
'../gm/beziereffects.cpp',
'../gm/bicubicfilter.cpp',
'../gm/bigblurs.cpp',
'../gm/bigmatrix.cpp',
'../gm/bigtext.cpp',

1
gyp/public_headers.gypi
View File

@ -76,7 +76,6 @@
'effects/SkLumaColorFilter.h',
'effects/SkRectShaderImageFilter.h',
'effects/SkMagnifierImageFilter.h',
'effects/SkBicubicImageFilter.h',
'effects/SkPorterDuff.h',
'effects/SkBlurImageFilter.h',
'effects/SkTableMaskFilter.h',

56
include/effects/SkBicubicImageFilter.h
View File

@ -1,56 +0,0 @@
/*
* Copyright 2013 The Android Open Source Project
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkBicubicImageFilter_DEFINED
#define SkBicubicImageFilter_DEFINED
#include "SkImageFilter.h"
#include "SkScalar.h"
#include "SkSize.h"
#include "SkPoint.h"
/*! \class SkBicubicImageFilter
Bicubic resampling image filter. This filter does a 16-tap bicubic
filter using the given matrix.
*/
class SK_API SkBicubicImageFilter : public SkImageFilter {
public:
virtual ~SkBicubicImageFilter();
static SkBicubicImageFilter* CreateMitchell(const SkSize& scale, SkImageFilter* input = NULL);
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBicubicImageFilter)
protected:
/** Construct a (scaling-only) bicubic resampling image filter.
@param scale How much to scale the image.
@param coefficients The 16 coefficients of the bicubic matrix.
@param input The input image filter. If NULL, the src bitmap
passed to filterImage() is used instead.
*/
SkBicubicImageFilter(const SkSize& scale, const SkScalar coefficients[16],
SkImageFilter* input = NULL);
SkBicubicImageFilter(SkReadBuffer& buffer);
virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
#if SK_SUPPORT_GPU
virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
#endif
private:
SkSize fScale;
SkScalar fCoefficients[16];
typedef SkImageFilter INHERITED;
};
#endif

7
samplecode/SampleFilterFuzz.cpp
View File

@ -6,7 +6,6 @@
*/
#include "SampleCode.h"
#include "SkAlphaThresholdFilter.h"
#include "SkBicubicImageFilter.h"
#include "SkBitmapDevice.h"
#include "SkBitmapSource.h"
#include "SkBlurImageFilter.h"
@ -235,7 +234,7 @@ static SkImageFilter* make_image_filter(bool canBeNull = true) {
// Add a 1 in 3 chance to get a NULL input
if (canBeNull && (R(3) == 1)) { return filter; }
enum { ALPHA_THRESHOLD, BICUBIC, MERGE, COLOR, BLUR, MAGNIFIER,
enum { ALPHA_THRESHOLD, MERGE, COLOR, BLUR, MAGNIFIER,
DOWN_SAMPLE, XFERMODE, OFFSET, MATRIX, MATRIX_CONVOLUTION, COMPOSE,
DISTANT_LIGHT, POINT_LIGHT, SPOT_LIGHT, NOISE, DROP_SHADOW,
MORPHOLOGY, BITMAP, DISPLACE, TILE, PICTURE, NUM_FILTERS };
@ -244,10 +243,6 @@ static SkImageFilter* make_image_filter(bool canBeNull = true) {
case ALPHA_THRESHOLD:
filter = SkAlphaThresholdFilter::Create(make_region(), make_scalar(), make_scalar());
break;
case BICUBIC:
// Scale is set to 1 here so that it can fit in the DAG without resizing the output
filter = SkBicubicImageFilter::CreateMitchell(SkSize::Make(1, 1), make_image_filter());
break;
case MERGE:
filter = SkMergeImageFilter::Create(make_image_filter(), make_image_filter(), make_xfermode());
break;

204
src/effects/SkBicubicImageFilter.cpp
View File

@ -1,204 +0,0 @@
/*
* Copyright 2013 The Android Open Source Project
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SkBicubicImageFilter.h"
#include "SkBitmap.h"
#include "SkColorPriv.h"
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
#include "SkMatrix.h"
#include "SkRect.h"
#include "SkUnPreMultiply.h"
#if SK_SUPPORT_GPU
#include "effects/GrBicubicEffect.h"
#include "GrContext.h"
#include "GrTexture.h"
#endif
#define DS(x) SkDoubleToScalar(x)
static const SkScalar gMitchellCoefficients[16] = {
DS( 1.0 / 18.0), DS(-9.0 / 18.0), DS( 15.0 / 18.0), DS( -7.0 / 18.0),
DS(16.0 / 18.0), DS( 0.0 / 18.0), DS(-36.0 / 18.0), DS( 21.0 / 18.0),
DS( 1.0 / 18.0), DS( 9.0 / 18.0), DS( 27.0 / 18.0), DS(-21.0 / 18.0),
DS( 0.0 / 18.0), DS( 0.0 / 18.0), DS( -6.0 / 18.0), DS( 7.0 / 18.0),
};
SkBicubicImageFilter::SkBicubicImageFilter(const SkSize& scale, const SkScalar coefficients[16], SkImageFilter* input)
: INHERITED(input),
fScale(scale) {
memcpy(fCoefficients, coefficients, sizeof(fCoefficients));
}
SkBicubicImageFilter* SkBicubicImageFilter::CreateMitchell(const SkSize& scale,
SkImageFilter* input) {
return SkNEW_ARGS(SkBicubicImageFilter, (scale, gMitchellCoefficients, input));
}
SkBicubicImageFilter::SkBicubicImageFilter(SkReadBuffer& buffer)
: INHERITED(1, buffer) {
SkDEBUGCODE(bool success =) buffer.readScalarArray(fCoefficients, 16);
SkASSERT(success);
fScale.fWidth = buffer.readScalar();
fScale.fHeight = buffer.readScalar();
buffer.validate(SkScalarIsFinite(fScale.fWidth) &&
SkScalarIsFinite(fScale.fHeight) &&
(fScale.fWidth >= 0) &&
(fScale.fHeight >= 0));
}
void SkBicubicImageFilter::flatten(SkWriteBuffer& buffer) const {
this->INHERITED::flatten(buffer);
buffer.writeScalarArray(fCoefficients, 16);
buffer.writeScalar(fScale.fWidth);
buffer.writeScalar(fScale.fHeight);
}
SkBicubicImageFilter::~SkBicubicImageFilter() {
}
inline SkPMColor cubicBlend(const SkScalar c[16], SkScalar t, SkPMColor c0, SkPMColor c1, SkPMColor c2, SkPMColor c3) {
SkScalar t2 = t * t, t3 = t2 * t;
SkScalar cc[4];
// FIXME: For the fractx case, this should be refactored out of this function.
cc[0] = c[0] + SkScalarMul(c[1], t) + SkScalarMul(c[2], t2) + SkScalarMul(c[3], t3);
cc[1] = c[4] + SkScalarMul(c[5], t) + SkScalarMul(c[6], t2) + SkScalarMul(c[7], t3);
cc[2] = c[8] + SkScalarMul(c[9], t) + SkScalarMul(c[10], t2) + SkScalarMul(c[11], t3);
cc[3] = c[12] + SkScalarMul(c[13], t) + SkScalarMul(c[14], t2) + SkScalarMul(c[15], t3);
SkScalar a = SkScalarClampMax(SkScalarMul(cc[0], SkGetPackedA32(c0)) + SkScalarMul(cc[1], SkGetPackedA32(c1)) + SkScalarMul(cc[2], SkGetPackedA32(c2)) + SkScalarMul(cc[3], SkGetPackedA32(c3)), 255);
SkScalar r = SkScalarMul(cc[0], SkGetPackedR32(c0)) + SkScalarMul(cc[1], SkGetPackedR32(c1)) + SkScalarMul(cc[2], SkGetPackedR32(c2)) + SkScalarMul(cc[3], SkGetPackedR32(c3));
SkScalar g = SkScalarMul(cc[0], SkGetPackedG32(c0)) + SkScalarMul(cc[1], SkGetPackedG32(c1)) + SkScalarMul(cc[2], SkGetPackedG32(c2)) + SkScalarMul(cc[3], SkGetPackedG32(c3));
SkScalar b = SkScalarMul(cc[0], SkGetPackedB32(c0)) + SkScalarMul(cc[1], SkGetPackedB32(c1)) + SkScalarMul(cc[2], SkGetPackedB32(c2)) + SkScalarMul(cc[3], SkGetPackedB32(c3));
return SkPackARGB32(SkScalarRoundToInt(a),
SkScalarRoundToInt(SkScalarClampMax(r, a)),
SkScalarRoundToInt(SkScalarClampMax(g, a)),
SkScalarRoundToInt(SkScalarClampMax(b, a)));
}
bool SkBicubicImageFilter::onFilterImage(Proxy* proxy,
const SkBitmap& source,
const Context& ctx,
SkBitmap* result,
SkIPoint* offset) const {
SkBitmap src = source;
SkIPoint srcOffset = SkIPoint::Make(0, 0);
if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
return false;
}
if (src.colorType() != kN32_SkColorType) {
return false;
}
SkAutoLockPixels alp(src);
if (!src.getPixels()) {
return false;
}
SkRect dstRect = SkRect::MakeWH(SkScalarMul(SkIntToScalar(src.width()), fScale.fWidth),
SkScalarMul(SkIntToScalar(src.height()), fScale.fHeight));
SkIRect dstIRect;
dstRect.roundOut(&dstIRect);
if (dstIRect.isEmpty()) {
return false;
}
if (!result->allocPixels(src.info().makeWH(dstIRect.width(), dstIRect.height()))) {
return false;
}
SkRect srcRect;
src.getBounds(&srcRect);
srcRect.offset(SkPoint::Make(SkIntToScalar(srcOffset.fX), SkIntToScalar(srcOffset.fY)));
SkMatrix inverse;
inverse.setRectToRect(dstRect, srcRect, SkMatrix::kFill_ScaleToFit);
inverse.postTranslate(-0.5f, -0.5f);
for (int y = dstIRect.fTop; y < dstIRect.fBottom; ++y) {
SkPMColor* dptr = result->getAddr32(dstIRect.fLeft, y);
for (int x = dstIRect.fLeft; x < dstIRect.fRight; ++x) {
SkPoint srcPt, dstPt = SkPoint::Make(SkIntToScalar(x), SkIntToScalar(y));
inverse.mapPoints(&srcPt, &dstPt, 1);
SkScalar fractx = srcPt.fX - SkScalarFloorToScalar(srcPt.fX);
SkScalar fracty = srcPt.fY - SkScalarFloorToScalar(srcPt.fY);
int sx = SkScalarFloorToInt(srcPt.fX);
int sy = SkScalarFloorToInt(srcPt.fY);
int x0 = SkClampMax(sx - 1, src.width() - 1);
int x1 = SkClampMax(sx , src.width() - 1);
int x2 = SkClampMax(sx + 1, src.width() - 1);
int x3 = SkClampMax(sx + 2, src.width() - 1);
int y0 = SkClampMax(sy - 1, src.height() - 1);
int y1 = SkClampMax(sy , src.height() - 1);
int y2 = SkClampMax(sy + 1, src.height() - 1);
int y3 = SkClampMax(sy + 2, src.height() - 1);
SkPMColor s00 = *src.getAddr32(x0, y0);
SkPMColor s10 = *src.getAddr32(x1, y0);
SkPMColor s20 = *src.getAddr32(x2, y0);
SkPMColor s30 = *src.getAddr32(x3, y0);
SkPMColor s0 = cubicBlend(fCoefficients, fractx, s00, s10, s20, s30);
SkPMColor s01 = *src.getAddr32(x0, y1);
SkPMColor s11 = *src.getAddr32(x1, y1);
SkPMColor s21 = *src.getAddr32(x2, y1);
SkPMColor s31 = *src.getAddr32(x3, y1);
SkPMColor s1 = cubicBlend(fCoefficients, fractx, s01, s11, s21, s31);
SkPMColor s02 = *src.getAddr32(x0, y2);
SkPMColor s12 = *src.getAddr32(x1, y2);
SkPMColor s22 = *src.getAddr32(x2, y2);
SkPMColor s32 = *src.getAddr32(x3, y2);
SkPMColor s2 = cubicBlend(fCoefficients, fractx, s02, s12, s22, s32);
SkPMColor s03 = *src.getAddr32(x0, y3);
SkPMColor s13 = *src.getAddr32(x1, y3);
SkPMColor s23 = *src.getAddr32(x2, y3);
SkPMColor s33 = *src.getAddr32(x3, y3);
SkPMColor s3 = cubicBlend(fCoefficients, fractx, s03, s13, s23, s33);
*dptr++ = cubicBlend(fCoefficients, fracty, s0, s1, s2, s3);
}
}
offset->fX = dstIRect.fLeft;
offset->fY = dstIRect.fTop;
return true;
}
///////////////////////////////////////////////////////////////////////////////
#if SK_SUPPORT_GPU
bool SkBicubicImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
SkBitmap* result, SkIPoint* offset) const {
SkBitmap srcBM = src;
if (getInput(0) && !getInput(0)->getInputResultGPU(proxy, src, ctx, &srcBM, offset)) {
return false;
}
GrTexture* srcTexture = srcBM.getTexture();
GrContext* context = srcTexture->getContext();
SkRect dstRect = SkRect::MakeWH(srcBM.width() * fScale.fWidth,
srcBM.height() * fScale.fHeight);
GrTextureDesc desc;
desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
desc.fWidth = SkScalarCeilToInt(dstRect.width());
desc.fHeight = SkScalarCeilToInt(dstRect.height());
desc.fConfig = kSkia8888_GrPixelConfig;
GrAutoScratchTexture ast(context, desc);
SkAutoTUnref<GrTexture> dst(ast.detach());
if (!dst) {
return false;
}
GrContext::AutoRenderTarget art(context, dst->asRenderTarget());
GrPaint paint;
paint.addColorEffect(GrBicubicEffect::Create(srcTexture, fCoefficients))->unref();
SkRect srcRect;
srcBM.getBounds(&srcRect);
context->drawRectToRect(paint, dstRect, srcRect);
WrapTexture(dst, desc.fWidth, desc.fHeight, result);
return true;
}
#endif
///////////////////////////////////////////////////////////////////////////////

2
src/ports/SkGlobalInitialization_chromium.cpp
View File

@ -17,7 +17,6 @@
#include "Sk2DPathEffect.h"
#include "SkArithmeticMode.h"
#include "SkAvoidXfermode.h"
#include "SkBicubicImageFilter.h"
#include "SkBitmapSource.h"
#include "SkBlurDrawLooper.h"
#include "SkBlurImageFilter.h"
@ -63,7 +62,6 @@
static void InitializeFlattenables() {
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBicubicImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)

2
src/ports/SkGlobalInitialization_default.cpp
View File

@ -17,7 +17,6 @@
#include "Sk2DPathEffect.h"
#include "SkArithmeticMode.h"
#include "SkAvoidXfermode.h"
#include "SkBicubicImageFilter.h"
#include "SkBitmapSource.h"
#include "SkBlurDrawLooper.h"
#include "SkBlurImageFilter.h"
@ -63,7 +62,6 @@
static void InitializeFlattenables() {
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBicubicImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)

17
tests/ImageFilterTest.cpp
View File

@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "SkBicubicImageFilter.h"
#include "SkBitmap.h"
#include "SkBitmapDevice.h"
#include "SkBitmapSource.h"
@ -184,22 +183,6 @@ DEF_TEST(ImageFilter, reporter) {
SkIntToScalar(kBitmapSize));
canvas.drawRect(r, paint);
}
{
// This tests for scale bringing width to 0
SkSize scale = SkSize::Make(-0.001f, SK_Scalar1);
SkAutoTUnref<SkImageFilter> bmSrc(SkBitmapSource::Create(bitmap));
SkAutoTUnref<SkBicubicImageFilter> bicubic(
SkBicubicImageFilter::CreateMitchell(scale, bmSrc));
SkBitmapDevice device(bitmap);
SkDeviceImageFilterProxy proxy(&device);
SkIPoint loc = SkIPoint::Make(0, 0);
// An empty input should early return and return false
SkAutoTUnref<SkImageFilter::Cache> cache(SkImageFilter::Cache::Create(2));
SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeEmpty(), cache.get());
REPORTER_ASSERT(reporter,
!bicubic->filterImage(&proxy, bitmap, ctx, &result, &loc));
}
}
}