Add SkEncodedFormat, used by SkCodec.

tools/render_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "LazyDecodeBitmap.h"
 #include "CopyTilesRenderer.h"
 #include "SkBitmap.h"
@@ skipping 44 matching lines @@
 DEFINE_bool(validate, false, "Verify that the rendered image contains the same pixels as "
             "the picture rendered in simple mode. When used in conjunction with --bbh, results "
             "are validated against the picture rendered in the same mode, but without the bbh.");
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  *  Table for translating from format of data to a suffix.
  */
 struct Format {
-    SkImageDecoder::Format  fFormat;
-    const char*             fSuffix;
+    SkEncodedFormat fFormat;
+    const char*     fSuffix;
 };
 static const Format gFormats[] = {
-    { SkImageDecoder::kBMP_Format, ".bmp" },
-    { SkImageDecoder::kGIF_Format, ".gif" },
-    { SkImageDecoder::kICO_Format, ".ico" },
-    { SkImageDecoder::kJPEG_Format, ".jpg" },
-    { SkImageDecoder::kPNG_Format, ".png" },
-    { SkImageDecoder::kWBMP_Format, ".wbmp" },
-    { SkImageDecoder::kWEBP_Format, ".webp" },
-    { SkImageDecoder::kUnknown_Format, "" },
+    { kBMP_SkEncodedFormat, ".bmp" },
+    { kGIF_SkEncodedFormat, ".gif" },
+    { kICO_SkEncodedFormat, ".ico" },
+    { kJPEG_SkEncodedFormat, ".jpg" },
+    { kPNG_SkEncodedFormat, ".png" },
+    { kWBMP_SkEncodedFormat, ".wbmp" },
+    { kWEBP_SkEncodedFormat, ".webp" },
+    { kUnknown_SkEncodedFormat, "" },
 };
 
 /**
  *  Get an appropriate suffix for an image format.
  */
-static const char* get_suffix_from_format(SkImageDecoder::Format format) {
+static const char* get_suffix_from_format(SkEncodedFormat format) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(gFormats); i++) {
         if (gFormats[i].fFormat == format) {
             return gFormats[i].fSuffix;
         }
     }
     return "";
 }
 
 /**
  *  Base name for an image file created from the encoded data in an skp.
@@ skipping 24 matching lines @@
     }
 }
 
 /**
  *  Write the raw encoded bitmap data to a file.
  */
 static bool write_image_to_file(const void* buffer, size_t size, SkBitmap* bitmap) {
     SkASSERT(!FLAGS_writePath.isEmpty());
     SkMemoryStream memStream(buffer, size);
     SkString outPath;
-    SkImageDecoder::Format format = SkImageDecoder::GetStreamFormat(&memStream);
+    SkEncodedFormat format = SkImageDecoder::GetStreamFormat(&memStream);
     SkString name = SkStringPrintf("%s_%d%s", gInputFileName.c_str(), gImageNo++,
                                    get_suffix_from_format(format));
     SkString dir(FLAGS_writePath[0]);
     outPath = SkOSPath::Join(dir.c_str(), name.c_str());
     SkFILEWStream fileStream(outPath.c_str());
     if (!(fileStream.isValid() && fileStream.write(buffer, size))) {
         SkDebugf("Failed to write encoded data to \"%s\"\n", outPath.c_str());
     }
     // Put in a dummy bitmap.
     return SkImageDecoder::DecodeStream(&memStream, bitmap, kUnknown_SkColorType,
@@ skipping 366 matching lines @@
         jsonSummary.writeToFile(FLAGS_writeJsonSummaryPath[0]);
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif