From bfefc7c95fc0e8ebd5000c68f6d16e1a3ea0e71e Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 12 Jun 2014 17:40:00 -0700 Subject: 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 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'samplecode/SampleFilter2.cpp') diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp index 552ce8a83c..0c811969ba 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 @@ public: 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; -- cgit v1.2.3