Use a wrapper for SkDebugf in SkCodec.

src/codec/SkCodec_libico.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec_libbmp.h"
 #include "SkCodec_libico.h"
 #include "SkCodec_libpng.h"
@@ skipping 27 matching lines @@
 
     // Header size constants
     static const uint32_t kIcoDirectoryBytes = 6;
     static const uint32_t kIcoDirEntryBytes = 16;
 
     // Read the directory header
     SkAutoTDeleteArray<uint8_t> dirBuffer(
             SkNEW_ARRAY(uint8_t, kIcoDirectoryBytes));
     if (inputStream.get()->read(dirBuffer.get(), kIcoDirectoryBytes) !=
             kIcoDirectoryBytes) {
-        SkDebugf("Error: unable to read ico directory header.\n");
+        SkCodecPrintf("Error: unable to read ico directory header.\n");
         return NULL;
     }
 
     // Process the directory header
     const uint16_t numImages = get_short(dirBuffer.get(), 4);
     if (0 == numImages) {
-        SkDebugf("Error: No images embedded in ico.\n");
+        SkCodecPrintf("Error: No images embedded in ico.\n");
         return NULL;
     }
 
     // Ensure that we can read all of indicated directory entries
     SkAutoTDeleteArray<uint8_t> entryBuffer(
             SkNEW_ARRAY(uint8_t, numImages*kIcoDirEntryBytes));
     if (inputStream.get()->read(entryBuffer.get(), numImages*kIcoDirEntryBytes) !=
             numImages*kIcoDirEntryBytes) {
-        SkDebugf("Error: unable to read ico directory entries.\n");
+        SkCodecPrintf("Error: unable to read ico directory entries.\n");
         return NULL;
     }
 
     // This structure is used to represent the vital information about entries
     // in the directory header.  We will obtain this information for each
     // directory entry.
     struct Entry {
         uint32_t offset;
         uint32_t size;
     };
@@ skipping 36 matching lines @@
     // Now will construct a candidate codec for each of the embedded images
     uint32_t bytesRead = kIcoDirectoryBytes + numImages * kIcoDirEntryBytes;
     SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>> codecs(
             SkNEW_ARGS((SkTArray<SkAutoTDelete<SkCodec>, true>), (numImages)));
     for (uint32_t i = 0; i < numImages; i++) {
         uint32_t offset = directoryEntries.get()[i].offset;
         uint32_t size = directoryEntries.get()[i].size;
         
         // Ensure that the offset is valid
         if (offset < bytesRead) {
-            SkDebugf("Warning: invalid ico offset.\n");
+            SkCodecPrintf("Warning: invalid ico offset.\n");
             continue;
         }
 
         // If we cannot skip, assume we have reached the end of the stream and
         // stop trying to make codecs
         if (inputStream.get()->skip(offset - bytesRead) != offset - bytesRead) {
-            SkDebugf("Warning: could not skip to ico offset.\n");
+            SkCodecPrintf("Warning: could not skip to ico offset.\n");
             break;
         }
         bytesRead = offset;
 
         // Create a new stream for the embedded codec
         SkAutoTUnref<SkData> data(
                 SkData::NewFromStream(inputStream.get(), size));
         if (NULL == data.get()) {
-            SkDebugf("Warning: could not create embedded stream.\n");
+            SkCodecPrintf("Warning: could not create embedded stream.\n");
             break;
         }
         SkAutoTDelete<SkMemoryStream>
                 embeddedStream(SkNEW_ARGS(SkMemoryStream, (data.get())));
         bytesRead += size;
 
         // Check if the embedded codec is bmp or png and create the codec
         const bool isPng = SkPngCodec::IsPng(embeddedStream);
         SkAssertResult(embeddedStream->rewind());
         SkCodec* codec = NULL;
         if (isPng) {
             codec = SkPngCodec::NewFromStream(embeddedStream.detach());
         } else {
             codec = SkBmpCodec::NewFromIco(embeddedStream.detach());
         }
 
         // Save a valid codec
         if (NULL != codec) {
             codecs->push_back().reset(codec);
         }
     }
 
     // Recognize if there are no valid codecs
     if (0 == codecs->count()) {
-        SkDebugf("Error: could not find any valid embedded ico codecs.\n");
+        SkCodecPrintf("Error: could not find any valid embedded ico codecs.\n");
         return NULL;
     }
 
     // Use the largest codec as a "suggestion" for image info
     uint32_t maxSize = 0;
     uint32_t maxIndex = 0;
     for (int32_t i = 0; i < codecs->count(); i++) {
         SkImageInfo info = codecs->operator[](i)->getInfo();
         uint32_t size = info.width() * info.height();
         if (size > maxSize) {
@@ skipping 64 matching lines @@
         if (dstInfo.dimensions() ==
                 fEmbeddedCodecs->operator[](i)->getInfo().dimensions()) {
 
             // Perform the decode
             result = fEmbeddedCodecs->operator[](i)->getPixels(dstInfo,
                     dst, dstRowBytes, &opts, ct, ptr);
 
             // On a fatal error, keep trying to find an image to decode
             if (kInvalidConversion == result || kInvalidInput == result ||
                     kInvalidScale == result) {
-                SkDebugf("Warning: Attempt to decode candidate ico failed.\n");
+                SkCodecPrintf("Warning: Attempt to decode candidate ico failed.\n");
                 continue;
             }
 
             // On success or partial success, return the result
             return result;
         }
     }
 
-    SkDebugf("Error: No matching candidate image in ico.\n");
+    SkCodecPrintf("Error: No matching candidate image in ico.\n");
     return result;
 }