src/images/SkImageDecoder_libpng.cpp - Issue 1058823002: Enable both static and dynamically linked libpng

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: src/images/SkImageDecoder_libpng.cpp

Issue 1058823002: Enable both static and dynamically linked libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: win fix Created 5 years, 9 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: src/images/SkImageDecoder_libpng.cpp

diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp

index 4101b3e4ec30ce07d57955c2f772d0b4698cdebb..44aa8e2e645d6d3379a175457d6cd6a76ed4fa61 100644

--- a/src/images/SkImageDecoder_libpng.cpp

+++ b/src/images/SkImageDecoder_libpng.cpp

@@ -17,9 +17,12 @@

#include "SkTemplates.h"

#include "SkUtils.h"

#include "transform_scanline.h"

-extern "C" {

+#ifdef SKIA_PNG_PREFIXED

+ // this must proceed png.h

+ #include "pngprefix.h"

+#endif

#include "png.h"

/* These were dropped in libpng >= 1.4 */

#ifndef png_infopp_NULL

« no previous file with comments | « src/codec/SkCodec_libpng.h ('k') | third_party/libpng/README.google » ('j') | no next file with comments »