commit 230d4ac7013f79a3e79efd4452d7fa5c3f508660
author scroggo <scroggo@google.com> Thu Mar 26 07:15:55 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Mar 26 07:15:55 2015 -0700
tree 6b5d94462fb781c9e9f9de42421a22c4061ed3f0
parent b880d7f87e0271f96e21a4d01071fbe8c9a28812

Use a wrapper for SkDebugf in SkCodec.

It can be silenced or not with one flag.
Always print when building for the android framework.

Also remove the meaningless define of override to override.

BUG=skia:3257

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

src/codec/SkCodec_libpng.cpp

diff --git a/src/codec/SkCodec_libpng.cpp b/src/codec/SkCodec_libpng.cpp
index 8c0b624..8f2bdd3 100644
--- a/src/codec/SkCodec_libpng.cpp
+++ b/src/codec/SkCodec_libpng.cpp
@@ -46,7 +46,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 static void sk_error_fn(png_structp png_ptr, png_const_charp msg) {
-    SkDebugf("------ png error %s\n", msg);
+    SkCodecPrintf("------ png error %s\n", msg);
     longjmp(png_jmpbuf(png_ptr), 1);
 }
 
@@ -369,7 +369,7 @@
     // FIXME: Could we use the return value of setjmp to specify the type of
     // error?
     if (setjmp(png_jmpbuf(fPng_ptr))) {
-        SkDebugf("setjmp long jump!\n");
+        SkCodecPrintf("setjmp long jump!\n");
         return kInvalidInput;
     }
 
@@ -436,7 +436,7 @@
     // FIXME: Could we use the return value of setjmp to specify the type of
     // error?
     if (setjmp(png_jmpbuf(fPng_ptr))) {
-        SkDebugf("setjmp long jump!\n");
+        SkCodecPrintf("setjmp long jump!\n");
         return kInvalidInput;
     }
 
@@ -505,7 +505,7 @@
 
     SkImageGenerator::Result onGetScanlines(void* dst, int count, size_t rowBytes) override {
         if (setjmp(png_jmpbuf(fCodec->fPng_ptr))) {
-            SkDebugf("setjmp long jump!\n");
+            SkCodecPrintf("setjmp long jump!\n");
             return SkImageGenerator::kInvalidInput;
         }
 
@@ -522,7 +522,7 @@
         // FIXME: Could we use the return value of setjmp to specify the type of
         // error?
         if (setjmp(png_jmpbuf(fCodec->fPng_ptr))) {
-            SkDebugf("setjmp long jump!\n");
+            SkCodecPrintf("setjmp long jump!\n");
             return SkImageGenerator::kInvalidInput;
         }
 
@@ -552,7 +552,7 @@
     }
 
     if (!conversion_possible(dstInfo, this->getInfo())) {
-        SkDebugf("no conversion possible\n");
+        SkCodecPrintf("no conversion possible\n");
         return NULL;
     }
 
@@ -563,7 +563,7 @@
     // FIXME: Pass this in to getScanlineDecoder?
     opts.fZeroInitialized = kNo_ZeroInitialized;
     if (this->initializeSwizzler(dstInfo, NULL, dstInfo.minRowBytes(), opts) != kSuccess) {
-        SkDebugf("failed to initialize the swizzler.\n");
+        SkCodecPrintf("failed to initialize the swizzler.\n");
         return NULL;
     }