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

Unified Diff: tools/skimage_main.cpp

Issue 14678003: Force linking with image decoders for images project. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: respond to comment 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 | « src/images/SkImageDecoder.cpp ('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 188164ff06ac6d43f1ac337779510f07fef4e560..7906386cdce2fb7f25999863f0c215826a7349ac 100644
--- a/tools/skimage_main.cpp
+++ b/tools/skimage_main.cpp
@@ -292,22 +292,6 @@ int tool_main(int argc, char** argv) {
return failed ? -1 : 0;
}
-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);
- SkDEBUGCODE(creator = ) CreateWEBPImageDecoder();
- SkASSERT(creator);
-#ifdef SK_BUILD_FOR_UNIX
- SkDEBUGCODE(creator = ) CreateGIFImageDecoder();
- SkASSERT(creator);
-#endif
-}
-
#if !defined SK_BUILD_FOR_IOS
int main(int argc, char * const argv[]) {
return tool_main(argc, (char**) argv);
« no previous file with comments | « src/images/SkImageDecoder.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698