Add SkEncodedFormat, used by SkCodec.

experimental/PdfViewer/chop_transparency_main.cpp

Index: experimental/PdfViewer/chop_transparency_main.cpp
diff --git a/experimental/PdfViewer/chop_transparency_main.cpp b/experimental/PdfViewer/chop_transparency_main.cpp
index c79515d2c9218eee5ffcbfb35bd08a5e053bed8f..62eadb19d6232111ef410eaaad7351289fdd1e5e 100644
--- a/experimental/PdfViewer/chop_transparency_main.cpp
+++ b/experimental/PdfViewer/chop_transparency_main.cpp
@@ -9,6 +9,7 @@
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
+#include "SkEncodedFormat.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
@@ -23,24 +24,6 @@ __SK_FORCE_IMAGE_DECODER_LINKING;
 
 DEFINE_string2(readPath, r, "", "Folder(s) and files to decode images. Required.");
 
-struct Format {
-    SkImageEncoder::Type    fType;
-    SkImageDecoder::Format  fFormat;
-    const char*             fSuffix;
-};
-
-/*
-static const Format gFormats[] = {
-    { SkImageEncoder::kBMP_Type, SkImageDecoder::kBMP_Format, ".bmp" },
-    { SkImageEncoder::kGIF_Type, SkImageDecoder::kGIF_Format, ".gif" },
-    { SkImageEncoder::kICO_Type, SkImageDecoder::kICO_Format, ".ico" },
-    { SkImageEncoder::kJPEG_Type, SkImageDecoder::kJPEG_Format, ".jpg" },
-    { SkImageEncoder::kPNG_Type, SkImageDecoder::kPNG_Format, ".png" },
-    { SkImageEncoder::kWBMP_Type, SkImageDecoder::kWBMP_Format, ".wbmp" },
-    { SkImageEncoder::kWEBP_Type, SkImageDecoder::kWEBP_Format, ".webp" }
-};
-*/
-
 static SkISize opaqueSize(const SkBitmap& bm) {
     int width = 1;
     int height = 1;
@@ -89,7 +72,7 @@ static bool write_bitmap(const char outName[], const SkBitmap& bm) {
         }
     }
 
-    return SkImageEncoder::EncodeFile(outName, dst, SkImageEncoder::kPNG_Type, 100);
+    return SkImageEncoder::EncodeFile(outName, dst, kPNG_SkEncodedFormat, 100);
 }
 
 static void decodeFileAndWrite(const char srcPath[]) {