diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-20 14:51:47 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-20 14:51:47 +0000 |
| commit | d5c9e996dff7169cd6bfbf5c6d1543fca512c1a5 (patch) | |
| tree | c33f0ce090db0c651fe50f30c2979deebd68ea99 /gyp | |
| parent | 166e653f67f3fffc3846184a25ce45ab083f07a2 (diff) | |
Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on android)
http://codereview.appspot.com/5785054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3438 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gmslides.gypi | 1 | ||||
| -rw-r--r-- | gyp/images.gyp | 12 | ||||
| -rw-r--r-- | gyp/libjpeg.gyp | 13 |
3 files changed, 16 insertions, 10 deletions
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index ec223fb07b..601aa88e85 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -9,6 +9,7 @@ '../gm/bitmapfilters.cpp', '../gm/bitmapscroll.cpp', '../gm/blurs.cpp', + '../gm/cmykjpeg.cpp', '../gm/colormatrix.cpp', '../gm/complexclip.cpp', '../gm/complexclip2.cpp', diff --git a/gyp/images.gyp b/gyp/images.gyp index a93ba065e8..d0b5c1a715 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -5,6 +5,7 @@ 'type': 'static_library', 'dependencies': [ 'utils.gyp:utils', + 'libjpeg.gyp:libjpeg', ], 'include_dirs': [ '../include/config', @@ -33,6 +34,7 @@ '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', '../src/images/SkImageDecoder_libpng.cpp', + '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', @@ -53,14 +55,11 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -75,13 +74,10 @@ }], [ 'skia_os == "mac"', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -91,10 +87,7 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ - '../include/images/SkJpegUtility.h', - '../src/images/SkImageDecoder_libgif.cpp', - '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -113,7 +106,6 @@ }], [ 'skia_os == "android"', { 'sources!': [ - '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp index 4826f48dab..d628f66464 100644 --- a/gyp/libjpeg.gyp +++ b/gyp/libjpeg.gyp @@ -13,6 +13,19 @@ 'dependencies': [ '../third_party/externals/libjpeg/libjpeg.gyp:libjpeg', ], + + 'conditions': [ + [ 'os_posix != 1 or OS == "mac"', { + # need to set include path when using our own version + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/libjpeg', + ], + }, + },], + ], + + }, ], } |