Silence libjpeg warnings in SkImageDecoder

We just did the same for libpng (see crrev.com/1512043002), so we
might as well do this here.

SkImageDecoder is deprecated, and SkCodec already has a way to turn
off its messages.

BUG=skia:1649

Review URL: https://codereview.chromium.org/1505953007

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 58eff75dc94aa981f85b58579bf8cf5e7cec658c..219dad6db220cd67dce4daea57ce2f3bc1a71381 100644 (file)
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -37,13 +37,8 @@ extern "C" {
 // If ANDROID_RGB is defined by in the jpeg headers it indicates that jpeg offers
 // support for two additional formats (1) JCS_RGBA_8888 and (2) JCS_RGB_565.
 
-#if defined(SK_DEBUG)
-#define DEFAULT_FOR_SUPPRESS_JPEG_IMAGE_DECODER_WARNINGS false
-#define DEFAULT_FOR_SUPPRESS_JPEG_IMAGE_DECODER_ERRORS false
-#else  // !defined(SK_DEBUG)
 #define DEFAULT_FOR_SUPPRESS_JPEG_IMAGE_DECODER_WARNINGS true
 #define DEFAULT_FOR_SUPPRESS_JPEG_IMAGE_DECODER_ERRORS true
-#endif  // defined(SK_DEBUG)
 SK_CONF_DECLARE(bool, c_suppressJPEGImageDecoderWarnings,
                 "images.jpeg.suppressDecoderWarnings",
                 DEFAULT_FOR_SUPPRESS_JPEG_IMAGE_DECODER_WARNINGS,