In skimage, copy to 8888 if encoding fails.

tools/skimage_main.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm_expectations.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 93 matching lines @@
 static SkTArray<SkString, false> gMissingExpectations;
 static SkTArray<SkString, false> gMissingSubsetExpectations;
 
 static SkBitmap::Config gPrefConfig(SkBitmap::kNo_Config);
 
 // Expections read from a file specified by readExpectationsPath. The expectations must have been
 // previously written using createExpectationsPath.
 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;
+    }
+
+    if (bm.config() == SkBitmap::kARGB_8888_Config) {
+        // First attempt at encoding failed, and the bitmap was already 8888. Making
+        // a copy is not going to help.
+        return false;
+    }
+
+    // Encoding failed. Copy to 8888 and try again.
     SkBitmap bm8888;
-    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);
 }
 
 /**
  *  Return a random SkIRect inside the range specified.
  *  @param rand Random number generator.
  *  @param maxX Exclusive maximum x-coordinate. SkIRect's fLeft and fRight will be
  *      in the range [0, maxX)
  *  @param maxY Exclusive maximum y-coordinate. SkIRect's fTop and fBottom will be
  *      in the range [0, maxY)
  *  @return SkIRect Non-empty, non-degenerate rectangle.
@@ skipping 575 matching lines @@
     }
 
     return failed ? -1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif