diff options
| author |  reed <reed@chromium.org> | 2014-06-12 17:40:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-12 17:40:00 -0700 |
| commit | bfefc7c95fc0e8ebd5000c68f6d16e1a3ea0e71e (patch) | |
| tree | 9e68e04fa38c4e28ac478786bfe6d402a3bff239 /samplecode/SampleFilter2.cpp | |
| parent | 9a8699f45c2bd8dac0c06829a06b6b244d19b6b2 (diff) | |
hide Config in SkImageDecoder -- use SkColorType instead
patch from issue 334613003
TBR=scroggo
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/334793002
Diffstat (limited to 'samplecode/SampleFilter2.cpp')
| -rw-r--r-- | samplecode/SampleFilter2.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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; |