Add SkEncodedFormat, used by SkCodec.

experimental/PdfViewer/pdf_viewer_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 "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
@@ skipping 144 matching lines @@
 #ifdef PDF_TRACE_DIFF_IN_PNG
         gDumpBitmap = &bitmap;
         gDumpCanvas = &canvas;
 #endif
         renderer.renderPage(page < 0 ? 0 : page, &canvas, rect);
 
         SkString outputPath;
         if (!make_output_filepath(&outputPath, outputDir, inputFilename, page)) {
             return false;
         }
-        SkImageEncoder::EncodeFile(outputPath.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100);
+        SkImageEncoder::EncodeFile(outputPath.c_str(), bitmap, kPNG_SkEncodedFormat, 100);
 
         if (FLAGS_showMemoryUsage) {
             SkDebugf("Memory usage after page %i rendered: %u\n",
                      page < 0 ? 0 : page, (unsigned int)renderer.bytesUsed());
         }
     }
     return true;
 }
 
 /** Reads an skp file, renders it to pdf and writes the output to a pdf file
@@ skipping 123 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif