mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING

Browse Source 
in the manual, example.c, pngtest.c, and applications in the contrib directory.
It was incorrect advice.
This commit is contained in:
Glenn Randers-Pehrson 2014-11-06 06:39:56 -06:00
parent 8e7c35fc81
commit 61ea3eacb0
14 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ANNOUNCE
View File

@ -62,6 +62,9 @@ Version 1.6.15beta05 [November 5, 2014]
warnings go away. warnings go away.
Version 1.6.15beta06 [November 6, 2014] Version 1.6.15beta06 [November 6, 2014]
Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING
in example.c, pngtest.c, and applications in the contrib directory.
It was incorrect advice.
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

3
CHANGES
View File

@ -5070,6 +5070,9 @@ Version 1.6.15beta05 [November 5, 2014]
warnings go away. warnings go away.
Version 1.6.15beta06 [November 6, 2014] Version 1.6.15beta06 [November 6, 2014]
Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING
in example.c, pngtest.c, and applications in the contrib directory.
It was incorrect advice.
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

2
contrib/examples/iccfrompng.c
View File

@ -32,7 +32,7 @@ static png_byte no_profile[] = "no profile";
static png_bytep static png_bytep
extract(FILE *fp, png_uint_32 *proflen) extract(FILE *fp, png_uint_32 *proflen)
{ {
png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),0,0,0); png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
png_bytep result = NULL; png_bytep result = NULL;

2
contrib/examples/pngpixel.c
View File

@ -161,7 +161,7 @@ int main(int argc, const char **argv)
* writes error messages to stderr. Creating the png_struct is a * writes error messages to stderr. Creating the png_struct is a
* little tricky; just copy the following code. * little tricky; just copy the following code.
*/ */
png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
NULL, NULL, NULL); NULL, NULL, NULL);
if (png_ptr != NULL) if (png_ptr != NULL)

2
contrib/libtests/makepng.c
View File

@ -556,7 +556,7 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
volatile png_fixed_point gamma, chunk_insert * volatile insert, volatile png_fixed_point gamma, chunk_insert * volatile insert,
unsigned int filters, unsigned int *colors) unsigned int filters, unsigned int *colors)
{ {
png_structp png_ptr = png_create_write_struct(png_get_libpng_ver(NULL), png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
name, makepng_error, makepng_warning); name, makepng_error, makepng_warning);
volatile png_infop info_ptr = NULL; volatile png_infop info_ptr = NULL;
volatile png_bytep row = NULL; volatile png_bytep row = NULL;

4
contrib/libtests/pngimage.c
View File

@ -826,7 +826,7 @@ read_png(struct display *dp, struct buffer *bp, const char *operation,
dp->transforms = transforms; dp->transforms = transforms;
} }
dp->read_pp = pp = png_create_read_struct(png_get_libpng_ver(NULL), dp, dp->read_pp = pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, dp,
display_error, display_warning); display_error, display_warning);
if (pp == NULL) if (pp == NULL)
display_log(dp, LIBPNG_ERROR, "failed to create read struct"); display_log(dp, LIBPNG_ERROR, "failed to create read struct");
@ -1271,7 +1271,7 @@ write_png(struct display *dp, png_infop ip, int transforms)
dp->operation = "write"; dp->operation = "write";
dp->transforms = transforms; dp->transforms = transforms;
dp->write_pp = png_create_write_struct(png_get_libpng_ver(NULL), dp, dp->write_pp = png_create_write_struct(PNG_LIBPNG_VER_STRING, dp,
display_error, display_warning); display_error, display_warning);
if (dp->write_pp == NULL) if (dp->write_pp == NULL)

2
contrib/libtests/pngunknown.c
View File

