Commit Graph

2555 Commits

Author SHA1 Message Date
John Bowler
12bebfe0f9 Merge branch 'libpng16' of ../../libpng into libpng16 2015-11-28 00:08:20 -08:00
John Bowler
28a1cdfc2e Fix inconsistent handling of invalid zlib data
In libpng 1.6 zlib initialization was changed to use the window size in the zlib
stream, not a fixed value.  This causes some invalid images, ones where CINFO is
too large, to display 'correctly' if the rest of the data is valid.  This
provides a work-round for zlib versions where the error arises (ones that
support the API change to use the window size in the stream).

Signed-off-by: John Bowler <jbowler@acm.org>
2015-11-27 23:57:39 -08:00
Glenn Randers-Pehrson
e7092bc59c [libpng16] Imported from libpng-1.6.20rc01.tar 2015-11-26 07:04:24 -06:00
Glenn Randers-Pehrson
87049cbf84 [libpng16] Update CHANGES, ANNOUNCE, minor editing of contrib/*/*.c 2015-11-25 15:55:01 -06:00
Glenn Randers-Pehrson
19ffb62903 [libpng16] Update CHANGES and ANNOUNCE about pngfix.c 2015-11-25 15:25:40 -06:00
John Bowler
f5778c8fbb Fix error in handling of bad zlib CMINFO field
Signed-off-by: John Bowler <jbowler@acm.org>
2015-11-25 12:59:42 -08:00
Glenn Randers-Pehrson
92ec30a3b1 [libpng16] Imported from libpng-1.6.20beta03.tar 2015-11-24 09:34:02 -06:00
John Bowler
8a08b6457a Test backport
Tests backported from the multi-version compatible ones in libpng 1.7

Signed-off-by: John Bowler <jbowler@acm.org>
2015-11-23 20:15:51 -08:00
Glenn Randers-Pehrson
9a2065c5ee [libpng16] Imported from libpng-1.6.20beta02.tar 2015-11-23 09:29:44 -06:00
Glenn Randers-Pehrson
27f08ac11d [lbpng16] Revert 12 -> 12U change in pngrutil.c 2015-11-22 22:59:47 -06:00
Glenn Randers-Pehrson
0a9afc12de [libpng16] Fixed bug recently introduced in png_set_PLTE() that uses png_ptr
not info_ptr.
2015-11-22 20:53:02 -06:00
Glenn Randers-Pehrson
a1a2ae2a25 [libpng16] Bump version to 1.6.20beta02 2015-11-22 14:11:29 -06:00
Glenn Randers-Pehrson
26942c818e [libpng16] Imported from libpng-1.6.20beta01.tar 2015-11-22 14:08:52 -06:00
Glenn Randers-Pehrson
8ba160ba94 [libpng16] Use unsigned constants in buffer length comparisons 2015-11-21 14:31:59 -06:00
John Bowler
1ceedd0bf6 [libpng16] Another whack at png_handle_sPLT() pointer calculation. 2015-11-19 20:45:08 -06:00
Viktor Szakats
4db6127658 pngread: avoid clang warning for unreachable code
```
pngread.c:2841:10: warning: 'break' will never be executed [-Wunreachable-code-break]
         break;
         ^~~~~
```
2015-11-19 19:54:01 +01:00
Glenn Randers-Pehrson
c4b2282fee [libpng16] Removed new redundant check for length < 12 in pngrutil.c 2015-11-17 16:36:06 -06:00
Glenn Randers-Pehrson
001513c9ca [libpng16] Removed new redundant check for libpng < 12 in pngrutil.c 2015-11-17 16:23:51 -06:00
Glenn Randers-Pehrson
162f9f87f9 [libpng16] Remove newly-added useless typecasts. 2015-11-16 09:23:25 -06:00
Glenn Randers-Pehrson
9965f63a44 [libpng16] Changed size_t to png_uint_32 in new buffer checks (John Bowler) 2015-11-15 15:27:22 -06:00
Glenn Randers-Pehrson
070a0eb58f [libpng16] Revised recent pngrutil.c patch as suggested by pascal 2015-11-14 16:45:26 -06:00
Glenn Randers-Pehrson
0b4e7deab1 [libpng16] Avoid potential pointer overflow in png_handle_sPLT() and
png_handle_pCAL() (Bug report by John Regehr).
2015-11-13 11:05:27 -06:00
Glenn Randers-Pehrson
f1cdf4e1ca [libpng16] Bump version to 1.6.20beta01 2015-11-13 10:18:18 -06:00
Glenn Randers-Pehrson
415d26805a [libpng16] Imported from libpng-1.6.19.tar 2015-11-12 07:13:31 -06:00
Glenn Randers-Pehrson
83f4c735c8 [libpng16] Clean up coding style in png_handle_PLTE() 2015-11-05 11:18:44 -06:00
Glenn Randers-Pehrson
64fef09b67 [libpng16] Imported from libpng-1.6.19rc04.tar 2015-11-05 06:59:34 -06:00
Glenn Randers-Pehrson
9f2ad4928e [libpng16] Fixed new bug with CRC error after reading an over-length palette. 2015-11-04 23:47:42 -06:00
Glenn Randers-Pehrson
0e30044094 [libpng16] Imported from libpng-1.6.19rc03.tar 2015-11-03 09:57:01 -06:00
Glenn Randers-Pehrson
fc8450833a [libpng16] Clarified COPYRIGHT information to state explicitly that versions
are derived from previous versions.
Removed much of the long list of previous versions from png.h and
    libpng.3.
2015-11-03 08:24:56 -06:00
Glenn Randers-Pehrson
6761aacbfa [libpng16] Bump version to 1.6.19rc03 2015-11-03 08:15:06 -06:00
Glenn Randers-Pehrson
408dbac801 [libpng16] Fixed some inconsequential cut-and-paste typos
in png_set_cHRM_XYZ_fixed().
2015-11-01 12:38:33 -06:00
Glenn Randers-Pehrson
b00d986d54 [libpng16] Imported from libpng-1.6.19rc02.tar 2015-10-31 09:04:18 -05:00
Glenn Randers-Pehrson
305ada6672 Merge branch 'libpng16' of https://github.com/jbowler/libpng-1 into libpng16 2015-10-30 12:48:07 -05:00
Glenn Randers-Pehrson
1bef8e9799 [libpng16] Silently truncate over-length PLTE chunk while reading. 2015-10-30 11:34:37 -05:00
Glenn Randers-Pehrson
a901eb3ce6 [libpng16] Prevent reading over-length PLTE chunk (Cosmin Truta). 2015-10-30 07:57:49 -05:00
John Bowler
896c3cfb76 rowbytes check correction
The old code incorrectly calculated the output rowbytes when the
application decreased either the number of channels or the bit depth (or
both) in a user transform.  This was safe; libpng overallocated buffer
space (potentially by quite a lot; up to 4 times the amount required)
but, from 1.5.4 on, resulted in a png_error.

Signed-off-by: John Bowler <jbowler@acm.org>
2015-10-29 18:16:48 -07:00
Glenn Randers-Pehrson
06509be841 [libpng16] Bump version to 1.6.19rc02 2015-10-29 09:28:33 -05:00
Glenn Randers-Pehrson
81f44665cc [libpng16] Reject attempt to write over-length PLTE chunk 2015-10-29 09:26:41 -05:00
Glenn Randers-Pehrson
9c7ed35a65 [libpng16] Imported from libpng-1.6.19rc01.tar 2015-10-23 09:30:20 -05:00
Glenn Randers-Pehrson
05e81e18d2 [libpng16] Bump version to 1.6.19beta05 2015-10-14 22:25:29 -05:00
Glenn Randers-Pehrson
6ca8ee1518 [libpng16] Imported from libpng-1.6.19beta04.tar 2015-10-14 22:25:21 -05:00
Glenn Randers-Pehrson
59e655b020 [libpng16] Added sPLT support to pngtest.c 2015-10-10 12:05:55 -05:00
Glenn Randers-Pehrson
5bd9d66098 [libpng16] Updated CHANGES and ANNOUNCE 2015-10-03 15:16:53 -05:00
John Bowler
2163c930b0 pow and sbit fixes backported to pngvalid from 1.7
Signed-off-by: John Bowler <jbowler@acm.org>
2015-10-03 11:14:43 -07:00
John Bowler
18f0bd1d63 Merge remote-tracking branch 'local/libpng16' into libpng16 2015-09-27 08:52:50 -07:00
Glenn Randers-Pehrson
5b9c044332 Revert "[libpng16] Fix bad merge of contrib/libtests/pngvalid.c"
This reverts commit 9517f7b636.
2015-09-27 09:17:45 -05:00
John Bowler
dc3069bcb1 Merge branch 'libpng16' into libpng16-pngvalid-rgb-to-gray-digitize-issues 2015-09-26 21:29:06 -07:00
Glenn Randers-Pehrson
9517f7b636 [libpng16] Fix bad merge of contrib/libtests/pngvalid.c 2015-09-26 23:11:15 -05:00
Glenn Randers-Pehrson
b77d929217 [libpng16] Restored Makefile.am and configure.ac (they had been
inadvertently replaced with libpng17 versions).
2015-09-26 22:54:51 -05:00
Glenn Randers-Pehrson
b939ce06be [libpng17] Makefile.am and configure.ac were out of date. 2015-09-26 22:26:44 -05:00