base/gfx/png_decoder.cc - Issue 159229: Linux: add GYP variable to use the system 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: base/gfx/png_decoder.cc

Issue 159229: Linux: add GYP variable to use the system libpng. (Closed)

Patch Set: updated to (hopefully) final style Created 11 years, 5 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: base/gfx/png_decoder.cc

diff --git a/base/gfx/png_decoder.cc b/base/gfx/png_decoder.cc

index fe0bf8938460ac87843b57436e50979b45e2e20c..5b27ed80583a7627ba05f91c26c832770860cbdb 100644

--- a/base/gfx/png_decoder.cc

+++ b/base/gfx/png_decoder.cc

@@ -8,7 +8,11 @@

#include "third_party/skia/include/core/SkBitmap.h"

extern "C" {

+#if defined(USE_SYSTEM_LIBPNG)

+#include <png.h>

+#else

#include "third_party/libpng/png.h"

+#endif

}

namespace {

« no previous file with comments | « no previous file | base/gfx/png_encoder.cc » ('j') | no next file with comments »