diff options
| author | thestig <thestig@chromium.org> | 2016-08-03 16:29:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-03 16:29:18 -0700 |
| commit | 6d5c56b44d1821a715f4496668373ac6d1f1d3c6 (patch) | |
| tree | 8eea2b264c779be6c35ddaa33f1496dd73300167 /third_party/libpng16/pngget.c | |
| parent | 96a07863120273c8b89cba0e7d53ef29ae56d580 (diff) | |
| download | pdfium-6d5c56b44d1821a715f4496668373ac6d1f1d3c6.tar.xz | |
Update libpng to 1.6.22.
Sync up with Chromium's copy of libpng.
Review-Url: https://codereview.chromium.org/2132263002
Diffstat (limited to 'third_party/libpng16/pngget.c')
| -rw-r--r-- | third_party/libpng16/pngget.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/third_party/libpng16/pngget.c b/third_party/libpng16/pngget.c index 743a6a9bbc..14fc7be520 100644 --- a/third_party/libpng16/pngget.c +++ b/third_party/libpng16/pngget.c @@ -2,7 +2,7 @@ /* pngget.c - retrieval of values from info struct * * Last changed in libpng 1.6.17 [March 26, 2015] - * Copyright (c) 1998-2015 Glenn Randers-Pehrson + * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -456,11 +456,11 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr, return (retval); } #endif /* pHYs */ -#endif /* INCH_CONVERSIONS */ +#endif /* INCH_CONVERSIONS */ /* png_get_channels really belongs in here, too, but it's been around longer */ -#endif /* EASY_ACCESS */ +#endif /* EASY_ACCESS */ png_byte PNGAPI @@ -1142,19 +1142,19 @@ png_get_compression_buffer_size(png_const_structrp png_ptr) return 0; #ifdef PNG_WRITE_SUPPORTED - if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0) + if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0) #endif { #ifdef PNG_SEQUENTIAL_READ_SUPPORTED - return png_ptr->IDAT_read_size; + return png_ptr->IDAT_read_size; #else - return PNG_IDAT_READ_SIZE; + return PNG_IDAT_READ_SIZE; #endif } #ifdef PNG_WRITE_SUPPORTED - else - return png_ptr->zbuffer_size; + else + return png_ptr->zbuffer_size; #endif } |