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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/images/SkImageDecoder_libpng.cpp

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
« src/codec/SkCodec_libpng.h ('K') | « src/codec/SkCodec_libpng.h ('k') | third_party/libpng/README.google » ('j') | third_party/libpng/README.google » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkImageDecoder_libpng.cpp
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp
index 4101b3e4ec30ce07d57955c2f772d0b4698cdebb..cf494ff98af86af72411b20da9e0fda279515ba8 100644
--- a/src/images/SkImageDecoder_libpng.cpp
+++ b/src/images/SkImageDecoder_libpng.cpp
@@ -17,8 +17,13 @@
#include "SkTemplates.h"
#include "SkUtils.h"
#include "transform_scanline.h"
+
extern "C" {
-#include "png.h"
+ #ifdef SKIA_PNG_PREFIXED
scroggo 2015/04/01 15:40:20 nit: Why are you using two space indents?
djsollen 2015/04/01 17:19:01 Done.
+ // this must proceed png.h
+ #include "pngprefix.h"
+ #endif
+ #include "png.h"
}
/* These were dropped in libpng >= 1.4 */
« src/codec/SkCodec_libpng.h ('K') | « src/codec/SkCodec_libpng.h ('k') | third_party/libpng/README.google » ('j') | third_party/libpng/README.google » ('J')

Powered by Google App Engine
This is Rietveld 408576698