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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/codec/SkCodec_libpng.h

Issue 1032253003: Enable both static and dynamically linked libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase 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') | src/images/SkImageDecoder_libpng.cpp » ('J')
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 3afaa39bf4f4d84917bf9b3eb7fabaddda6991af..65a326322328a3694efac69e837ebb424dd5995d 100644
--- a/src/codec/SkCodec_libpng.h
+++ b/src/codec/SkCodec_libpng.h
@@ -13,7 +13,11 @@
#include "SkSwizzler.h"
extern "C" {
- #include "png.h"
+ #ifdef SKIA_PNG_PREFIXED
scroggo 2015/04/01 15:40:20 nit: four space indents?
djsollen 2015/04/01 17:19:01 Done.
+ // this must proceed png.h
+ #include "pngprefix.h"
+ #endif
+ #include "png.h"
}
class SkScanlineDecoder;
« gyp/libpng.gyp ('K') | « gyp/libpng.gyp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | src/images/SkImageDecoder_libpng.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698