diff options
| author |  djsollen <djsollen@google.com> | 2015-04-03 12:35:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-03 12:35:27 -0700 |
| commit | b2a6fe7976ae85242f9266be23eab025a7e8e7e7 (patch) | |
| tree | 92c840da319692114516ad4d3b83d31f079573ee /src/images | |
| parent | aed98b80d9a0092e8e3d3fd3ebf237b1c652f9c8 (diff) | |
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.
Review URL: https://codereview.chromium.org/1058823002
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder_libpng.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp index 4101b3e4ec..44aa8e2e64 100644 --- a/src/images/SkImageDecoder_libpng.cpp +++ b/src/images/SkImageDecoder_libpng.cpp @@ -17,9 +17,12 @@ #include "SkTemplates.h" #include "SkUtils.h" #include "transform_scanline.h" -extern "C" { + +#ifdef SKIA_PNG_PREFIXED + // this must proceed png.h + #include "pngprefix.h" +#endif #include "png.h" -} /* These were dropped in libpng >= 1.4 */ #ifndef png_infopp_NULL |