Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_libjpeg.cpp

 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
@@ skipping 214 matching lines @@
         fImageIndex = NULL;
         fImageWidth = 0;
         fImageHeight = 0;
     }
 
     virtual ~SkJPEGImageDecoder() {
         SkDELETE(fImageIndex);
     }
 #endif
 
-    Format getFormat() const SK_OVERRIDE {
-        return kJPEG_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kJPEG_SkEncodedFormat;
     }
 
 protected:
 #ifdef SK_BUILD_FOR_ANDROID
     bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
     bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE;
 #endif
     Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
     virtual bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3],
                                     void* planes[3], size_t rowBytes[3],
@@ skipping 1184 matching lines @@
 }
 
 
 static SkImageDecoder* sk_libjpeg_dfactory(SkStreamRewindable* stream) {
     if (is_jpeg(stream)) {
         return SkNEW(SkJPEGImageDecoder);
     }
     return NULL;
 }
 
-static SkImageDecoder::Format get_format_jpeg(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_jpeg(SkStreamRewindable* stream) {
     if (is_jpeg(stream)) {
-        return SkImageDecoder::kJPEG_Format;
+        return kJPEG_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
-static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
+static SkImageEncoder* sk_libjpeg_efactory(SkEncodedFormat t) {
+    return (kJPEG_SkEncodedFormat == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libjpeg_dfactory);
 static SkImageDecoder_FormatReg gFormatReg(get_format_jpeg);
 static SkImageEncoder_EncodeReg gEReg(sk_libjpeg_efactory);