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

Unified Diff: src/images/SkImageDecoder_libpng.cpp

Issue 1050183002: Revert of Enable both static and dynamically linked libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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
« no previous file with comments | « src/codec/SkCodec_libpng.h ('k') | third_party/libpng/README.google » ('j') | no next file with comments »
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 44aa8e2e645d6d3379a175457d6cd6a76ed4fa61..4101b3e4ec30ce07d57955c2f772d0b4698cdebb 100644
--- a/src/images/SkImageDecoder_libpng.cpp
+++ b/src/images/SkImageDecoder_libpng.cpp
@@ -17,12 +17,9 @@
#include "SkTemplates.h"
#include "SkUtils.h"
#include "transform_scanline.h"
-
-#ifdef SKIA_PNG_PREFIXED
- // this must proceed png.h
- #include "pngprefix.h"
-#endif
+extern "C" {
#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 »

Powered by Google App Engine
This is Rietveld 408576698