diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-14 15:33:20 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-14 15:33:20 +0000 |
| commit | 2bbc2c945bb0ecf18fd6473af74ad1a2f5e727a7 (patch) | |
| tree | 67d590a01f682d9a821edc8f457dcaa696c7e6d5 /gyp | |
| parent | 99e0d08113738dd8ea8f52af0cdd04c971ff074a (diff) | |
Add an option to create unpremultiplied bitmaps.
Currently they cannot be used directly by Skia, but
the pixels can be used elsewhere.
SkImageDecoder:
Add functions to require unpremultiplied output
and query the presence of the requirement
SkImageDecoder_libpng:
SkImageDecoder_libwebp:
SkImageDecoder_WIC:
Respect the requirement for unpremultiplied output.
TODO: Fix SkImageDecoder_CG.
SkScaledBitmapSampler:
Add procs to skip premultiplication and a boolean
parameter to use those procs.
ImageDecodingTest:
Test unpremultiplied bitmap decoding.
SampleUnpremul:
Add a sample which allows visually comparing between the
unpremultiplied version (copied into a premultiplied bitmap,
since drawing unpremultiplied is not currently supported)
and a premultiplied version of image files.
gm.h:
Add a getter for the resource path, so Samples can use it.
As of patch set 13, https://codereview.chromium.org/16816016/
and https://codereview.chromium.org/16983004/, which were
approved separately.
R=reed@google.com
Review URL: https://codereview.chromium.org/16410009
git-svn-id: http://skia.googlecode.com/svn/trunk@9612 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 1 | ||||
| -rw-r--r-- | gyp/bench.gypi | 1 | ||||
| -rw-r--r-- | gyp/tests.gyp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 8b64cbdf6b..644121f967 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -109,6 +109,7 @@ '../samplecode/SampleTiling.cpp', '../samplecode/SampleTinyBitmap.cpp', '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleUnpremul.cpp', '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodesBlur.cpp', '../samplecode/TransitionView.cpp', diff --git a/gyp/bench.gypi b/gyp/bench.gypi index c7f0c11cb7..2be3f22d24 100644 --- a/gyp/bench.gypi +++ b/gyp/bench.gypi @@ -28,6 +28,7 @@ '../bench/GameBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', + '../bench/ImageDecodeBench.cpp', '../bench/InterpBench.cpp', '../bench/LineBench.cpp', '../bench/LightingBench.cpp', diff --git a/gyp/tests.gyp b/gyp/tests.gyp index 557fea5a28..3bdf18d4f8 100644 --- a/gyp/tests.gyp +++ b/gyp/tests.gyp @@ -66,6 +66,7 @@ '../tests/GrMemoryPoolTest.cpp', '../tests/GrSurfaceTest.cpp', '../tests/HashCacheTest.cpp', + '../tests/ImageDecodingTest.cpp', '../tests/InfRectTest.cpp', '../tests/LListTest.cpp', '../tests/LayerDrawLooperTest.cpp', |