diff options
| author |  Matt Sarett <msarett@google.com> | 2017-03-21 13:03:26 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-21 17:49:18 +0000 |
| commit | 74de1f6b352599f55034cf96e175f70c00d6d9b9 (patch) | |
| tree | ea28587577c107fc57b599b09263154d62ab90c8 /src/images | |
| parent | 189491c2813981fd51c2ad813b45e789c27297d1 (diff) | |
More png API compatibility
BUG=skia:
Change-Id: I71aa730b08b3eebd18d9651363bbcd816b8598fd
Reviewed-on: https://skia-review.googlesource.com/9976
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkPNGImageEncoder.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/images/SkPNGImageEncoder.cpp b/src/images/SkPNGImageEncoder.cpp index dd4602ad02..2eac91d0ca 100644 --- a/src/images/SkPNGImageEncoder.cpp +++ b/src/images/SkPNGImageEncoder.cpp @@ -15,6 +15,7 @@ #include "SkICC.h" #include "SkMath.h" #include "SkStream.h" +#include "SkString.h" #include "SkTemplates.h" #include "SkUnPreMultiply.h" #include "SkUtils.h" @@ -43,11 +44,14 @@ static void set_icc(png_structp png_ptr, png_infop info_ptr, const SkColorSpaceT const SkMatrix44& toXYZD50) { sk_sp<SkData> icc = SkICC::WriteToICC(fn, toXYZD50); #if PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5) + const char* name = "Skia"; png_const_bytep iccPtr = icc->bytes(); #else + SkString str("Skia"); + char* name = str.writable_str(); png_charp iccPtr = (png_charp) icc->writable_data(); #endif - png_set_iCCP(png_ptr, info_ptr, "Skia", 0, iccPtr, icc->size()); + png_set_iCCP(png_ptr, info_ptr, name, 0, iccPtr, icc->size()); } static transform_scanline_proc choose_proc(const SkImageInfo& info) { |