From c41295d1223136da4f9e4c65b7145360684ede4b Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 18 Jun 2013 20:06:36 +0000 Subject: remove double including of libpng decoder R=bungeman@google.com Author: zachr@google.com Review URL: https://chromiumcodereview.appspot.com/17408002 git-svn-id: http://skia.googlecode.com/svn/trunk@9666 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/gmmain.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gm') diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index a5674a5568..443a26bfbc 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -24,6 +24,7 @@ #include "SkDeferredCanvas.h" #include "SkDevice.h" #include "SkDrawFilter.h" +#include "SkForceLinking.h" #include "SkGPipe.h" #include "SkGraphics.h" #include "SkImageDecoder.h" @@ -37,6 +38,8 @@ #include "SkTileGridPicture.h" #include "SamplePipeControllers.h" +__SK_FORCE_IMAGE_DECODER_LINKING; + #ifdef SK_BUILD_FOR_WIN // json includes xlocale which generates warning 4530 because we're compiling without // exceptions; see https://code.google.com/p/skia/issues/detail?id=1067 -- cgit v1.2.3