Add SkEncodedFormat, used by SkCodec.

tools/picture_utils.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 "picture_utils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
+#include "SkEncodedFormat.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 namespace sk_tools {
     void force_all_opaque(const SkBitmap& bitmap) {
         SkASSERT(NULL == bitmap.getTexture());
         SkASSERT(kN32_SkColorType == bitmap.colorType());
@@ skipping 33 matching lines @@
     bool write_bitmap_to_disk(const SkBitmap& bm, const SkString& dirPath,
                               const char *subdirOrNull, const SkString& baseName) {
         SkString partialPath;
         if (subdirOrNull) {
             partialPath = SkOSPath::Join(dirPath.c_str(), subdirOrNull);
             sk_mkdir(partialPath.c_str());
         } else {
             partialPath.set(dirPath);
         }
         SkString fullPath = SkOSPath::Join(partialPath.c_str(), baseName.c_str());
-        if (SkImageEncoder::EncodeFile(fullPath.c_str(), bm, SkImageEncoder::kPNG_Type, 100)) {
+        if (SkImageEncoder::EncodeFile(fullPath.c_str(), bm, kPNG_SkEncodedFormat, 100)) {
             return true;
         } else {
             SkDebugf("Failed to write the bitmap to %s.\n", fullPath.c_str());
             return false;
         }
     }
 
 } // namespace sk_tools