Commit Graph

2683 Commits

Author SHA1 Message Date
John Bowler
98af505439 Fix MSVC Level 4 warning
MSVC does not like (uInt) = -(unsigned) (i.e. as an initializer), but it is fine
with it if the conversion is explicitly invoked by a cast.

Signed-off-by: John Bowler <jbowler@acm.org>
2016-06-22 17:37:20 -07:00
John Bowler
1df0ace0b4 Fix MSVC Level 2 warning
MSVC doesn't like '-(unsigned)', so replace it by 0U-(unsigned) (in 1.6).

Signed-off-by: John Bowler <jbowler@acm.org>
2016-06-22 17:35:49 -07:00
John Bowler
4af267c07b Merge branch 'libpng16' of ../../libpng into libpng16 2016-06-20 09:23:59 -07:00
Glenn Randers-Pehrson
6c7c5a04b8 [libpng16] More efficient absolute value calculation on SSE2 (Matthieu Darbois). 2016-06-20 08:28:34 -05:00
Glenn Randers-Pehrson
42069e9432 Merge branch 'tryagain' of git://github.com/mattsarett/libpng into libpng16 2016-06-20 08:27:24 -05:00
Matt Sarett
36762ac4b4 More efficient absolute value on SSE2 2016-06-20 09:06:25 -04:00
Glenn Randers-Pehrson
147dc568da [libpng16] Backed out previous optimization; the compiler should handle that. 2016-06-19 22:20:52 -05:00
Glenn Randers-Pehrson
29135161d7 [libpng16] Avoid filter-selection heuristic sum calculations in cases where
only one filter is a candidate for selection. This trades off code size (added
png_setup_*_row_only() functions) for speed.
2016-06-19 18:43:35 -05:00
John Bowler
9c04f57cab [libpng15] Corrected filter heuristic overflow handling. 2016-06-19 18:01:33 -05:00
John Bowler
e1123aa80c Merge branch 'libpng16' of ../../libpng into libpng16 2016-06-12 06:51:09 -07:00
Glenn Randers-Pehrson
4a8105e925 [libpng16] Bump version to 1.6.24beta02 2016-06-11 18:07:44 -05:00
Glenn Randers-Pehrson
51df269afe [libpng16] Imported from libpng-1.6.24beta01.tar 2016-06-11 18:07:22 -05:00
John Bowler
bf2613b975 Merge branch 'libpng16' of ../../libpng into libpng16 2016-06-11 14:18:35 -07:00
John Bowler
5c6b7e177c [libpng16] Avoid potential overflow of the PNG_IMAGE_SIZE macro. This macro
is not used within libpng, but is used in some of the examples.
2016-06-11 14:11:09 -05:00
Glenn Randers-Pehrson
428f5ddabd [libpng16] Bump version to 1.6.24beta01 2016-06-11 14:10:03 -05:00
John Bowler
a4b26efa1f Change image size checks
This covers the case where PNG_IMAGE_BUFFER_SIZE can overflow in the application
as a result of the application using an increased 'row_stride'; previously
png_image_finish_read only checked for overflow on the base calculation of
components.  (I.e. it checked for overflow of a 32-bit number on the total
number of pixel components in the output format, not the possibly padded row
length and not the number of bytes, which for linear formats is twice the number
of components.)

Signed-off-by: John Bowler <jbowler@acm.org>
2016-06-11 10:04:28 -07:00
Glenn Randers-Pehrson
ed6db9d86b [libpng16] Imported from libpng-1.6.23.tar 2016-06-09 06:49:42 -05:00
Glenn Randers-Pehrson
ee3c4e43ae [libpng16] Fixed bad link to RFC2083 in png.5 (Nikola Forro). 2016-06-07 08:22:18 -05:00
Glenn Randers-Pehrson
6d4e4d0cce [libpng16] Imported from libpng-1.6.23rc02.tar 2016-06-03 21:28:20 -05:00
Glenn Randers-Pehrson
89158b9ad1 [libpng16] Fixed undefined behavior in png_push_save_buffer(). Do not call
memcpy() with a null source, even if count is zero (Leon Scroggins III).
2016-06-03 18:40:42 -05:00
Glenn Randers-Pehrson
1fdac25f66 [libpng16] Imported from libpng-1.6.23rc01.tar 2016-06-01 19:17:57 -05:00
Glenn Randers-Pehrson
1017744c94 [libpng16] Added missing ")" in pngerror.c (Matt Sarrett). 2016-06-01 08:59:48 -05:00
Glenn Randers-Pehrson
f757d74898 [libpng16] Moved sse2 prototype from pngpriv.h to contrib/intel/intel_sse.patch. 2016-05-31 09:45:17 -05:00
John Bowler
bd2370c054 pngvalid.c: don't use size_t count arguments
Coverity rejects code where an array element count has type size_t, this
elminates the code in question from contrib/libtests/pngvalid.c

