gm/gmmain.cpp - Issue 17408002: remove double including of libpng decoder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gm/gmmain.cpp

Issue 17408002: remove double including of libpng decoder (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: add force linking to gm Created 7 years, 6 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:

Index: gm/gmmain.cpp

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp

index a5674a55685f755166f136b2bbdb83e422709921..443a26bfbc225801c37bba6ce91b2395c0ccadad 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

« no previous file with comments | « no previous file | gyp/images.gyp » ('j') | no next file with comments »