aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
diff options
context:
space:
mode:
authorGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-01 21:17:27 +0000
committerGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-01 21:17:27 +0000
commitc4ebdb03def1e9d03ccff05f32db0eec106cc361 (patch)
tree36a0ab25d571debbc1c64180500d5d6229217bdf /gm
parent22eb7944e07ed5761c901265ecb802ab608d302b (diff)
Force linking with image decoders for images project.
Previously, each tool that wanted to use image decoders but did not specifically reference them had to create a dummy function that references them in order to ensure they are not stripped by the linker. Instead of making each tool reference each image decoder, do it once in SkImageDecoder.cpp. Now each tool will have image decoders linked in, assuming it includes the images project. This fixes a bug where SKPs with encoded data could not be read by bench_ or render_pictures. R=djsollen@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/14678003 git-svn-id: http://skia.googlecode.com/svn/trunk@8941 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
-rw-r--r--gm/cmykjpeg.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp
index 7ac42592a8..1d64d1c871 100644
--- a/gm/cmykjpeg.cpp
+++ b/gm/cmykjpeg.cpp
@@ -64,13 +64,6 @@ private:
typedef GM INHERITED;
};
-void forceLinking();
-
-void forceLinking() {
- SkDEBUGCODE(SkImageDecoder *creator = ) CreateJPEGImageDecoder();
- SkASSERT(creator);
-}
-
//////////////////////////////////////////////////////////////////////////////
static GM* MyFactory(void*) { return new CMYKJpegGM; }