diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-10-20 06:03:07 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-10-20 06:03:07 +0000 |
commit | 34250b2e3ede4213a43893839b8dd083619df232 (patch) | |
tree | 495e2318579c57b5d56364b635177ba3e1f6a8df /Build/source/libs/libpng/libpng-src/pngtest.c | |
parent | f2301b10f959f2fd3dde3223e6bd50c7ae1ee09a (diff) |
libpng 1.6.26
git-svn-id: svn://tug.org/texlive/trunk@42309 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng/libpng-src/pngtest.c')
-rw-r--r-- | Build/source/libs/libpng/libpng-src/pngtest.c | 105 |
1 files changed, 50 insertions, 55 deletions
diff --git a/Build/source/libs/libpng/libpng-src/pngtest.c b/Build/source/libs/libpng/libpng-src/pngtest.c index 9034d16fc4f..dd558ddfb84 100644 --- a/Build/source/libs/libpng/libpng-src/pngtest.c +++ b/Build/source/libs/libpng/libpng-src/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.6.25 [September 1, 2016] + * Last changed in libpng 1.6.26 [October 20, 2016] * Copyright (c) 1998-2002,2004,2006-2016 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.) @@ -43,15 +43,6 @@ #include "png.h" -/* 1.6.1 added support for the configure test harness, which uses 77 to indicate - * a skipped test, in earlier versions we need to succeed on a skipped test, so: - */ -#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H) -# define SKIP 77 -#else -# define SKIP 0 -#endif - /* Known chunks that exist in pngtest.png must be supported or pngtest will fail * simply as a result of re-ordering them. This may be fixed in 1.7 * @@ -514,10 +505,10 @@ typedef struct memory_information typedef memory_information *memory_infop; static memory_infop pinformation = NULL; -static png_alloc_size_t current_allocation = 0; -static png_alloc_size_t maximum_allocation = 0; -static png_alloc_size_t total_allocation = 0; -static png_alloc_size_t num_allocations = 0; +static int current_allocation = 0; +static int maximum_allocation = 0; +static int total_allocation = 0; +static int num_allocations = 0; png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr, png_alloc_size_t size)); @@ -604,10 +595,9 @@ png_debug_free(png_structp png_ptr, png_voidp ptr) if (pinfo->pointer == ptr) { *ppinfo = pinfo->next; - if (current_allocation < pinfo->size) + current_allocation -= pinfo->size; + if (current_allocation < 0) fprintf(STDERR, "Duplicate free of memory\n"); - else - current_allocation -= pinfo->size; /* We must free the list element too, but first kill the memory that is to be freed. */ memset(ptr, 0x55, pinfo->size); @@ -939,12 +929,6 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) read_user_chunk_callback); #endif -#ifdef PNG_SET_USER_LIMITS_SUPPORTED -# ifdef CHUNK_LIMIT /* from the build, for testing */ - png_set_chunk_malloc_max(read_ptr, CHUNK_LIMIT); -# endif /* CHUNK_LIMIT */ -#endif - #ifdef PNG_SETJMP_SUPPORTED pngtest_debug("Setting jmpbuf for read struct"); if (setjmp(png_jmpbuf(read_ptr))) @@ -980,15 +964,16 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) #endif #endif +#ifdef PNG_BENIGN_ERRORS_SUPPORTED if (strict != 0) { /* Treat png_benign_error() as errors on read */ png_set_benign_errors(read_ptr, 0); -#ifdef PNG_WRITE_SUPPORTED +# ifdef PNG_WRITE_SUPPORTED /* Treat them as errors on write */ png_set_benign_errors(write_ptr, 0); -#endif +# endif /* if strict is not set, then app warnings and errors are treated as * warnings in release builds, but not in unstable builds; this can be @@ -1001,10 +986,15 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) /* Allow application (pngtest) errors and warnings to pass */ png_set_benign_errors(read_ptr, 1); -#ifdef PNG_WRITE_SUPPORTED + /* Turn off CRC and ADLER32 checking while reading */ + png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + +# ifdef PNG_WRITE_SUPPORTED png_set_benign_errors(write_ptr, 1); -#endif +# endif + } +#endif /* BENIGN_ERRORS */ pngtest_debug("Initializing input and output streams"); #ifdef PNG_STDIO_SUPPORTED @@ -1402,6 +1392,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) png_write_info(write_ptr, write_info_ptr); write_chunks(write_ptr, before_IDAT); /* after PLTE */ + +#ifdef PNG_COMPRESSION_COMPAT + /* Test the 'compatibility' setting here, if it is available. */ + png_set_compression(write_ptr, PNG_COMPRESSION_COMPAT); +#endif #endif #ifdef SINGLE_ROWBUF_ALLOC @@ -1883,7 +1878,7 @@ main(int argc, char *argv[]) { int i; #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG - png_alloc_size_t allocation_now = current_allocation; + int allocation_now = current_allocation; #endif for (i=2; i<argc; ++i) { @@ -1916,15 +1911,15 @@ main(int argc, char *argv[]) } #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG if (allocation_now != current_allocation) - fprintf(STDERR, "MEMORY ERROR: %lu bytes lost\n", - (unsigned long)(current_allocation - allocation_now)); + fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n", + current_allocation - allocation_now); if (current_allocation != 0) { memory_infop pinfo = pinformation; - fprintf(STDERR, "MEMORY ERROR: %lu bytes still allocated\n", - (unsigned long)current_allocation); + fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n", + current_allocation); while (pinfo != NULL) { @@ -1937,14 +1932,14 @@ main(int argc, char *argv[]) #endif } #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG - fprintf(STDERR, " Current memory allocation: %20lu bytes\n", - (unsigned long)current_allocation); - fprintf(STDERR, " Maximum memory allocation: %20lu bytes\n", - (unsigned long) maximum_allocation); - fprintf(STDERR, " Total memory allocation: %20lu bytes\n", - (unsigned long)total_allocation); - fprintf(STDERR, " Number of allocations: %20lu\n", - (unsigned long)num_allocations); + fprintf(STDERR, " Current memory allocation: %10d bytes\n", + current_allocation); + fprintf(STDERR, " Maximum memory allocation: %10d bytes\n", + maximum_allocation); + fprintf(STDERR, " Total memory allocation: %10d bytes\n", + total_allocation); + fprintf(STDERR, " Number of allocations: %10d\n", + num_allocations); #endif } @@ -1955,7 +1950,7 @@ main(int argc, char *argv[]) { int kerror; #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG - png_alloc_size_t allocation_now = current_allocation; + int allocation_now = current_allocation; #endif if (i == 1) status_dots_requested = 1; @@ -2005,15 +2000,15 @@ main(int argc, char *argv[]) } #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG if (allocation_now != current_allocation) - fprintf(STDERR, "MEMORY ERROR: %lu bytes lost\n", - (unsigned long)(current_allocation - allocation_now)); + fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n", + current_allocation - allocation_now); if (current_allocation != 0) { memory_infop pinfo = pinformation; - fprintf(STDERR, "MEMORY ERROR: %lu bytes still allocated\n", - (unsigned long)current_allocation); + fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n", + current_allocation); while (pinfo != NULL) { @@ -2025,14 +2020,14 @@ main(int argc, char *argv[]) #endif } #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG - fprintf(STDERR, " Current memory allocation: %20lu bytes\n", - (unsigned long)current_allocation); - fprintf(STDERR, " Maximum memory allocation: %20lu bytes\n", - (unsigned long)maximum_allocation); - fprintf(STDERR, " Total memory allocation: %20lu bytes\n", - (unsigned long)total_allocation); - fprintf(STDERR, " Number of allocations: %20lu\n", - (unsigned long)num_allocations); + fprintf(STDERR, " Current memory allocation: %10d bytes\n", + current_allocation); + fprintf(STDERR, " Maximum memory allocation: %10d bytes\n", + maximum_allocation); + fprintf(STDERR, " Total memory allocation: %10d bytes\n", + total_allocation); + fprintf(STDERR, " Number of allocations: %10d\n", + num_allocations); #endif } @@ -2083,9 +2078,9 @@ main(void) fprintf(STDERR, " test ignored because libpng was not built with read support\n"); /* And skip this test */ - return SKIP; + return PNG_LIBPNG_VER < 10600 ? 0 : 77; } #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_25 Your_png_h_is_not_version_1_6_25; +typedef png_libpng_version_1_6_26 Your_png_h_is_not_version_1_6_26; |