aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2015-03-25 11:11:52 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 11:11:52 -0700
commit05245900bf6d49068b1668da1b38890a41e09bc5 (patch)
treeb43842b1286b8ec62482644d84a6a1377864d4aa /gyp
parent038cb5e8d8b095f3e1f87b7a68aa8b7fa6906826 (diff)
Add scanline decoding to SkCodec.
Add an interface for decoding scanlines, and implement that interface in the PNG decoder. Use a separate method to determine whether an image that used a type with alpha was actually opaque. SkScanlineDecoder.h: New interface for decoding scanlines. SkCodec.h: Add getScanlineDecoder. Add a virtual function (with non-virtual caller) for determining whether the image truly had alpha. The client can call this to determine if the image was actually opaque if it reported having alpha. Remove code to sneakily change the passed in alpha type. SkCodec_libpng.*: Split up code onGetPixels into helper functions that can be shared with the scanline decoder. Implement scanline decoding. Implement onReallyHasAlpha. SkSwizzler.*: Add a new SrcConfig as a default, which is invalid. Add a function for setting fDstRow directly. Assert fDstRow is not NULL. BUG=skia:3257 Review URL: https://codereview.chromium.org/1010903003
Diffstat (limited to 'gyp')
-rw-r--r--gyp/codec.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index 62f2b7f4a4..ee8eaad003 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -19,6 +19,11 @@
'core.gyp:*',
'libpng.gyp:libpng',
],
+ 'cflags':[
+ # FIXME: This gets around a longjmp warning. See
+ # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
+ '-Wno-clobbered',
+ ],
'include_dirs': [
'../include/codec',
'../src/codec',