Add SkEncodedFormat, used by SkCodec.

tests/JpegTest.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 "SkDecodingImageGenerator.h"
 #include "SkForceLinking.h"
@@ skipping 431 matching lines @@
     REPORTER_ASSERT(reporter, bm8888.getColor(127, 127) == 0xff808080
             || bm8888.getColor(127, 127) == SK_ColorWHITE);
 #else
     // This is the fill color
     REPORTER_ASSERT(reporter, bm8888.getColor(127, 127) == SK_ColorWHITE);
 #endif
 
     #if JPEG_TEST_WRITE_TO_FILE_FOR_DEBUGGING
     // Check to see that the resulting bitmap is nice
     bool writeSuccess = (!(bm8888.empty())) && SkImageEncoder::EncodeFile(
-        "HalfOfAJpeg.png", bm8888, SkImageEncoder::kPNG_Type, 100);
+        "HalfOfAJpeg.png", bm8888, kPNG_SkEncodedFormat, 100);
     SkASSERT(writeSuccess);
     #endif
 }
 
 DEF_TEST(Jpeg_YUV, reporter) {
     size_t len = sizeof(goodJpegImage);
     SkMemoryStream* stream = SkNEW_ARGS(SkMemoryStream, (goodJpegImage, len));
 
     SkBitmap bitmap;
     SkDecodingImageGenerator::Options opts;
@@ skipping 27 matching lines @@
     }
     SkAutoMalloc storage(totalSize);
     void* planes[3];
     planes[0] = storage.get();
     planes[1] = (uint8_t*)planes[0] + sizes[0];
     planes[2] = (uint8_t*)planes[1] + sizes[1];
 
     // Get the YUV planes
     REPORTER_ASSERT(reporter, pixelRef->getYUV8Planes(yuvSizes, planes, rowBytes, NULL));
 }