@ -651,7 +651,7 @@ check(FILE *fp, int argc, const char **argv, png_uint_32p flags/*out*/,
/* Some of these errors are permanently fatal and cause an exit here, others /* Some of these errors are permanently fatal and cause an exit here, others
* are per-test and cause an error return. * are per-test and cause an error return.
*/ */
d->png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), d, error, d->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, d, error,
warning); warning);
if (d->png_ptr == NULL) if (d->png_ptr == NULL)
{ {

6
contrib/libtests/pngvalid.c
View File

@ -1559,7 +1559,7 @@ set_store_for_write(png_store *ps, png_infopp ppi,
*/ */
# ifdef PNG_USER_MEM_SUPPORTED # ifdef PNG_USER_MEM_SUPPORTED
if (!ps->speed) if (!ps->speed)
ps->pwrite = png_create_write_struct_2(png_get_libpng_ver(NULL), ps->pwrite = png_create_write_struct_2(PNG_LIBPNG_VER_STRING,
ps, store_error, store_warning, &ps->write_memory_pool, ps, store_error, store_warning, &ps->write_memory_pool,
store_malloc, store_free); store_malloc, store_free);
@ -1680,13 +1680,13 @@ set_store_for_read(png_store *ps, png_infopp ppi, png_uint_32 id,
*/ */
# ifdef PNG_USER_MEM_SUPPORTED # ifdef PNG_USER_MEM_SUPPORTED
if (!ps->speed) if (!ps->speed)
ps->pread = png_create_read_struct_2(png_get_libpng_ver(NULL), ps, ps->pread = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, ps,
store_error, store_warning, &ps->read_memory_pool, store_malloc, store_error, store_warning, &ps->read_memory_pool, store_malloc,
store_free); store_free);
else else
# endif # endif
ps->pread = png_create_read_struct(png_get_libpng_ver(NULL), ps, store_error, ps->pread = png_create_read_struct(PNG_LIBPNG_VER_STRING, ps, store_error,
store_warning); store_warning);
if (ps->pread == NULL) if (ps->pread == NULL)

2
contrib/libtests/readpng.c
View File

@ -34,7 +34,7 @@
static int static int
read_png(FILE *fp) read_png(FILE *fp)
{ {
png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),0,0,0); png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
png_bytep row = NULL, display = NULL; png_bytep row = NULL, display = NULL;

2
contrib/libtests/timepng.c
View File

@ -37,7 +37,7 @@
static int read_png(FILE *fp) static int read_png(FILE *fp)
{ {
png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),0,0,0); png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
png_bytep row = NULL, display = NULL; png_bytep row = NULL, display = NULL;

6
example.c
View File

@ -294,7 +294,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
* the compiler header file version, so that we know if the application * the compiler header file version, so that we know if the application
* was compiled with a compatible version of the library. REQUIRED * was compiled with a compatible version of the library. REQUIRED
*/ */
png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
png_voidp user_error_ptr, user_error_fn, user_warning_fn); png_voidp user_error_ptr, user_error_fn, user_warning_fn);
if (png_ptr == NULL) if (png_ptr == NULL)
@ -613,7 +613,7 @@ initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
* the library version is compatible in case we are using dynamically * the library version is compatible in case we are using dynamically
* linked libraries. * linked libraries.
*/ */
*png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
png_voidp user_error_ptr, user_error_fn, user_warning_fn); png_voidp user_error_ptr, user_error_fn, user_warning_fn);
if (*png_ptr == NULL) if (*png_ptr == NULL)
@ -779,7 +779,7 @@ void write_png(char *file_name /* , ... other image information ... */)
* the library version is compatible with the one used at compile time, * the library version is compatible with the one used at compile time,
* in case we are using dynamically linked libraries. REQUIRED. * in case we are using dynamically linked libraries. REQUIRED.
*/ */
png_ptr = png_create_write_struct(png_get_libpng_ver(NULL), png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
png_voidp user_error_ptr, user_error_fn, user_warning_fn); png_voidp user_error_ptr, user_error_fn, user_warning_fn);
if (png_ptr == NULL) if (png_ptr == NULL)

10
libpng-manual.txt
View File

@ -372,7 +372,7 @@ The structure allocation functions quietly return NULL if they fail to
create the structure, so your application should check for that. create the structure, so your application should check for that.
png_structp png_ptr = png_create_read_struct png_structp png_ptr = png_create_read_struct
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn); user_error_fn, user_warning_fn);
if (!png_ptr) if (!png_ptr)
@ -392,7 +392,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
png_create_read_struct_2() instead of png_create_read_struct(): png_create_read_struct_2() instead of png_create_read_struct():
png_structp png_ptr = png_create_read_struct_2 png_structp png_ptr = png_create_read_struct_2
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp) user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn); user_mem_ptr, user_malloc_fn, user_free_fn);
@ -2486,7 +2486,7 @@ png_infop info_ptr;
initialize_png_reader() initialize_png_reader()
{ {
png_ptr = png_create_read_struct png_ptr = png_create_read_struct
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn); user_error_fn, user_warning_fn);
if (!png_ptr) if (!png_ptr)
@ -2694,7 +2694,7 @@ both "png_ptr"; you can call them anything you like, such as
"read_ptr" and "write_ptr". Look at pngtest.c, for example. "read_ptr" and "write_ptr". Look at pngtest.c, for example.
png_structp png_ptr = png_create_write_struct png_structp png_ptr = png_create_write_struct
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn); user_error_fn, user_warning_fn);
if (!png_ptr) if (!png_ptr)
@ -2713,7 +2713,7 @@ define PNG_USER_MEM_SUPPORTED and use
png_create_write_struct_2() instead of png_create_write_struct(): png_create_write_struct_2() instead of png_create_write_struct():
png_structp png_ptr = png_create_write_struct_2 png_structp png_ptr = png_create_write_struct_2
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp) user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn); user_mem_ptr, user_malloc_fn, user_free_fn);

