Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: include/core/SkImageDecoder.h

Issue 332223002: fix legacy code path for SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkImageDecoder.h
diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h
index ed17f0fbf821b396adffa7cfc2bf211168c0f7a8..c5c4c782c0ab5fd5b7c280c165daefaff62af594 100644
--- a/include/core/SkImageDecoder.h
+++ b/include/core/SkImageDecoder.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
@@ -6,7 +5,6 @@
* found in the LICENSE file.
*/
-
#ifndef SkImageDecoder_DEFINED
#define SkImageDecoder_DEFINED
@@ -355,13 +353,13 @@ public:
}
#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);
}
bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkBitmap::Config 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) {
return DecodeFile(file, bitmap, SkBitmapConfigToColorType(pref), mode, format);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698