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

Unified Diff: dm/DM.cpp

Issue 1011343003: Enabling ico decoding with use of png and bmp decoders (Closed) Base URL: https://skia.googlesource.com/skia.git@swizzle
Patch Set: Removed additional blacklist items Created 5 years, 9 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 | dm/DMSrcSink.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 833af0edbaa267c8ac9be4314a79be0443051e0a..44090ca1ce46ced5406554f5b5bdf8e6d3458440 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -146,7 +146,9 @@ static void push_src(const char* tag, Src* s) {
static bool codec_supported(const char* ext) {
// FIXME: Once other versions of SkCodec are available, we can add them to this
// list (and eventually we can remove this check once they are all supported).
- return strcmp(ext, "png") == 0 || strcmp(ext, "PNG") == 0;
+ return strcmp(ext, "png") == 0 || strcmp(ext, "PNG") == 0 ||
+ strcmp(ext, "bmp") == 0 || strcmp(ext, "BMP") == 0 ||
+ strcmp(ext, "ico") == 0 || strcmp(ext, "ICO") == 0;
}
static void gather_srcs() {
« no previous file with comments | « no previous file | dm/DMSrcSink.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698