AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix legacy code path for SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG

Browse Source 
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/332223002
This commit is contained in:
reed 2014-06-16 08:25:57 -07:00 committed by Commit bot
parent 9118413608
commit 885f2ea46e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkImageDecoder.h
View File

@ -1,4 +1,3 @@
/* /*
* Copyright 2006 The Android Open Source Project * Copyright 2006 The Android Open Source Project
* *
@ -6,7 +5,6 @@
* found in the LICENSE file. * found in the LICENSE file.
*/ */
#ifndef SkImageDecoder_DEFINED #ifndef SkImageDecoder_DEFINED
#define SkImageDecoder_DEFINED #define SkImageDecoder_DEFINED
@ -355,13 +353,13 @@ public:
} }
#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG #ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG
bool decode(SkStream*, SkBitmap* bitmap, SkBitmap::Config pref, Mode mode) { bool decode(SkStream* stream, SkBitmap* bitmap, SkBitmap::Config pref, Mode mode) {
return this->decode(stream, bitmap, SkBitmapConfigToColorType(pref), mode); return this->decode(stream, bitmap, SkBitmapConfigToColorType(pref), mode);
} }
bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkBitmap::Config pref) { bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkBitmap::Config pref) {
return this->decodeSubset(bm, subset, SkBitmapConfigToColorType(pref)); return this->decodeSubset(bm, subset, SkBitmapConfigToColorType(pref));
} }
static bool DecodeFile(const char file[], SkBitmap* bitmap, SkBitmapConfig pref, Mode mode, static bool DecodeFile(const char file[], SkBitmap* bitmap, SkBitmap::Config pref, Mode mode,
Format* format = NULL) { Format* format = NULL) {
return DecodeFile(file, bitmap, SkBitmapConfigToColorType(pref), mode, format); return DecodeFile(file, bitmap, SkBitmapConfigToColorType(pref), mode, format);
} }