diff options
| author |  djsollen <djsollen@google.com> | 2015-04-01 11:20:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-01 11:20:12 -0700 |
| commit | 1865900525b6c6df19824813c0d3222ad6a90da2 (patch) | |
| tree | c25b8cb22688f221ef43a96de11f7baf0dd888c5 /src/images | |
| parent | 2469c999518e7b0063d35e9e2eb074a0477c21ac (diff) | |
Revert of Enable both static and dynamically linked libpng (patchset #4 id:60001 of https://codereview.chromium.org/1032253003/)
Reason for revert:
breaking the nexus_9 and ios builds.
Original issue's description:
> Enable both static and dynamically linked libpng
>
> All platforms except android are configured to use the statically linked copy of libpng. Android uses the system provided dynamic copy for SkImageDecoder and the static copy for SkCodec. The exception being android framework builds that currently use the dynamic copy everywhere.
>
> This CL also enables NEON optimizations for libpng.
>
> Committed: https://skia.googlesource.com/skia/+/2469c999518e7b0063d35e9e2eb074a0477c21ac
TBR=scroggo@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1050183002
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder_libpng.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp index 44aa8e2e64..4101b3e4ec 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 |