diff options
| author |  msarett <msarett@google.com> | 2015-11-06 11:15:49 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-06 11:15:49 -0800 |
| commit | b747b90501823cc160848957dfa552877d83b11d (patch) | |
| tree | 05fadab2d69f6714e69ec787800791cd30e88692 /src/images | |
| parent | 69ad6a9d03dd6f14b7c730465319313725a7c903 (diff) | |
Remove dependencies on Android's forked decoder libraries
Disable SkImageDecoder's code which relies on Android's customized
libpng and libjpeg. Build standard versions of libpng and libjpeg-turbo
everywhere. The SkImageDecoder code has been replaced with SkCodec, which
can decode subsets using standard library APIs
BUG=skia:
Review URL: https://codereview.chromium.org/1406153015
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 4 | ||||
| -rw-r--r-- | src/images/SkImageDecoder_libpng.cpp | 4 | ||||
| -rw-r--r-- | src/images/SkJpegUtility.cpp | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index 9de1733703..f270cae611 100644 --- a/src/images/SkImageDecoder_libjpeg.cpp +++ b/src/images/SkImageDecoder_libjpeg.cpp @@ -54,10 +54,6 @@ SK_CONF_DECLARE(bool, c_suppressJPEGImageDecoderErrors, "Suppress most JPG error messages when decode " "function fails."); -#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_JPEG_NO_INDEX_SUPPORTED) -#define SK_JPEG_INDEX_SUPPORTED -#endif - ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp index aded29cd96..ab1affac11 100644 --- a/src/images/SkImageDecoder_libpng.cpp +++ b/src/images/SkImageDecoder_libpng.cpp @@ -52,10 +52,6 @@ SK_CONF_DECLARE(bool, c_suppressPNGImageDecoderWarnings, "Suppress most PNG warnings when calling image decode " "functions."); -#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_PNG_NO_INDEX_SUPPORTED) -#define SK_PNG_INDEX_SUPPORTED -#endif - class SkPNGImageIndex { public: // Takes ownership of stream. diff --git a/src/images/SkJpegUtility.cpp b/src/images/SkJpegUtility.cpp index b6b8fe840d..f1a32cae10 100644 --- a/src/images/SkJpegUtility.cpp +++ b/src/images/SkJpegUtility.cpp @@ -8,10 +8,6 @@ #include "SkJpegUtility.h" -#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_JPEG_NO_INDEX_SUPPORTED) -#define SK_JPEG_INDEX_SUPPORTED -#endif - ///////////////////////////////////////////////////////////////////// static void sk_init_source(j_decompress_ptr cinfo) { skjpeg_source_mgr* src = (skjpeg_source_mgr*)cinfo->src; |