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

Unified Diff: src/images/SkImageDecoder_Factory.cpp

Issue 12958002: Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 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 | « gyp/images.gyp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkImageDecoder_Factory.cpp
diff --git a/src/images/SkImageDecoder_Factory.cpp b/src/images/SkImageDecoder_Factory.cpp
index f3cb120a477f822426a5ea63958085e88679ee8e..5640e0d9df90d5e53fbbaf01710733edfddf249b 100644
--- a/src/images/SkImageDecoder_Factory.cpp
+++ b/src/images/SkImageDecoder_Factory.cpp
@@ -18,10 +18,6 @@ typedef SkTRegistry<SkImageDecoder*, SkStream*> DecodeReg;
// corner cases.
template DecodeReg* SkTRegistry<SkImageDecoder*, SkStream*>::gHead;
-#ifdef SK_ENABLE_LIBPNG
- extern SkImageDecoder* sk_libpng_dfactory(SkStream*);
-#endif
-
SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
SkImageDecoder* codec = NULL;
const DecodeReg* curr = DecodeReg::Head();
@@ -35,13 +31,6 @@ SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
}
curr = curr->next();
}
-#ifdef SK_ENABLE_LIBPNG
- codec = sk_libpng_dfactory(stream);
- stream->rewind();
- if (codec) {
- return codec;
- }
-#endif
return NULL;
}
« no previous file with comments | « gyp/images.gyp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698