commit bfefc7c95fc0e8ebd5000c68f6d16e1a3ea0e71e
author reed <reed@chromium.org> Thu Jun 12 17:40:00 2014 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 12 17:40:00 2014 -0700
tree 9e68e04fa38c4e28ac478786bfe6d402a3bff239
parent 9a8699f45c2bd8dac0c06829a06b6b244d19b6b2

hide Config in SkImageDecoder -- use SkColorType instead

patch from issue 334613003

TBR=scroggo

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/334793002

samplecode/SampleFilter2.cpp

diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp
index 552ce8a..0c81196 100644
--- a/samplecode/SampleFilter2.cpp
+++ b/samplecode/SampleFilter2.cpp
@@ -1,10 +1,10 @@
-
 /*
  * 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"
@@ -35,14 +35,12 @@
         fBitmaps = new SkBitmap[fBitmapCount];
 
         for (int i = 0; i < fBitmapCount/2; i++) {
-            SkImageDecoder::DecodeFile(gNames[i], &fBitmaps[i],
-                                       SkBitmap::kARGB_8888_Config,
-                                   SkImageDecoder::kDecodePixels_Mode, NULL);
+            SkImageDecoder::DecodeFile(gNames[i], &fBitmaps[i], kN32_SkColorType,
+                                       SkImageDecoder::kDecodePixels_Mode, NULL);
         }
         for (int i = fBitmapCount/2; i < fBitmapCount; i++) {
-            SkImageDecoder::DecodeFile(gNames[i-fBitmapCount/2], &fBitmaps[i],
-                                       SkBitmap::kRGB_565_Config,
-                                   SkImageDecoder::kDecodePixels_Mode, NULL);
+            SkImageDecoder::DecodeFile(gNames[i-fBitmapCount/2], &fBitmaps[i], kRGB_565_SkColorType,
+                                       SkImageDecoder::kDecodePixels_Mode, NULL);
         }
         fCurrIndex = 0;
 

samplecode/SampleSubpixelTranslate.cpp

diff --git a/samplecode/SampleSubpixelTranslate.cpp b/samplecode/SampleSubpixelTranslate.cpp
index 686a153..afb31c1 100644
--- a/samplecode/SampleSubpixelTranslate.cpp
+++ b/samplecode/SampleSubpixelTranslate.cpp
@@ -37,8 +37,7 @@
       }
       if (codec) {
           stream.rewind();
-          codec->decode(&stream, &fBM, SkBitmap::kARGB_8888_Config,
-                        SkImageDecoder::kDecodePixels_Mode);
+          codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
           SkDELETE(codec);
       } else {
           fBM.allocN32Pixels(1, 1);

samplecode/SampleUnpremul.cpp

diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index 0b1848d..c84e1d4 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -4,6 +4,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "gm.h"
 #include "SampleCode.h"
 #include "SkBlurMask.h"
@@ -182,8 +183,7 @@
         if (!fPremul) {
             decoder->setRequireUnpremultipliedColors(true);
         }
-        fDecodeSucceeded = decoder->decode(&stream, &fBitmap,
-                                           SkBitmap::kARGB_8888_Config,
+        fDecodeSucceeded = decoder->decode(&stream, &fBitmap, kN32_SkColorType,
                                            SkImageDecoder::kDecodePixels_Mode);
         this->inval(NULL);
     }