Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(675)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/codec/SkCodec_libpng.h

Issue 1058823002: Enable both static and dynamically linked libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: original behavior 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:
View side-by-side diff with in-line comments
Download patch
« gyp/libpng.gyp ('K') | « gyp/libpng.gyp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/codec/SkCodec_libpng.h
diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h
index 8e43818204de4ff00e85888a0f8a9154847e9aa2..527efb75b70e8eaaa83dd0b6948737585562556c 100644
--- a/src/codec/SkCodec_libpng.h
+++ b/src/codec/SkCodec_libpng.h
@@ -12,9 +12,11 @@
#include "SkRefCnt.h"
#include "SkSwizzler.h"
-extern "C" {
- #include "png.h"
-}
+#ifdef SKIA_PNG_PREFIXED
+ // this must proceed png.h
+ #include "pngprefix.h"
+#endif
+#include "png.h"
class SkScanlineDecoder;
class SkStream;
« gyp/libpng.gyp ('K') | « gyp/libpng.gyp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698