[libpng17] Added sPLT support to pngtest.c

This commit is contained in:
Glenn Randers-Pehrson 2015-10-10 11:15:39 -05:00
parent 90992547c7
commit 5b05197604
3 changed files with 20 additions and 4 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta67 - October 3, 2015 Libpng 1.7.0beta67 - October 10, 2015
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -944,12 +944,13 @@ Version 1.7.0beta66 [October 2, 2015]
extended sBIT handling to the colormap code in the simplified API extended sBIT handling to the colormap code in the simplified API
which is separately implemented in pngread.c (John Bowler). which is separately implemented in pngread.c (John Bowler).
Version 1.7.0beta67 [October 3, 2015] Version 1.7.0beta67 [October 10, 2015]
Fixed 'pow' macros in pngvalid.c. It is legal for 'pow' to be a Fixed 'pow' macros in pngvalid.c. It is legal for 'pow' to be a
macro, therefore the argument list cannot contain preprocessing macro, therefore the argument list cannot contain preprocessing
directives. Make sure pow is a function where this happens. This is directives. Make sure pow is a function where this happens. This is
a minimal safe fix, the issue only arises in non-performance-critical a minimal safe fix, the issue only arises in non-performance-critical
code (bug report by Curtis Leach, fix by John Bowler). code (bug report by Curtis Leach, fix by John Bowler).
Added sPLT chunk support to pngtest.c
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -5243,12 +5243,13 @@ Version 1.7.0beta66 [October 2, 2015]
extended sBIT handling to the colormap code in the simplified API extended sBIT handling to the colormap code in the simplified API
which is separately implemented in pngread.c (John Bowler). which is separately implemented in pngread.c (John Bowler).
Version 1.7.0beta67 [October 3, 2015] Version 1.7.0beta67 [October 10, 2015]
Fixed 'pow' macros in pngvalid.c. It is legal for 'pow' to be a Fixed 'pow' macros in pngvalid.c. It is legal for 'pow' to be a
macro, therefore the argument list cannot contain preprocessing macro, therefore the argument list cannot contain preprocessing
directives. Make sure pow is a function where this happens. This is directives. Make sure pow is a function where this happens. This is
a minimal safe fix, the issue only arises in non-performance-critical a minimal safe fix, the issue only arises in non-performance-critical
code (bug report by Curtis Leach, fix by John Bowler). code (bug report by Curtis Leach, fix by John Bowler).
Added sPLT chunk support to pngtest.c
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng /* pngtest.c - a simple test program to test libpng
* *
* Last changed in libpng 1.6.18 [(PENDING RELEASE)] * Last changed in libpng 1.7.0 [(PENDING RELEASE)]
* Copyright (c) 1998-2015 Glenn Randers-Pehrson * Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -61,6 +61,7 @@
defined PNG_READ_sBIT_SUPPORTED &&\ defined PNG_READ_sBIT_SUPPORTED &&\
defined PNG_READ_sCAL_SUPPORTED &&\ defined PNG_READ_sCAL_SUPPORTED &&\
defined PNG_READ_sRGB_SUPPORTED &&\ defined PNG_READ_sRGB_SUPPORTED &&\
defined PNG_READ_sPLT_SUPPORTED &&\
defined PNG_READ_tEXt_SUPPORTED &&\ defined PNG_READ_tEXt_SUPPORTED &&\
defined PNG_READ_tIME_SUPPORTED &&\ defined PNG_READ_tIME_SUPPORTED &&\
defined PNG_READ_zTXt_SUPPORTED &&\ defined PNG_READ_zTXt_SUPPORTED &&\
@ -1244,6 +1245,19 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
#endif #endif
#endif #endif
#endif #endif
#ifdef PNG_sPLT_SUPPORTED
{
png_sPLT_tp entries;
int num_entries = (int) png_get_sPLT(read_ptr, read_info_ptr, &entries);
if (num_entries)
{
png_set_sPLT(write_ptr, write_info_ptr, entries, num_entries);
}
}
#endif
#ifdef PNG_TEXT_SUPPORTED #ifdef PNG_TEXT_SUPPORTED
{ {
png_textp text_ptr; png_textp text_ptr;