Signed-off-by: John Bowler <jbowler@acm.org>
2016-05-30 08:12:51 -07:00
Glenn Randers-Pehrson
dbfd68ae3a [libpng16] Update CHANGES, ANNOUNCE, and change date in pngvalid.c 2016-05-29 15:47:57 -05:00
John Bowler
801b925edf pngvalid.c: correct progressive read input buffer
The previous version of the code invariably passed just one byte at a time to
libpng.  The intention was to pass a random number of bytes in the range 0..511
(and this is what happens now).

Signed-off-by: John Bowler <jbowler@acm.org>
2016-05-29 09:30:00 -07:00
Glenn Randers-Pehrson
a201f859cd [libpng16] Bump version to 1.6.23beta02 2016-05-29 09:52:31 -05:00
Glenn Randers-Pehrson
84cc738166 [libpng16] Imported from libpng-1.6.23beta01.tar 2016-05-29 09:47:30 -05:00
John Bowler
81f0273d54 [libpng16] Added tests in pngvalid.c to check zero-length IDAT chunks in various
positions.  Fixed the sequential reader to handle these more robustly
(John Bowler).
2016-05-29 09:45:33 -05:00
Timothy Nikkel
3f46c67c69 [libpng16] Fixed the progressive reader to handle empty first IDAT chunk
properly (patch by Timothy Nikkel).
2016-05-29 09:44:04 -05:00
Glenn Randers-Pehrson
6c7459e455 [libpng16] Ensure png_ptr->trans_values is set in png_set_tRNS(). 2016-05-27 20:09:23 -05:00
Glenn Randers-Pehrson
8d16725373 [libpng16] Stop a potential memleak in png_set_tRNS() (Bug report by Ted Ying). 2016-05-27 19:55:44 -05:00
Glenn Randers-Pehrson
4e34fd3b8a [libpng16] Bump version to 1.6.23beta01 2016-05-27 19:48:24 -05:00
Glenn Randers-Pehrson
ac43a87820 [libpng16] Imported from libpng-1.6.22.tar 2016-05-26 07:25:14 -05:00
Glenn Randers-Pehrson
474751e6b2 [libpng16] Bump version to 1.6.22rc04 2016-05-18 07:32:07 -05:00
Glenn Randers-Pehrson
37ab4d946c [libpng16] Imported from libpng-1.6.22rc03.tar 2016-05-18 07:26:06 -05:00
Glenn Randers-Pehrson
d6e5a72c84 [libpng16] Restored contrib/timepng to default build but check for check for
presence of clock_gettime() in configure.ac and Makefile.am.
2016-05-17 18:35:59 -05:00
Glenn Randers-Pehrson
add4581894 [libpng16] Imported from libpng-1.6.22rc02.tar 2016-05-16 16:18:48 -05:00
Glenn Randers-Pehrson
45ad37b31b [libpng16] Removed contrib/timepng from default build; it does not build
on platforms that don't supply clock_gettime().
2016-05-16 16:14:12 -05:00
Glenn Randers-Pehrson
f6ca49c863 [libpng16] Imported from libpng-1.6.22rc01.tar 2016-05-14 09:47:55 -05:00
Glenn Randers-Pehrson
7fa1b5b26c [libpng16] Bump version to 1.6.22beta07 2016-05-05 19:38:04 -05:00
Glenn Randers-Pehrson
0794fee913 [libpng16] Imported from libpng-1.6.22beta06.tar 2016-05-05 19:37:54 -05:00
David Capello
319a7b842b Fix genout compilation when CMAKE_OSX_ARCHITECTURES isn't specified 2016-05-04 11:30:43 -03:00
Glenn Randers-Pehrson
50d41533d2 [libpng16] Log changes to scripts/genout.cmake.in (David Capello, Nixon Kwok): 2016-05-01 19:38:12 -05:00
Glenn Randers-Pehrson
8e89b13c47 [libpng16] Fixed issues with scripts/genout.cmake.in (pull requests from dacap@github):
Added support to use multiple directories in ZLIBINCDIR variable,
    Fixed CMAKE_C_FLAGS with multiple values when genout is compiled on MSVC,
    Fixed pnglibconf.c compilation on OS X including the sysroot path.
2016-05-01 19:27:30 -05:00
Glenn Randers-Pehrson
f962ee9dc6 Merge branch 'fix-pnglibconf-on-osx' of git://github.com/aseprite/libpng into libpng16 2016-05-01 19:04:25 -05:00
Glenn Randers-Pehrson
a271625928 Merge branch 'fix-genout-with-multiple-zlib-inc-dirs' of git://github.com/aseprite/libpng into libpng16 2016-05-01 19:03:46 -05:00
Glenn Randers-Pehrson
9f642c1bbc Merge branch 'fix-genout-with-multiple-c-flags' of git://github.com/aseprite/libpng into libpng16 2016-05-01 19:02:49 -05:00
Glenn Randers-Pehrson
21939d36ec [libpng16] Use PNG_UINT_31_MAX instead of constant 0x7fffffff in timepng.c 2016-04-29 21:48:52 -05:00
Glenn Randers-Pehrson
8c754b1834 [libpng16] Quieted two Coverity issues in contrib/libtests/timepng.c. 2016-04-28 21:23:37 -05:00