Add SkEncodedFormat, used by SkCodec.

experimental/PdfViewer/chop_transparency_main.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
+#include "SkEncodedFormat.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkTArray.h"
 #include "SkTemplates.h"
 
 __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;
     for (int y = 0 ; y < bm.height(); y++) {
         for (int x = 0 ; x < bm.width(); x++) {
             SkColor color = bm.getColor(x, y);
             if (SkColorGetA(color) != 0) {
                 height = y + 1;
                 width = width > (x + 1) ? width : x + 1;
             }
@@ skipping 28 matching lines @@
                     g = (g * a) / 255;
                     b = (b * a) / 255;
                     a = 255;
                 }
                 color = SkColorSetARGB((U8CPU)a, (U8CPU)r, (U8CPU)g, (U8CPU)b);
             }
             *dst.getAddr32(x, y) = color;
         }
     }
 
-    return SkImageEncoder::EncodeFile(outName, dst, SkImageEncoder::kPNG_Type, 100);
+    return SkImageEncoder::EncodeFile(outName, dst, kPNG_SkEncodedFormat, 100);
 }
 
 static void decodeFileAndWrite(const char srcPath[]) {
     SkBitmap bitmap;
     SkFILEStream stream(srcPath);
     if (!stream.isValid()) {
         return;
     }
 
     SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
@@ skipping 63 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif