In skimage, copy to 8888 if encoding fails.

tools/skimage_main.cpp

Index: tools/skimage_main.cpp
diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp
index 0d60f8afe96ddcd86a6a8141429a30402ea3a53b..0a7af65ec186c493d7ffd81ca6731eb735b57f7a 100644
--- a/tools/skimage_main.cpp
+++ b/tools/skimage_main.cpp
@@ -111,19 +111,15 @@ static SkBitmap::Config gPrefConfig(SkBitmap::kNo_Config);
 SkAutoTUnref<skiagm::JsonExpectationsSource> gJsonExpectations;
 
 static bool write_bitmap(const char outName[], const SkBitmap& bm) {
-    const SkBitmap* bmPtr;
+    if (SkImageEncoder::EncodeFile(outName, bm, SkImageEncoder::kPNG_Type, 100)) {
+        return true;
+    }
+    // Encoding failed. Copy to 8888 and try again.
     SkBitmap bm8888;

[reed1, 2013/10/07 13:59:40]

Should we first check that we're not already 8888?

[scroggo, 2013/10/07 16:55:57]

Done.

-    if (bm.config() == SkBitmap::kA8_Config) {
-        // Copy A8 into ARGB_8888, since our image encoders do not currently
-        // support A8.
-        if (!bm.copyTo(&bm8888, SkBitmap::kARGB_8888_Config)) {
-            return false;
-        }
-        bmPtr = &bm8888;
-    } else {
-        bmPtr = &bm;
+    if (!bm.copyTo(&bm8888, SkBitmap::kARGB_8888_Config)) {
+        return false;
     }
-    return SkImageEncoder::EncodeFile(outName, *bmPtr, SkImageEncoder::kPNG_Type, 100);
+    return SkImageEncoder::EncodeFile(outName, bm8888, SkImageEncoder::kPNG_Type, 100);
 }
 
 /**