Simplify code for configuring suppression of ImageDecoder warnings

src/images/SkImageDecoder_libpng.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkDither.h"
 #include "SkMath.h"
+#include "SkRTConf.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 #include "transform_scanline.h"
-
-#if defined(SK_DEBUG)
-#include "SkRTConf.h"  // SK_CONF_DECLARE
-#endif  // defined(SK_DEBUG)
-
 extern "C" {
 #include "png.h"
 }
 
 /* These were dropped in libpng >= 1.4 */
 #ifndef png_infopp_NULL
 #define png_infopp_NULL NULL
 #endif
 
 #ifndef png_bytepp_NULL
 #define png_bytepp_NULL NULL
 #endif
 
 #ifndef int_p_NULL
 #define int_p_NULL NULL
 #endif
 
 #ifndef png_flush_ptr_NULL
 #define png_flush_ptr_NULL NULL
 #endif
 
 #if defined(SK_DEBUG)
+#define DEFAULT_FOR_SUPPRESS_PNG_IMAGE_DECODER_WARNINGS false
+#else  // !defined(SK_DEBUG)
+#define DEFAULT_FOR_SUPPRESS_PNG_IMAGE_DECODER_WARNINGS true
+#endif  // defined(SK_DEBUG)
 SK_CONF_DECLARE(bool, c_suppressPNGImageDecoderWarnings,
-    "images.png.suppressDecoderWarnings", false,
-    "Suppress most PNG warnings when calling image decode functions.");
-#endif  // defined(SK_DEBUG)
+                "images.png.suppressDecoderWarnings",
+                DEFAULT_FOR_SUPPRESS_PNG_IMAGE_DECODER_WARNINGS,
+                "Suppress most PNG warnings when calling image decode "
+                "functions.");
+
 
 
 class SkPNGImageIndex {
 public:
     SkPNGImageIndex(SkStreamRewindable* stream, png_structp png_ptr, png_infop info_ptr)
         : fStream(stream)
         , fPng_ptr(png_ptr)
         , fInfo_ptr(info_ptr)
         , fConfig(SkBitmap::kNo_Config) {
         SkASSERT(stream != NULL);
@@ skipping 153 matching lines @@
 }
 
 bool SkPNGImageDecoder::onDecodeInit(SkStream* sk_stream, png_structp *png_ptrp,
                                      png_infop *info_ptrp) {
     /* Create and initialize the png_struct with the desired error handler
     * functions.  If you want to use the default stderr and longjump method,
     * you can supply NULL for the last three parameters.  We also supply the
     * the compiler header file version, so that we know if the application
     * was compiled with a compatible version of the library.  */
 
-#if defined(SK_DEBUG)
     png_error_ptr user_warning_fn =
         (c_suppressPNGImageDecoderWarnings) ? (&do_nothing_warning_fn) : NULL;
     /* NULL means to leave as default library behavior. */
-    /* c_suppressPNGImageDecoderWarnings defaults to false. */
+    /* c_suppressPNGImageDecoderWarnings default depends on SK_DEBUG. */
     /* To suppress warnings with a SK_DEBUG binary, set the
      * environment variable "skia_images_png_suppressDecoderWarnings"
      * to "true".  Inside a program that links to skia:
      * SK_CONF_SET("images.png.suppressDecoderWarnings", true); */
-#else  // Always suppress in release mode
-    png_error_ptr user_warning_fn = &do_nothing_warning_fn;
-#endif  // defined(SK_DEBUG)
 
     png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
         NULL, sk_error_fn, user_warning_fn);
     //   png_voidp user_error_ptr, user_error_fn, user_warning_fn);
     if (png_ptr == NULL) {
         return false;
     }
 
     *png_ptrp = png_ptr;
 
@@ skipping 1002 matching lines @@
     return SkImageDecoder::kUnknown_Format;
 }
 
 SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type t) {
     return (SkImageEncoder::kPNG_Type == t) ? SkNEW(SkPNGImageEncoder) : NULL;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libpng_dfactory);
 static SkImageDecoder_FormatReg gFormatReg(get_format_png);
 static SkImageEncoder_EncodeReg gEReg(sk_libpng_efactory);