Provide a function to print the name of a Format.

Also use SkToU32 instead of a flat cast.

R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9139 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/images/SkImageDecoder.h b/include/images/SkImageDecoder.h
index f6f64e1..ba22652 100644 (file)
--- a/include/images/SkImageDecoder.h
+++ b/include/images/SkImageDecoder.h
@@ -49,6 +49,10 @@ public:
     */
     static Format GetStreamFormat(SkStream*);
 
+    /** Return a readable string of the Format provided.
+    */
+    static const char* GetFormatName(Format);
+
     /** Return a readable string of the value returned by getFormat().
     */
     const char* getFormatName() const;

diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 9ffae5f..bcea23b 100644 (file)
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -54,7 +54,11 @@ SkImageDecoder::Format SkImageDecoder::getFormat() const {
 }
 
 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:
@@ -319,7 +323,7 @@ bool SkImageDecoder::DecodeMemoryToTarget(const void* buffer, size_t size,
             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;