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

Unified Diff: skia/ports/SkImageDecoder_Factory.cpp

Issue 16263: Make Skia build as a dynamic library by fixing up the imports. (Closed)
Patch Set: Created 12 years 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 | « skia/SConscript ('k') | skia/skia.vsprops » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ports/SkImageDecoder_Factory.cpp
diff --git a/skia/ports/SkImageDecoder_Factory.cpp b/skia/ports/SkImageDecoder_Factory.cpp
index d5d7b3fbc62ac425452b53ccfd8650c87e70be40..585957c8f326072dc77be8383722e1cf4ed7e976 100644
--- a/skia/ports/SkImageDecoder_Factory.cpp
+++ b/skia/ports/SkImageDecoder_Factory.cpp
@@ -34,12 +34,14 @@ struct CodecFormat {
};
static const CodecFormat gPairs[] = {
+#ifdef SK_SUPPORT_IMAGE_DECODE
{ SkImageDecoder_GIF_Factory, SkImageDecoder::kGIF_Format },
{ SkImageDecoder_PNG_Factory, SkImageDecoder::kPNG_Format },
{ SkImageDecoder_ICO_Factory, SkImageDecoder::kICO_Format },
{ SkImageDecoder_WBMP_Factory, SkImageDecoder::kWBMP_Format },
{ SkImageDecoder_BMP_Factory, SkImageDecoder::kBMP_Format },
{ SkImageDecoder_JPEG_Factory, SkImageDecoder::kJPEG_Format }
+#endif
};
SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
@@ -73,11 +75,15 @@ extern SkMovie* SkMovie_GIF_StreamFactory(SkStream*);
extern SkMovie* SkMovie_GIF_MemoryFactory(const void*, size_t);
static const SkMovieStreamProc gStreamProc[] = {
+#ifdef SK_SUPPORT_IMAGE_DECODE
SkMovie_GIF_StreamFactory
+#endif
};
static const SkMovieMemoryProc gMemoryProc[] = {
+#ifdef SK_SUPPORT_IMAGE_DECODE
SkMovie_GIF_MemoryFactory
+#endif
};
SkMovie* SkMovie::DecodeStream(SkStream* stream) {
« no previous file with comments | « skia/SConscript ('k') | skia/skia.vsprops » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698