Chromium Code Reviews| Index: src/codec/SkPngCodec.cpp |
| diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp |
| index 1b51432e5ec1c1bb143ca69972d08968ce1a8c5f..df08dc32fbc6bb6d96da9f2d46ff1ecb2ed131fb 100644 |
| --- a/src/codec/SkPngCodec.cpp |
| +++ b/src/codec/SkPngCodec.cpp |
| @@ -178,6 +178,8 @@ static float png_fixed_point_to_float(png_fixed_point x) { |
| // return NULL. |
| SkColorSpace* read_color_space(png_structp png_ptr, png_infop info_ptr) { |
| +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 6 |
|
hal.canary
2016/03/04 22:01:06
what happens when we hit 2.0 ?
|
| + |
| // First check for an ICC profile |
| png_bytep profile; |
| png_uint_32 length; |
| @@ -249,6 +251,8 @@ SkColorSpace* read_color_space(png_structp png_ptr, png_infop info_ptr) { |
| return SkColorSpace::NewRGB(toXYZD50, gammas); |
| } |
| +#endif // LIBPNG >= 1.6 |
| + |
| // Finally, what should we do if there is no color space information in the PNG? |
| // The specification says that this indicates "gamma is unknown" and that the |
| // "color is device dependent". I'm assuming we can represent this with NULL. |