Add SkEncodedFormat, used by SkCodec.

samplecode/SampleEncode.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkData.h"
+#include "SkEncodedFormat.h"
 #include "SkImageGenerator.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
@@ skipping 62 matching lines @@
     kN32_SkColorType,
     kRGB_565_SkColorType,
     kIndex_8_SkColorType,   // opaque
     kIndex_8_SkColorType    // alpha
 };
 
 static const char* const gConfigLabels[] = {
     "8888", "565", "Index8",  "Index8 alpha"
 };
 
-// types to encode into. Can be at most these 3. Must match up with gExt[]
-static const SkImageEncoder::Type gTypes[] = {
-    SkImageEncoder::kJPEG_Type,
-    SkImageEncoder::kPNG_Type
+// types to encode into. Can be at most these 2. Must match up with gExt[]
+static const SkEncodedFormat gTypes[] = {
+    kJPEG_SkEncodedFormat,
+    kPNG_SkEncodedFormat,
 };
 
 // must match up with gTypes[]
 static const char* const gExt[] = {
     ".jpg", ".png"
 };
 
 #include <sys/stat.h>
 
 class EncodeView : public SampleView {
@@ skipping 18 matching lines @@
                     SkDebugf("[%s:%d] failed to encode %s%s\n",
                              __FILE__, __LINE__,gConfigLabels[i], gExt[j]);
                     continue;
                 }
                 SkAutoDataUnref data(codec->encodeData(fBitmaps[i], 100));
                 if (NULL == data.get()) {
                     SkDebugf("[%s:%d] failed to encode %s%s\n",
                              __FILE__, __LINE__,gConfigLabels[i], gExt[j]);
                     continue;
                 }
-                if (SkImageEncoder::kJPEG_Type == gTypes[j]) {
+                if (kJPEG_SkEncodedFormat == gTypes[j]) {
                     fEncodedJPEGs[i].reset(data.detach());
-                } else if (SkImageEncoder::kPNG_Type == gTypes[j]) {
+                } else if (kPNG_SkEncodedFormat == gTypes[j]) {
                     fEncodedPNGs[i].reset(data.detach());
                 }
             }
         }
         this->setBGColor(0xFFDDDDDD);
     }
 
     virtual ~EncodeView() {
         delete[] fBitmaps;
         delete[] fEncodedPNGs;
@@ skipping 31 matching lines @@
             y = paint.getTextSize();
 
             canvas->drawBitmap(fBitmaps[i], x, y);
 
             SkScalar yy = y;
             for (size_t j = 0; j < SK_ARRAY_COUNT(gTypes); j++) {
                 yy += SkIntToScalar(fBitmaps[i].height() + 10);
 
                 SkBitmap bm;
                 SkData* encoded = NULL;
-                if (SkImageEncoder::kJPEG_Type == gTypes[j]) {
+                if (kJPEG_SkEncodedFormat == gTypes[j]) {
                     encoded = fEncodedJPEGs[i].get();
-                } else if (SkImageEncoder::kPNG_Type == gTypes[j]) {
+                } else if (kPNG_SkEncodedFormat == gTypes[j]) {
                     encoded = fEncodedPNGs[i].get();
                 }
                 if (encoded) {
                     if (!SkInstallDiscardablePixelRef(encoded, &bm)) {
                     SkDebugf("[%s:%d] failed to decode %s%s\n",
                              __FILE__, __LINE__,gConfigLabels[i], gExt[j]);
                     }
                     canvas->drawBitmap(bm, x, yy);
                 }
             }
@@ skipping 21 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new EncodeView; }
 static SkViewRegister reg(MyFactory);