10
libpng.3
View File

@ -876,7 +876,7 @@ The structure allocation functions quietly return NULL if they fail to
create the structure, so your application should check for that. create the structure, so your application should check for that.
png_structp png_ptr = png_create_read_struct png_structp png_ptr = png_create_read_struct
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn); user_error_fn, user_warning_fn);
if (!png_ptr) if (!png_ptr)
@ -896,7 +896,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
png_create_read_struct_2() instead of png_create_read_struct(): png_create_read_struct_2() instead of png_create_read_struct():
png_structp png_ptr = png_create_read_struct_2 png_structp png_ptr = png_create_read_struct_2
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp) user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn); user_mem_ptr, user_malloc_fn, user_free_fn);
@ -2990,7 +2990,7 @@ png_infop info_ptr;
initialize_png_reader() initialize_png_reader()
{ {
png_ptr = png_create_read_struct png_ptr = png_create_read_struct
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn); user_error_fn, user_warning_fn);
if (!png_ptr) if (!png_ptr)
@ -3198,7 +3198,7 @@ both "png_ptr"; you can call them anything you like, such as
"read_ptr" and "write_ptr". Look at pngtest.c, for example. "read_ptr" and "write_ptr". Look at pngtest.c, for example.
png_structp png_ptr = png_create_write_struct png_structp png_ptr = png_create_write_struct
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn); user_error_fn, user_warning_fn);
if (!png_ptr) if (!png_ptr)
@ -3217,7 +3217,7 @@ define PNG_USER_MEM_SUPPORTED and use
png_create_write_struct_2() instead of png_create_write_struct(): png_create_write_struct_2() instead of png_create_write_struct():
png_structp png_ptr = png_create_write_struct_2 png_structp png_ptr = png_create_write_struct_2
(png_get_libpng_ver(NULL), (png_voidp)user_error_ptr, (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
user_error_fn, user_warning_fn, (png_voidp) user_error_fn, user_warning_fn, (png_voidp)
user_mem_ptr, user_malloc_fn, user_free_fn); user_mem_ptr, user_malloc_fn, user_free_fn);

8
pngtest.c
View File

@ -869,11 +869,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
pngtest_debug("Allocating read and write structures"); pngtest_debug("Allocating read and write structures");
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
read_ptr = read_ptr =
png_create_read_struct_2(png_get_libpng_ver(NULL), NULL, png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
NULL, NULL, NULL, png_debug_malloc, png_debug_free); NULL, NULL, NULL, png_debug_malloc, png_debug_free);
#else #else
read_ptr = read_ptr =
png_create_read_struct(png_get_libpng_ver(NULL), NULL, NULL, NULL); png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
#endif #endif
png_set_error_fn(read_ptr, &error_parameters, pngtest_error, png_set_error_fn(read_ptr, &error_parameters, pngtest_error,
pngtest_warning); pngtest_warning);
@ -881,11 +881,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
#ifdef PNG_WRITE_SUPPORTED #ifdef PNG_WRITE_SUPPORTED
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
write_ptr = write_ptr =
png_create_write_struct_2(png_get_libpng_ver(NULL), NULL, png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
NULL, NULL, NULL, png_debug_malloc, png_debug_free); NULL, NULL, NULL, png_debug_malloc, png_debug_free);
#else #else
write_ptr = write_ptr =
png_create_write_struct(png_get_libpng_ver(NULL), NULL, NULL, NULL); png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
#endif #endif
png_set_error_fn(write_ptr, &error_parameters, pngtest_error, png_set_error_fn(write_ptr, &error_parameters, pngtest_error,
pngtest_warning); pngtest_warning);