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

Unified Diff: tools/skimage_main.cpp

Issue 14029011: Include gif image decoding in images/ on linux. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Respond to nit Created 7 years, 8 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') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/skimage_main.cpp
diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp
index dc5bdd42607be18b3ad55cc87e0f14977d49800f..b486d5d1a3fd45cab4a0af407719e5eda88550ca 100644
--- a/tools/skimage_main.cpp
+++ b/tools/skimage_main.cpp
@@ -159,8 +159,15 @@ int tool_main(int argc, char** argv) {
void forceLinking();
void forceLinking() {
+ // This function leaks, but that is okay because it is not intended
+ // to be called. It is only here so that the linker will include the
+ // decoders.
SkDEBUGCODE(SkImageDecoder *creator = ) CreateJPEGImageDecoder();
SkASSERT(creator);
+#ifdef SK_BUILD_FOR_UNIX
+ SkDEBUGCODE(creator = ) CreateGIFImageDecoder();
+ SkASSERT(creator);
+#endif
}
#if !defined SK_BUILD_FOR_IOS
« no previous file with comments | « gyp/images.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698