Provide a function to print the name of a Format.

src/images/SkImageDecoder.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 "SkBitmap.h"
@@ skipping 36 matching lines @@
     SkSafeUnref(fPeeker);
     SkSafeUnref(fChooser);
     SkSafeUnref(fAllocator);
 }
 
 SkImageDecoder::Format SkImageDecoder::getFormat() const {
     return kUnknown_Format;
 }
 
 const char* SkImageDecoder::getFormatName() const {
-    switch (this->getFormat()) {
+    return GetFormatName(this->getFormat());
+}
+
+const char* SkImageDecoder::GetFormatName(Format format) {
+    switch (format) {
         case kUnknown_Format:
             return "Unknown Format";
         case kBMP_Format:
             return "BMP";
         case kGIF_Format:
             return "GIF";
         case kICO_Format:
             return "ICO";
         case kJPEG_Format:
             return "JPEG";
@@ skipping 244 matching lines @@
 
         // SkBitmapToImageInfo will return false if Index8 is used. kIndex8
         // is not supported by the Info/Target model, since kIndex8 requires
         // an SkColorTable, which this model does not keep track of.
         SkASSERT(bm.config() != SkBitmap::kIndex8_Config);
 
         if (NULL == target) {
             return true;
         }
 
-        if (target->fRowBytes != (uint32_t) bm.rowBytes()) {
+        if (target->fRowBytes != SkToU32(bm.rowBytes())) {
             if (target->fRowBytes < SkImageMinRowBytes(*info)) {
                 SkASSERT(!"Desired row bytes is too small");
                 return false;
             }
             bm.setConfig(bm.config(), bm.width(), bm.height(), target->fRowBytes);
         }
 
         TargetAllocator allocator(target->fAddr);
         decoder->setAllocator(&allocator);
         stream.rewind();
@@ skipping 45 matching lines @@
     CreateICOImageDecoder();
     CreateWBMPImageDecoder();
     // Only link GIF and PNG on platforms that build them. See images.gyp
 #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_NACL)
     CreateGIFImageDecoder();
 #endif
 #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN)
     CreatePNGImageDecoder();
 #endif
 }