jdk/src/java.desktop/share/native/libsplashscreen/libpng/pngtest.c
author azvegint
Wed, 10 Aug 2016 02:50:58 +0300
changeset 40436 94ae0ede53a5
parent 35296 659e92aaf7f4
permissions -rw-r--r--
8155690: Update libPNG library to the latest up-to-date Reviewed-by: serb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
90ce3da70b43 Initial load
duke
parents:
diff changeset
     2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     6
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     7
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     8
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     9
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    20
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    21
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    22
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    23
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
/* pngtest.c - a simple test program to test libpng
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
 * This file is available under and governed by the GNU General Public
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
 * License version 2 only, as published by the Free Software Foundation.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
 * However, the following notice accompanied the original version of this
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
 * file and, per its terms, should not be removed:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
 *
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    32
 * Last changed in libpng 1.5.25 [December 3, 2015]
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    33
 * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
 *
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    37
 * This code is released under the libpng license.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    38
 * For conditions of distribution and use, see the disclaimer
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    39
 * and license in png.h
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    40
 *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
 * This program reads in a PNG image, writes it out again, and then
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
 * compares the two files.  If the files are identical, this shows that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
 * the basic chunk handling, filtering, and (de)compression code is working
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
 * properly.  It does not currently test all of the transforms, although
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
 * it probably should.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
 * The program will report "FAIL" in certain legitimate cases:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
 * 1) when the compression level or filter selection method is changed.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
 * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
 * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
 *    exist in the input file.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
 * 4) others not listed here...
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
 * In these cases, it is best to check with another tool such as "pngcheck"
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
 * to see what the differences between the two files are.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
 * If a filename is given on the command-line, then this file is used
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
 * for the input, rather than the default "pngtest.png".  This allows
90ce3da70b43 Initial load
duke
parents:
diff changeset
    58
 * testing a wide variety of files easily.  You can also test a number
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
 * of files at once by typing "pngtest -m file1.png file2.png ..."
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    62
#define _POSIX_SOURCE 1
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    64
#include <stdio.h>
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    65
#include <stdlib.h>
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    66
#include <string.h>
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    67
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    68
/* Defined so I can write to a file on gui/windowing platforms */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    69
/*  #define STDERR stderr  */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    70
#define STDERR stdout   /* For DOS */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    71
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    72
#include "png.h"
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    73
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    74
/* 1.6.1 added support for the configure test harness, which uses 77 to indicate
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    75
 * a skipped test, in earlier versions we need to succeed on a skipped test, so:
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    76
 */
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    77
#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H)
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    78
#  define SKIP 77
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    79
#else
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    80
#  define SKIP 0
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    81
#endif
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
    82
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    83
/* Known chunks that exist in pngtest.png must be supported or pngtest will fail
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    84
 * simply as a result of re-ordering them.  This may be fixed in 1.7
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    85
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    86
 * pngtest allocates a single row buffer for each row and overwrites it,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    87
 * therefore if the write side doesn't support the writing of interlaced images
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    88
 * nothing can be done for an interlaced image (and the code below will fail
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    89
 * horribly trying to write extra data after writing garbage).
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    90
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    91
#if defined PNG_READ_SUPPORTED && /* else nothing can be done */\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    92
   defined PNG_READ_bKGD_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    93
   defined PNG_READ_cHRM_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    94
   defined PNG_READ_gAMA_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    95
   defined PNG_READ_oFFs_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    96
   defined PNG_READ_pCAL_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    97
   defined PNG_READ_pHYs_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    98
   defined PNG_READ_sBIT_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    99
   defined PNG_READ_sCAL_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   100
   defined PNG_READ_sRGB_SUPPORTED &&\
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   101
   defined PNG_READ_sPLT_SUPPORTED &&\
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   102
   defined PNG_READ_tEXt_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   103
   defined PNG_READ_tIME_SUPPORTED &&\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   104
   defined PNG_READ_zTXt_SUPPORTED &&\
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   105
   (defined PNG_WRITE_INTERLACING_SUPPORTED || PNG_LIBPNG_VER >= 10700)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   106
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   107
#ifdef PNG_ZLIB_HEADER
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   108
#  include PNG_ZLIB_HEADER /* defined by pnglibconf.h from 1.7 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   109
#else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   110
#  include "zlib.h"
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   111
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   112
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   113
/* Copied from pngpriv.h but only used in error messages below. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   114
#ifndef PNG_ZBUF_SIZE
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   115
#  define PNG_ZBUF_SIZE 8192
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   116
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   117
#define FCLOSE(file) fclose(file)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   118
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   119
#ifndef PNG_STDIO_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   120
typedef FILE                * png_FILE_p;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   123
/* Makes pngtest verbose so we can find problems. */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
#ifndef PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
#  define PNG_DEBUG 0
90ce3da70b43 Initial load
duke
parents:
diff changeset
   126
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   128
#if PNG_DEBUG > 1
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   129
#  define pngtest_debug(m)        ((void)fprintf(stderr, m "\n"))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   130
#  define pngtest_debug1(m,p1)    ((void)fprintf(stderr, m "\n", p1))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   131
#  define pngtest_debug2(m,p1,p2) ((void)fprintf(stderr, m "\n", p1, p2))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   132
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   133
#  define pngtest_debug(m)        ((void)0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   134
#  define pngtest_debug1(m,p1)    ((void)0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   135
#  define pngtest_debug2(m,p1,p2) ((void)0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   136
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   137
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
#if !PNG_DEBUG
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   139
#  define SINGLE_ROWBUF_ALLOC  /* Makes buffer overruns easier to nail */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   140
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   142
#ifndef PNG_UNUSED
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   143
#  define PNG_UNUSED(param) (void)param;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   144
#endif
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   145
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   146
/* Turn on CPU timing
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
#define PNGTEST_TIMING
90ce3da70b43 Initial load
duke
parents:
diff changeset
   148
*/
90ce3da70b43 Initial load
duke
parents:
diff changeset
   149
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   150
#ifndef PNG_FLOATING_POINT_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
#undef PNGTEST_TIMING
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   153
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
#ifdef PNGTEST_TIMING
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
static float t_start, t_stop, t_decode, t_encode, t_misc;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
#include <time.h>
90ce3da70b43 Initial load
duke
parents:
diff changeset
   157
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   159
#ifdef PNG_TIME_RFC1123_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   160
#define PNG_tIME_STRING_LENGTH 29
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   161
static int tIME_chunk_present = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   162
static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   163
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   164
#if PNG_LIBPNG_VER < 10619
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   165
#define png_convert_to_rfc1123_buffer(ts, t) tIME_to_str(read_ptr, ts, t)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   166
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   167
static int
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   168
tIME_to_str(png_structp png_ptr, png_charp ts, png_const_timep t)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   169
{
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   170
    png_const_charp str = png_convert_to_rfc1123(png_ptr, t);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   171
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   172
    if (str == NULL)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   173
        return 0;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   174
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   175
    strcpy(ts, str);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   176
    return 1;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   177
}
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   178
#endif /* older libpng */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
static int verbose = 0;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   182
static int strict = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   183
static int relaxed = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   184
static int unsupported_chunks = 0; /* chunk unsupported by libpng in input */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   185
static int error_count = 0; /* count calls to png_error */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   186
static int warning_count = 0; /* count calls to png_warning */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
/* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
#ifndef png_jmpbuf
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
#  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   193
/* Defines for unknown chunk handling if required. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   194
#ifndef PNG_HANDLE_CHUNK_ALWAYS
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   195
#  define PNG_HANDLE_CHUNK_ALWAYS       3
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   196
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   197
#ifndef PNG_HANDLE_CHUNK_IF_SAFE
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   198
#  define PNG_HANDLE_CHUNK_IF_SAFE      2
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   199
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   200
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   201
/* Utility to save typing/errors, the argument must be a name */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   202
#define MEMZERO(var) ((void)memset(&var, 0, sizeof var))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   203
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   204
/* Example of using row callbacks to make a simple progress meter */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   205
static int status_pass = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   206
static int status_dots_requested = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   207
static int status_dots = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   208
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   209
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   212
   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   213
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   214
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   215
   if (status_pass != pass)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   216
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   217
      fprintf(stdout, "\n Pass %d: ", pass);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   218
      status_pass = pass;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   219
      status_dots = 31;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   220
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   221
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   222
   status_dots--;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   223
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   224
   if (status_dots == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   225
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   226
      fprintf(stdout, "\n         ");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   227
      status_dots=30;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   228
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   229
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   230
   fprintf(stdout, "r");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   231
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   232
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   233
#ifdef PNG_WRITE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   234
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   235
write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   236
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   237
   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   238
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   239
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   240
   fprintf(stdout, "w");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   241
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   242
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   243
90ce3da70b43 Initial load
duke
parents:
diff changeset
   244
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   245
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   246
/* Example of using a user transform callback (doesn't do anything at present).
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   247
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   248
static void PNGCBAPI
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   249
read_user_callback(png_structp png_ptr, png_row_infop row_info, png_bytep data)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   250
{
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   251
   PNG_UNUSED(png_ptr)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   252
   PNG_UNUSED(row_info)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   253
   PNG_UNUSED(data)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   254
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   255
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   256
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   257
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   258
/* Example of using user transform callback (we don't transform anything,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   259
 * but merely count the zero samples)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   260
 */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   261
90ce3da70b43 Initial load
duke
parents:
diff changeset
   262
static png_uint_32 zero_samples;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   263
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   264
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   265
count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   266
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   267
   png_bytep dp = data;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   268
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   269
      return;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   270
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   271
   /* Contents of row_info:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   272
    *  png_uint_32 width      width of row
90ce3da70b43 Initial load
duke
parents:
diff changeset
   273
    *  png_uint_32 rowbytes   number of bytes in row
90ce3da70b43 Initial load
duke
parents:
diff changeset
   274
    *  png_byte color_type    color type of pixels
90ce3da70b43 Initial load
duke
parents:
diff changeset
   275
    *  png_byte bit_depth     bit depth of samples
90ce3da70b43 Initial load
duke
parents:
diff changeset
   276
    *  png_byte channels      number of channels (1-4)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   277
    *  png_byte pixel_depth   bits per pixel (depth*channels)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   278
    */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   279
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   280
    /* Counts the number of zero samples (or zero pixels if color_type is 3 */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   281
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   282
    if (row_info->color_type == 0 || row_info->color_type == 3)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   283
    {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   284
       int pos = 0;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   285
       png_uint_32 n, nstop;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   286
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   287
       for (n = 0, nstop=row_info->width; n<nstop; n++)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   288
       {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   289
          if (row_info->bit_depth == 1)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   290
          {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   291
             if (((*dp << pos++ ) & 0x80) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   292
                zero_samples++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   293
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   294
             if (pos == 8)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   295
             {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   296
                pos = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   297
                dp++;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   298
             }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   299
          }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   300
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   301
          if (row_info->bit_depth == 2)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   302
          {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   303
             if (((*dp << (pos+=2)) & 0xc0) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   304
                zero_samples++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   305
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   306
             if (pos == 8)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   307
             {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   308
                pos = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   309
                dp++;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   310
             }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   311
          }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   312
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   313
          if (row_info->bit_depth == 4)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   314
          {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   315
             if (((*dp << (pos+=4)) & 0xf0) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   316
                zero_samples++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   317
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   318
             if (pos == 8)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   319
             {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   320
                pos = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   321
                dp++;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   322
             }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   323
          }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   324
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   325
          if (row_info->bit_depth == 8)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   326
             if (*dp++ == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   327
                zero_samples++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   328
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   329
          if (row_info->bit_depth == 16)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   330
          {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   331
             if ((*dp | *(dp+1)) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   332
                zero_samples++;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   333
             dp+=2;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   334
          }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   335
       }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   336
    }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   337
    else /* Other color types */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   338
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   339
       png_uint_32 n, nstop;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   340
       int channel;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   341
       int color_channels = row_info->channels;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   342
       if (row_info->color_type > 3)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   343
          color_channels--;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   344
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   345
       for (n = 0, nstop=row_info->width; n<nstop; n++)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   346
       {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   347
          for (channel = 0; channel < color_channels; channel++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   348
          {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   349
             if (row_info->bit_depth == 8)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   350
                if (*dp++ == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   351
                   zero_samples++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   352
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   353
             if (row_info->bit_depth == 16)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   354
             {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   355
                if ((*dp | *(dp+1)) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   356
                   zero_samples++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   357
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   358
                dp+=2;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   359
             }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   360
          }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   361
          if (row_info->color_type > 3)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   362
          {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   363
             dp++;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   364
             if (row_info->bit_depth == 16)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   365
                dp++;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   366
          }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   367
       }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   368
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   369
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   370
#endif /* WRITE_USER_TRANSFORM */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   371
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   372
#ifndef PNG_STDIO_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   373
/* START of code to validate stdio-free compilation */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   374
/* These copies of the default read/write functions come from pngrio.c and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   375
 * pngwio.c.  They allow "don't include stdio" testing of the library.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   376
 * This is the function that does the actual reading of data.  If you are
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   377
 * not reading from a standard C stream, you should create a replacement
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   378
 * read_data function and use it at run time with png_set_read_fn(), rather
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   379
 * than changing the library.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   380
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   381
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   382
#ifdef PNG_IO_STATE_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   383
void
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   384
pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   385
   png_uint_32 io_op);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   386
void
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   387
pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   388
   png_uint_32 io_op)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   389
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   390
   png_uint_32 io_state = png_get_io_state(png_ptr);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   391
   int err = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   392
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   393
   /* Check if the current operation (reading / writing) is as expected. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   394
   if ((io_state & PNG_IO_MASK_OP) != io_op)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   395
      png_error(png_ptr, "Incorrect operation in I/O state");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   396
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   397
   /* Check if the buffer size specific to the current location
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   398
    * (file signature / header / data / crc) is as expected.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   399
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   400
   switch (io_state & PNG_IO_MASK_LOC)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   401
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   402
   case PNG_IO_SIGNATURE:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   403
      if (data_length > 8)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   404
         err = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   405
      break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   406
   case PNG_IO_CHUNK_HDR:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   407
      if (data_length != 8)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   408
         err = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   409
      break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   410
   case PNG_IO_CHUNK_DATA:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   411
      break;  /* no restrictions here */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   412
   case PNG_IO_CHUNK_CRC:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   413
      if (data_length != 4)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   414
         err = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   415
      break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   416
   default:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   417
      err = 1;  /* uninitialized */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   418
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   419
   if (err != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   420
      png_error(png_ptr, "Bad I/O state or buffer size");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   421
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   422
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   423
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   424
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   425
pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   426
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   427
   png_size_t check = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   428
   png_voidp io_ptr;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   429
90ce3da70b43 Initial load
duke
parents:
diff changeset
   430
   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
90ce3da70b43 Initial load
duke
parents:
diff changeset
   431
    * instead of an int, which is what fread() actually returns.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   432
    */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   433
   io_ptr = png_get_io_ptr(png_ptr);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   434
   if (io_ptr != NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   435
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   436
      check = fread(data, 1, length, (png_FILE_p)io_ptr);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   437
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   438
90ce3da70b43 Initial load
duke
parents:
diff changeset
   439
   if (check != length)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   440
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   441
      png_error(png_ptr, "Read Error");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   442
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   443
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   444
#ifdef PNG_IO_STATE_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   445
   pngtest_check_io_state(png_ptr, length, PNG_IO_READING);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   446
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   447
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   448
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   449
#ifdef PNG_WRITE_FLUSH_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   450
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   451
pngtest_flush(png_structp png_ptr)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   452
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   453
   /* Do nothing; fflush() is said to be just a waste of energy. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   454
   PNG_UNUSED(png_ptr)   /* Stifle compiler warning */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   455
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   456
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   457
90ce3da70b43 Initial load
duke
parents:
diff changeset
   458
/* This is the function that does the actual writing of data.  If you are
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   459
 * not writing to a standard C stream, you should create a replacement
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   460
 * write_data function and use it at run time with png_set_write_fn(), rather
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   461
 * than changing the library.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   462
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   463
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   464
pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   465
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   466
   png_size_t check;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   467
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   468
   check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   469
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   470
   if (check != length)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   471
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   472
      png_error(png_ptr, "Write Error");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   473
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   474
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   475
#ifdef PNG_IO_STATE_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   476
   pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   477
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   478
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   479
#endif /* !STDIO */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   480
90ce3da70b43 Initial load
duke
parents:
diff changeset
   481
/* This function is called when there is a warning, but the library thinks
90ce3da70b43 Initial load
duke
parents:
diff changeset
   482
 * it can continue anyway.  Replacement functions don't have to do anything
90ce3da70b43 Initial load
duke
parents:
diff changeset
   483
 * here if you don't want to.  In the default configuration, png_ptr is
90ce3da70b43 Initial load
duke
parents:
diff changeset
   484
 * not used, but it is passed in case it may be useful.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   485
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   486
typedef struct
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   487
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   488
   PNG_CONST char *file_name;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   489
}  pngtest_error_parameters;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   490
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   491
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   492
pngtest_warning(png_structp png_ptr, png_const_charp message)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   493
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   494
   PNG_CONST char *name = "UNKNOWN (ERROR!)";
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   495
   pngtest_error_parameters *test =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   496
      (pngtest_error_parameters*)png_get_error_ptr(png_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   497
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   498
   ++warning_count;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   499
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   500
   if (test != NULL && test->file_name != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   501
      name = test->file_name;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   502
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   503
   fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   504
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   505
90ce3da70b43 Initial load
duke
parents:
diff changeset
   506
/* This is the default error handling function.  Note that replacements for
90ce3da70b43 Initial load
duke
parents:
diff changeset
   507
 * this function MUST NOT RETURN, or the program will likely crash.  This
90ce3da70b43 Initial load
duke
parents:
diff changeset
   508
 * function is used by default, or if the program supplies NULL for the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   509
 * error function pointer in png_set_error_fn().
90ce3da70b43 Initial load
duke
parents:
diff changeset
   510
 */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   511
static void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   512
pngtest_error(png_structp png_ptr, png_const_charp message)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   513
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   514
   ++error_count;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   515
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   516
   pngtest_warning(png_ptr, message);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   517
   /* We can return because png_error calls the default handler, which is
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   518
    * actually OK in this case.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   519
    */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   520
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   521
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   522
/* END of code to validate stdio-free compilation */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   523
90ce3da70b43 Initial load
duke
parents:
diff changeset
   524
/* START of code to validate memory allocation and deallocation */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   525
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
   526
90ce3da70b43 Initial load
duke
parents:
diff changeset
   527
/* Allocate memory.  For reasonable files, size should never exceed
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   528
 * 64K.  However, zlib may allocate more than 64K if you don't tell
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   529
 * it not to.  See zconf.h and png.h for more information.  zlib does
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   530
 * need to allocate exactly 64K, so whatever you call here must
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   531
 * have the ability to do that.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   532
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   533
 * This piece of code can be compiled to validate max 64K allocations
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   534
 * by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   535
 */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   536
typedef struct memory_information
90ce3da70b43 Initial load
duke
parents:
diff changeset
   537
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   538
   png_alloc_size_t          size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   539
   png_voidp                 pointer;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   540
   struct memory_information *next;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   541
} memory_information;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   542
typedef memory_information *memory_infop;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   543
90ce3da70b43 Initial load
duke
parents:
diff changeset
   544
static memory_infop pinformation = NULL;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   545
static int current_allocation = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   546
static int maximum_allocation = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   547
static int total_allocation = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   548
static int num_allocations = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   549
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   550
png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   551
    png_alloc_size_t size));
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   552
void PNGCBAPI png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   553
90ce3da70b43 Initial load
duke
parents:
diff changeset
   554
png_voidp
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   555
PNGCBAPI png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   556
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   557
90ce3da70b43 Initial load
duke
parents:
diff changeset
   558
   /* png_malloc has already tested for NULL; png_create_struct calls
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   559
    * png_debug_malloc directly, with png_ptr == NULL which is OK
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   560
    */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   561
90ce3da70b43 Initial load
duke
parents:
diff changeset
   562
   if (size == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   563
      return (NULL);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   564
90ce3da70b43 Initial load
duke
parents:
diff changeset
   565
   /* This calls the library allocator twice, once to get the requested
90ce3da70b43 Initial load
duke
parents:
diff changeset
   566
      buffer and once to get a new free list entry. */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   567
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   568
      /* Disable malloc_fn and free_fn */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   569
      memory_infop pinfo;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   570
      png_set_mem_fn(png_ptr, NULL, NULL, NULL);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   571
      pinfo = (memory_infop)png_malloc(png_ptr,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   572
         (sizeof *pinfo));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   573
      pinfo->size = size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   574
      current_allocation += size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   575
      total_allocation += size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   576
      num_allocations ++;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   577
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   578
      if (current_allocation > maximum_allocation)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   579
         maximum_allocation = current_allocation;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   580
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   581
      pinfo->pointer = png_malloc(png_ptr, size);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   582
      /* Restore malloc_fn and free_fn */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   583
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   584
      png_set_mem_fn(png_ptr,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   585
          NULL, png_debug_malloc, png_debug_free);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   586
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   587
      if (size != 0 && pinfo->pointer == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   588
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   589
         current_allocation -= size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   590
         total_allocation -= size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   591
         png_error(png_ptr,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   592
           "out of memory in pngtest->png_debug_malloc");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   593
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   594
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   595
      pinfo->next = pinformation;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   596
      pinformation = pinfo;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   597
      /* Make sure the caller isn't assuming zeroed memory. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   598
      memset(pinfo->pointer, 0xdd, pinfo->size);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   599
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   600
      if (verbose != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   601
         printf("png_malloc %lu bytes at %p\n", (unsigned long)size,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   602
            pinfo->pointer);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   603
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   604
      return (png_voidp)(pinfo->pointer);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   605
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   606
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   607
90ce3da70b43 Initial load
duke
parents:
diff changeset
   608
/* Free a pointer.  It is removed from the list at the same time. */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   609
void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   610
png_debug_free(png_structp png_ptr, png_voidp ptr)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   611
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   612
   if (png_ptr == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   613
      fprintf(STDERR, "NULL pointer to png_debug_free.\n");
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   614
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   615
   if (ptr == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   616
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   617
#if 0 /* This happens all the time. */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   618
      fprintf(STDERR, "WARNING: freeing NULL pointer\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   619
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   620
      return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   621
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   622
90ce3da70b43 Initial load
duke
parents:
diff changeset
   623
   /* Unlink the element from the list. */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   624
   if (pinformation != NULL)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   625
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   626
      memory_infop *ppinfo = &pinformation;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   627
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   628
      for (;;)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   629
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   630
         memory_infop pinfo = *ppinfo;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   631
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   632
         if (pinfo->pointer == ptr)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   633
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   634
            *ppinfo = pinfo->next;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   635
            current_allocation -= pinfo->size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   636
            if (current_allocation < 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   637
               fprintf(STDERR, "Duplicate free of memory\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   638
            /* We must free the list element too, but first kill
90ce3da70b43 Initial load
duke
parents:
diff changeset
   639
               the memory that is to be freed. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   640
            memset(ptr, 0x55, pinfo->size);
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   641
            free(pinfo);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   642
            pinfo = NULL;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   643
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   644
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   645
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   646
         if (pinfo->next == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   647
         {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   648
            fprintf(STDERR, "Pointer %p not found\n", ptr);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   649
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   650
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   651
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   652
         ppinfo = &pinfo->next;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   653
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   654
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   655
90ce3da70b43 Initial load
duke
parents:
diff changeset
   656
   /* Finally free the data. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   657
   if (verbose != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   658
      printf("Freeing %p\n", ptr);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   659
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   660
   if (ptr != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   661
      free(ptr);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   662
   ptr = NULL;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   663
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   664
#endif /* USER_MEM && DEBUG */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   665
/* END of code to test memory allocation/deallocation */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   666
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   667
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   668
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   669
/* Demonstration of user chunk support of the sTER and vpAg chunks */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   670
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   671
/* (sTER is a public chunk not yet known by libpng.  vpAg is a private
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   672
chunk used in ImageMagick to store "virtual page" size).  */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   673
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   674
static struct user_chunk_data
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   675
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   676
   png_const_infop info_ptr;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   677
   png_uint_32     vpAg_width, vpAg_height;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   678
   png_byte        vpAg_units;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   679
   png_byte        sTER_mode;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   680
   int             location[2];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   681
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   682
user_chunk_data;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   683
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   684
/* Used for location and order; zero means nothing. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   685
#define have_sTER   0x01
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   686
#define have_vpAg   0x02
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   687
#define before_PLTE 0x10
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   688
#define before_IDAT 0x20
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   689
#define after_IDAT  0x40
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   690
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   691
static void
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   692
init_callback_info(png_const_infop info_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   693
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   694
   MEMZERO(user_chunk_data);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   695
   user_chunk_data.info_ptr = info_ptr;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   696
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   697
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   698
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   699
set_location(png_structp png_ptr, struct user_chunk_data *data, int what)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   700
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   701
   int location;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   702
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   703
   if ((data->location[0] & what) != 0 || (data->location[1] & what) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   704
      return 0; /* already have one of these */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   705
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   706
   /* Find where we are (the code below zeroes info_ptr to indicate that the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   707
    * chunks before the first IDAT have been read.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   708
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   709
   if (data->info_ptr == NULL) /* after IDAT */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   710
      location = what | after_IDAT;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   711
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   712
   else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   713
      location = what | before_IDAT;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   714
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   715
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   716
      location = what | before_PLTE;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   717
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   718
   if (data->location[0] == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   719
      data->location[0] = location;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   720
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   721
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   722
      data->location[1] = location;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   723
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   724
   return 1; /* handled */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   725
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   726
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   727
static int PNGCBAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   728
read_user_chunk_callback(png_struct *png_ptr, png_unknown_chunkp chunk)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   729
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   730
   struct user_chunk_data *my_user_chunk_data =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   731
      (struct user_chunk_data*)png_get_user_chunk_ptr(png_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   732
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   733
   if (my_user_chunk_data == NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   734
      png_error(png_ptr, "lost user chunk pointer");
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   735
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   736
   /* Return one of the following:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   737
    *    return (-n);  chunk had an error
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   738
    *    return (0);  did not recognize
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   739
    *    return (n);  success
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   740
    *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   741
    * The unknown chunk structure contains the chunk data:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   742
    * png_byte name[5];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   743
    * png_byte *data;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   744
    * png_size_t size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   745
    *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   746
    * Note that libpng has already taken care of the CRC handling.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   747
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   748
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   749
   if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   750
       chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   751
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   752
         /* Found sTER chunk */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   753
         if (chunk->size != 1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   754
            return (-1); /* Error return */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   755
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   756
         if (chunk->data[0] != 0 && chunk->data[0] != 1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   757
            return (-1);  /* Invalid mode */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   758
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   759
         if (set_location(png_ptr, my_user_chunk_data, have_sTER) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   760
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   761
            my_user_chunk_data->sTER_mode=chunk->data[0];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   762
            return (1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   763
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   764
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   765
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   766
            return (0); /* duplicate sTER - give it to libpng */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   767
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   768
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   769
   if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   770
       chunk->name[2] !=  65 || chunk->name[3] != 103)      /* A  g */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   771
      return (0); /* Did not recognize */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   772
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   773
   /* Found ImageMagick vpAg chunk */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   774
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   775
   if (chunk->size != 9)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   776
      return (-1); /* Error return */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   777
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   778
   if (set_location(png_ptr, my_user_chunk_data, have_vpAg) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   779
      return (0);  /* duplicate vpAg */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   780
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   781
   my_user_chunk_data->vpAg_width = png_get_uint_31(png_ptr, chunk->data);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   782
   my_user_chunk_data->vpAg_height = png_get_uint_31(png_ptr, chunk->data + 4);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   783
   my_user_chunk_data->vpAg_units = chunk->data[8];
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   784
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   785
   return (1);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   786
}
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   787
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   788
#ifdef PNG_WRITE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   789
static void
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   790
write_sTER_chunk(png_structp write_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   791
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   792
   png_byte sTER[5] = {115,  84,  69,  82, '\0'};
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   793
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   794
   if (verbose != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   795
      fprintf(STDERR, "\n stereo mode = %d\n", user_chunk_data.sTER_mode);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   796
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   797
   png_write_chunk(write_ptr, sTER, &user_chunk_data.sTER_mode, 1);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   798
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   799
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   800
static void
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   801
write_vpAg_chunk(png_structp write_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   802
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   803
   png_byte vpAg[5] = {118, 112,  65, 103, '\0'};
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   804
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   805
   png_byte vpag_chunk_data[9];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   806
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   807
   if (verbose != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   808
      fprintf(STDERR, " vpAg = %lu x %lu, units = %d\n",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   809
        (unsigned long)user_chunk_data.vpAg_width,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   810
        (unsigned long)user_chunk_data.vpAg_height,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   811
        user_chunk_data.vpAg_units);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   812
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   813
   png_save_uint_32(vpag_chunk_data, user_chunk_data.vpAg_width);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   814
   png_save_uint_32(vpag_chunk_data + 4, user_chunk_data.vpAg_height);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   815
   vpag_chunk_data[8] = user_chunk_data.vpAg_units;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   816
   png_write_chunk(write_ptr, vpAg, vpag_chunk_data, 9);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   817
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   818
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   819
static void
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   820
write_chunks(png_structp write_ptr, int location)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   821
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   822
   int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   823
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   824
   /* Notice that this preserves the original chunk order, however chunks
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   825
    * intercepted by the callback will be written *after* chunks passed to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   826
    * libpng.  This will actually reverse a pair of sTER chunks or a pair of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   827
    * vpAg chunks, resulting in an error later.  This is not worth worrying
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   828
    * about - the chunks should not be duplicated!
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   829
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   830
   for (i=0; i<2; ++i)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   831
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   832
      if (user_chunk_data.location[i] == (location | have_sTER))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   833
         write_sTER_chunk(write_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   834
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   835
      else if (user_chunk_data.location[i] == (location | have_vpAg))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   836
         write_vpAg_chunk(write_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   837
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   838
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   839
#endif /* WRITE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   840
#else /* !READ_USER_CHUNKS */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   841
#  define write_chunks(pp,loc) ((void)0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   842
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   843
/* END of code to demonstrate user chunk support */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   844
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   845
/* START of code to check that libpng has the required text support; this only
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   846
 * checks for the write support because if read support is missing the chunk
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   847
 * will simply not be reported back to pngtest.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   848
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   849
#ifdef PNG_TEXT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   850
static void
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   851
pngtest_check_text_support(png_structp png_ptr, png_textp text_ptr,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   852
   int num_text)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   853
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   854
   while (num_text > 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   855
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   856
      switch (text_ptr[--num_text].compression)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   857
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   858
         case PNG_TEXT_COMPRESSION_NONE:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   859
            break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   860
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   861
         case PNG_TEXT_COMPRESSION_zTXt:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   862
#           ifndef PNG_WRITE_zTXt_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   863
               ++unsupported_chunks;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   864
               /* In libpng 1.7 this now does an app-error, so stop it: */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   865
               text_ptr[num_text].compression = PNG_TEXT_COMPRESSION_NONE;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   866
#           endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   867
            break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   868
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   869
         case PNG_ITXT_COMPRESSION_NONE:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   870
         case PNG_ITXT_COMPRESSION_zTXt:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   871
#           ifndef PNG_WRITE_iTXt_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   872
               ++unsupported_chunks;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   873
               text_ptr[num_text].compression = PNG_TEXT_COMPRESSION_NONE;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   874
#           endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   875
            break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   876
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   877
         default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   878
            /* This is an error */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   879
            png_error(png_ptr, "invalid text chunk compression field");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   880
            break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   881
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   882
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   883
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   884
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   885
/* END of code to check that libpng has the required text support */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   886
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   887
/* Test one file */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   888
static int
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   889
test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   890
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   891
   static png_FILE_p fpin;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   892
   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   893
   pngtest_error_parameters error_parameters;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   894
   png_structp read_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   895
   png_infop read_info_ptr, end_info_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   896
#ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
   897
   png_structp write_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   898
   png_infop write_info_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   899
   png_infop write_end_info_ptr;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   900
#ifdef PNG_WRITE_FILTER_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   901
   int interlace_preserved = 1;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   902
#endif /* WRITE_FILTER */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   903
#else /* !WRITE */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   904
   png_structp write_ptr = NULL;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   905
   png_infop write_info_ptr = NULL;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   906
   png_infop write_end_info_ptr = NULL;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   907
#endif /* !WRITE */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   908
   png_bytep row_buf;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   909
   png_uint_32 y;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   910
   png_uint_32 width, height;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   911
   volatile int num_passes;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   912
   int pass;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   913
   int bit_depth, color_type;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   914
90ce3da70b43 Initial load
duke
parents:
diff changeset
   915
   row_buf = NULL;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   916
   error_parameters.file_name = inname;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   917
90ce3da70b43 Initial load
duke
parents:
diff changeset
   918
   if ((fpin = fopen(inname, "rb")) == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   919
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   920
      fprintf(STDERR, "Could not find input file %s\n", inname);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   921
      return (1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   922
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   923
90ce3da70b43 Initial load
duke
parents:
diff changeset
   924
   if ((fpout = fopen(outname, "wb")) == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   925
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   926
      fprintf(STDERR, "Could not open output file %s\n", outname);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   927
      FCLOSE(fpin);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   928
      return (1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   929
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   930
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   931
   pngtest_debug("Allocating read and write structures");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   932
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   933
   read_ptr =
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   934
      png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   935
      NULL, NULL, NULL, png_debug_malloc, png_debug_free);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   936
#else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   937
   read_ptr =
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   938
      png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   939
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   940
   png_set_error_fn(read_ptr, &error_parameters, pngtest_error,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   941
      pngtest_warning);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   942
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   943
#ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
   944
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   945
   write_ptr =
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   946
      png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   947
      NULL, NULL, NULL, png_debug_malloc, png_debug_free);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   948
#else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   949
   write_ptr =
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   950
      png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   951
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   952
   png_set_error_fn(write_ptr, &error_parameters, pngtest_error,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   953
      pngtest_warning);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   954
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   955
   pngtest_debug("Allocating read_info, write_info and end_info structures");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   956
   read_info_ptr = png_create_info_struct(read_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   957
   end_info_ptr = png_create_info_struct(read_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   958
#ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
   959
   write_info_ptr = png_create_info_struct(write_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   960
   write_end_info_ptr = png_create_info_struct(write_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   961
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   962
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   963
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   964
   init_callback_info(read_info_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   965
   png_set_read_user_chunk_fn(read_ptr, &user_chunk_data,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   966
     read_user_chunk_callback);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   967
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   968
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   969
#ifdef PNG_SETJMP_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   970
   pngtest_debug("Setting jmpbuf for read struct");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   971
   if (setjmp(png_jmpbuf(read_ptr)))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   972
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   973
      fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   974
      png_free(read_ptr, row_buf);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   975
      row_buf = NULL;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   976
      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   977
#ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
   978
      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   979
      png_destroy_write_struct(&write_ptr, &write_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   980
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   981
      FCLOSE(fpin);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   982
      FCLOSE(fpout);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   983
      return (1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   984
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   985
90ce3da70b43 Initial load
duke
parents:
diff changeset
   986
#ifdef PNG_WRITE_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   987
   pngtest_debug("Setting jmpbuf for write struct");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   988
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   989
   if (setjmp(png_jmpbuf(write_ptr)))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   990
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   991
      fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   992
      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   993
      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   994
#ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
   995
      png_destroy_write_struct(&write_ptr, &write_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   996
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   997
      FCLOSE(fpin);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   998
      FCLOSE(fpout);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   999
      return (1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1000
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1001
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1002
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1003
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1004
   if (strict != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1005
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1006
      /* Treat png_benign_error() as errors on read */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1007
      png_set_benign_errors(read_ptr, 0);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1008
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1009
#ifdef PNG_WRITE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1010
      /* Treat them as errors on write */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1011
      png_set_benign_errors(write_ptr, 0);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1012
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1013
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1014
      /* if strict is not set, then app warnings and errors are treated as
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1015
       * warnings in release builds, but not in unstable builds; this can be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1016
       * changed with '--relaxed'.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1017
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1018
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1019
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1020
   else if (relaxed != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1021
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1022
      /* Allow application (pngtest) errors and warnings to pass */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1023
      png_set_benign_errors(read_ptr, 1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1024
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1025
#ifdef PNG_WRITE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1026
      png_set_benign_errors(write_ptr, 1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1027
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1028
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1029
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1030
   pngtest_debug("Initializing input and output streams");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1031
#ifdef PNG_STDIO_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1032
   png_init_io(read_ptr, fpin);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1033
#  ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1034
   png_init_io(write_ptr, fpout);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1035
#  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1036
#else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1037
   png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1038
#  ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1039
   png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1040
#    ifdef PNG_WRITE_FLUSH_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1041
      pngtest_flush);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1042
#    else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1043
      NULL);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1044
#    endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1045
#  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1046
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1047
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1048
   if (status_dots_requested == 1)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1049
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1050
#ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1051
      png_set_write_status_fn(write_ptr, write_row_callback);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1052
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1053
      png_set_read_status_fn(read_ptr, read_row_callback);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1054
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1055
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1056
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1057
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1058
#ifdef PNG_WRITE_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1059
      png_set_write_status_fn(write_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1060
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1061
      png_set_read_status_fn(read_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1062
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1063
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1064
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1065
   png_set_read_user_transform_fn(read_ptr, read_user_callback);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1066
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1067
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1068
   zero_samples = 0;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1069
   png_set_write_user_transform_fn(write_ptr, count_zero_samples);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1070
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1071
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1072
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1073
   /* Preserve all the unknown chunks, if possible.  If this is disabled then,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1074
    * even if the png_{get,set}_unknown_chunks stuff is enabled, we can't use
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1075
    * libpng to *save* the unknown chunks on read (because we can't switch the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1076
    * save option on!)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1077
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1078
    * Notice that if SET_UNKNOWN_CHUNKS is *not* supported read will discard all
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1079
    * unknown chunks and write will write them all.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1080
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1081
#ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1082
   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1083
      NULL, 0);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1084
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1085
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1086
   png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1087
      NULL, 0);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1088
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1089
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1090
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1091
   pngtest_debug("Reading info struct");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1092
   png_read_info(read_ptr, read_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1093
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1094
#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1095
   /* This is a bit of a hack; there is no obvious way in the callback function
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1096
    * to determine that the chunks before the first IDAT have been read, so
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1097
    * remove the info_ptr (which is only used to determine position relative to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1098
    * PLTE) here to indicate that we are after the IDAT.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1099
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1100
   user_chunk_data.info_ptr = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1101
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1102
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1103
   pngtest_debug("Transferring info struct");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1104
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1105
      int interlace_type, compression_type, filter_type;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1106
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1107
      if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1108
          &color_type, &interlace_type, &compression_type, &filter_type) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1109
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1110
         png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1111
            color_type, interlace_type, compression_type, filter_type);
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1112
         /* num_passes may not be available below if interlace support is not
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1113
          * provided by libpng for both read and write.
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1114
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1115
         switch (interlace_type)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1116
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1117
            case PNG_INTERLACE_NONE:
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1118
               num_passes = 1;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1119
               break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1120
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1121
            case PNG_INTERLACE_ADAM7:
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1122
               num_passes = 7;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1123
               break;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1124
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1125
            default:
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1126
               png_error(read_ptr, "invalid interlace type");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1127
               /*NOT REACHED*/
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1128
         }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1129
      }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1130
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1131
      else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1132
         png_error(read_ptr, "png_get_IHDR failed");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1133
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1134
#ifdef PNG_FIXED_POINT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1135
#ifdef PNG_cHRM_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1136
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1137
      png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1138
         blue_y;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1139
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1140
      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1141
         &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1142
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1143
         png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1144
            red_y, green_x, green_y, blue_x, blue_y);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1145
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1146
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1147
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1148
#ifdef PNG_gAMA_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1149
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1150
      png_fixed_point gamma;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1151
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1152
      if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1153
         png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1154
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1155
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1156
#else /* Use floating point versions */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1157
#ifdef PNG_FLOATING_POINT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1158
#ifdef PNG_cHRM_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1159
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1160
      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1161
         blue_y;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1162
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1163
      if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1164
         &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1165
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1166
         png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1167
            red_y, green_x, green_y, blue_x, blue_y);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1168
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1169
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1170
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1171
#ifdef PNG_gAMA_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1172
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1173
      double gamma;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1174
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1175
      if (png_get_gAMA(read_ptr, read_info_ptr, &gamma) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1176
         png_set_gAMA(write_ptr, write_info_ptr, gamma);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1177
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1178
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1179
#endif /* Floating point */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1180
#endif /* Fixed point */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1181
#ifdef PNG_iCCP_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1182
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1183
      png_charp name;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1184
      png_bytep profile;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1185
      png_uint_32 proflen;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1186
      int compression_type;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1187
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1188
      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1189
                      &profile, &proflen) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1190
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1191
         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1192
                      profile, proflen);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1193
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1194
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1195
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1196
#ifdef PNG_sRGB_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1197
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1198
      int intent;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1199
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1200
      if (png_get_sRGB(read_ptr, read_info_ptr, &intent) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1201
         png_set_sRGB(write_ptr, write_info_ptr, intent);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1202
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1203
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1204
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1205
      png_colorp palette;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1206
      int num_palette;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1207
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1208
      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1209
         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1210
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1211
#ifdef PNG_bKGD_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1212
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1213
      png_color_16p background;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1214
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1215
      if (png_get_bKGD(read_ptr, read_info_ptr, &background) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1216
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1217
         png_set_bKGD(write_ptr, write_info_ptr, background);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1218
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1219
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1220
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1221
#ifdef PNG_hIST_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1222
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1223
      png_uint_16p hist;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1224
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1225
      if (png_get_hIST(read_ptr, read_info_ptr, &hist) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1226
         png_set_hIST(write_ptr, write_info_ptr, hist);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1227
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1228
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1229
#ifdef PNG_oFFs_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1230
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1231
      png_int_32 offset_x, offset_y;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1232
      int unit_type;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1233
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1234
      if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1235
          &unit_type) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1236
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1237
         png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1238
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1239
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1240
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1241
#ifdef PNG_pCAL_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1242
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1243
      png_charp purpose, units;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1244
      png_charpp params;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1245
      png_int_32 X0, X1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1246
      int type, nparams;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1247
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1248
      if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1249
         &nparams, &units, &params) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1250
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1251
         png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1252
            nparams, units, params);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1253
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1254
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1255
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1256
#ifdef PNG_pHYs_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1257
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1258
      png_uint_32 res_x, res_y;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1259
      int unit_type;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1260
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1261
      if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1262
          &unit_type) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1263
         png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1264
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1265
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1266
#ifdef PNG_sBIT_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1267
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1268
      png_color_8p sig_bit;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1269
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1270
      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1271
         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1272
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1273
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1274
#ifdef PNG_sCAL_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1275
#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1276
   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1277
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1278
      int unit;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1279
      double scal_width, scal_height;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1280
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1281
      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1282
         &scal_height) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1283
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1284
         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1285
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1286
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1287
#else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1288
#ifdef PNG_FIXED_POINT_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1289
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1290
      int unit;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1291
      png_charp scal_width, scal_height;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1292
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1293
      if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1294
          &scal_height) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1295
      {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1296
         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1297
             scal_height);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1298
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1299
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1300
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1301
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1302
#endif
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1303
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1304
#ifdef PNG_sPLT_SUPPORTED
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1305
   {
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1306
       png_sPLT_tp entries;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1307
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1308
       int num_entries = (int) png_get_sPLT(read_ptr, read_info_ptr, &entries);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1309
       if (num_entries)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1310
       {
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1311
           png_set_sPLT(write_ptr, write_info_ptr, entries, num_entries);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1312
       }
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1313
   }
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1314
#endif
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1315
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1316
#ifdef PNG_TEXT_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1317
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1318
      png_textp text_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1319
      int num_text;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1320
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1321
      if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1322
      {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1323
         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1324
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1325
         pngtest_check_text_support(read_ptr, text_ptr, num_text);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1326
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1327
         if (verbose != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1328
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1329
            int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1330
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1331
            printf("\n");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1332
            for (i=0; i<num_text; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1333
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1334
               printf("   Text compression[%d]=%d\n",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1335
                     i, text_ptr[i].compression);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1336
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1337
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1338
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1339
         png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1340
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1341
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1342
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1343
#ifdef PNG_tIME_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1344
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1345
      png_timep mod_time;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1346
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1347
      if (png_get_tIME(read_ptr, read_info_ptr, &mod_time) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1348
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1349
         png_set_tIME(write_ptr, write_info_ptr, mod_time);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1350
#ifdef PNG_TIME_RFC1123_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1351
         if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1352
            tIME_string[(sizeof tIME_string) - 1] = '\0';
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1353
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1354
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1355
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1356
            strncpy(tIME_string, "*** invalid time ***", (sizeof tIME_string));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1357
            tIME_string[(sizeof tIME_string) - 1] = '\0';
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1358
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1359
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1360
         tIME_chunk_present++;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1361
#endif /* TIME_RFC1123 */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1362
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1363
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1364
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1365
#ifdef PNG_tRNS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1366
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1367
      png_bytep trans_alpha;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1368
      int num_trans;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1369
      png_color_16p trans_color;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1370
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1371
      if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1372
         &trans_color) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1373
      {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1374
         int sample_max = (1 << bit_depth);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1375
         /* libpng doesn't reject a tRNS chunk with out-of-range samples */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1376
         if (!((color_type == PNG_COLOR_TYPE_GRAY &&
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1377
             (int)trans_color->gray > sample_max) ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1378
             (color_type == PNG_COLOR_TYPE_RGB &&
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1379
             ((int)trans_color->red > sample_max ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1380
             (int)trans_color->green > sample_max ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1381
             (int)trans_color->blue > sample_max))))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1382
            png_set_tRNS(write_ptr, write_info_ptr, trans_alpha, num_trans,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1383
               trans_color);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1384
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1385
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1386
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1387
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1388
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1389
      png_unknown_chunkp unknowns;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1390
      int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr,
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1391
         &unknowns);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1392
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1393
      if (num_unknowns != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1394
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1395
         png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1396
           num_unknowns);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1397
#if PNG_LIBPNG_VER < 10600
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1398
         /* Copy the locations from the read_info_ptr.  The automatically
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1399
          * generated locations in write_end_info_ptr are wrong prior to 1.6.0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1400
          * because they are reset from the write pointer (removed in 1.6.0).
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1401
          */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1402
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1403
            int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1404
            for (i = 0; i < num_unknowns; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1405
              png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1406
                unknowns[i].location);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1407
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1408
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1409
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1410
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1411
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1412
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1413
#ifdef PNG_WRITE_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1414
   pngtest_debug("Writing info struct");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1415
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1416
   /* Write the info in two steps so that if we write the 'unknown' chunks here
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1417
    * they go to the correct place.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1418
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1419
   png_write_info_before_PLTE(write_ptr, write_info_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1420
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1421
   write_chunks(write_ptr, before_PLTE); /* before PLTE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1422
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1423
   png_write_info(write_ptr, write_info_ptr);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1424
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1425
   write_chunks(write_ptr, before_IDAT); /* after PLTE */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1426
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1427
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1428
#ifdef SINGLE_ROWBUF_ALLOC
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1429
   pngtest_debug("Allocating row buffer...");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1430
   row_buf = (png_bytep)png_malloc(read_ptr,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1431
      png_get_rowbytes(read_ptr, read_info_ptr));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1432
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1433
   pngtest_debug1("\t0x%08lx", (unsigned long)row_buf);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1434
#endif /* SINGLE_ROWBUF_ALLOC */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1435
   pngtest_debug("Writing row data");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1436
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1437
#if defined(PNG_READ_INTERLACING_SUPPORTED) &&\
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1438
   defined(PNG_WRITE_INTERLACING_SUPPORTED)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1439
   /* Both must be defined for libpng to be able to handle the interlace,
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1440
    * otherwise it gets handled below by simply reading and writing the passes
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1441
    * directly.
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1442
    */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1443
   if (png_set_interlace_handling(read_ptr) != num_passes)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1444
      png_error(write_ptr,
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1445
            "png_set_interlace_handling(read): wrong pass count ");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1446
   if (png_set_interlace_handling(write_ptr) != num_passes)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1447
      png_error(write_ptr,
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1448
            "png_set_interlace_handling(write): wrong pass count ");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1449
#else /* png_set_interlace_handling not called on either read or write */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1450
#  define calc_pass_height
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1451
#endif /* not using libpng interlace handling */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1452
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1453
#ifdef PNGTEST_TIMING
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1454
   t_stop = (float)clock();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1455
   t_misc += (t_stop - t_start);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1456
   t_start = t_stop;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1457
#endif
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1458
   for (pass = 0; pass < num_passes; pass++)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1459
   {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1460
#     ifdef calc_pass_height
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1461
         png_uint_32 pass_height;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1462
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1463
         if (num_passes == 7) /* interlaced */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1464
         {
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1465
            if (PNG_PASS_COLS(width, pass) > 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1466
               pass_height = PNG_PASS_ROWS(height, pass);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1467
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1468
            else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1469
               pass_height = 0;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1470
         }
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1471
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1472
         else /* not interlaced */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1473
            pass_height = height;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1474
#     else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1475
#        define pass_height height
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1476
#     endif
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1477
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1478
      pngtest_debug1("Writing row data for pass %d", pass);
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1479
      for (y = 0; y < pass_height; y++)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1480
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1481
#ifndef SINGLE_ROWBUF_ALLOC
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1482
         pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1483
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1484
         row_buf = (png_bytep)png_malloc(read_ptr,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1485
            png_get_rowbytes(read_ptr, read_info_ptr));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1486
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1487
         pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1488
            (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1489
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1490
#endif /* !SINGLE_ROWBUF_ALLOC */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1491
         png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1492
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1493
#ifdef PNG_WRITE_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1494
#ifdef PNGTEST_TIMING
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1495
         t_stop = (float)clock();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1496
         t_decode += (t_stop - t_start);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1497
         t_start = t_stop;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1498
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1499
         png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1500
#ifdef PNGTEST_TIMING
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1501
         t_stop = (float)clock();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1502
         t_encode += (t_stop - t_start);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1503
         t_start = t_stop;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1504
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1505
#endif /* WRITE */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1506
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1507
#ifndef SINGLE_ROWBUF_ALLOC
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1508
         pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1509
         png_free(read_ptr, row_buf);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1510
         row_buf = NULL;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1511
#endif /* !SINGLE_ROWBUF_ALLOC */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1512
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1513
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1514
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1515
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1516
#  ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1517
      png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1518
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1519
#  ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1520
      png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1521
#  endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1522
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1523
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1524
   pngtest_debug("Reading and writing end_info data");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1525
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1526
   png_read_end(read_ptr, end_info_ptr);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1527
#ifdef PNG_TEXT_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1528
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1529
      png_textp text_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1530
      int num_text;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1531
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1532
      if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1533
      {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1534
         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1535
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1536
         pngtest_check_text_support(read_ptr, text_ptr, num_text);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1537
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1538
         if (verbose != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1539
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1540
            int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1541
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1542
            printf("\n");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1543
            for (i=0; i<num_text; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1544
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1545
               printf("   Text compression[%d]=%d\n",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1546
                     i, text_ptr[i].compression);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1547
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1548
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1549
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1550
         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1551
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1552
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1553
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1554
#ifdef PNG_tIME_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1555
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1556
      png_timep mod_time;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1557
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1558
      if (png_get_tIME(read_ptr, end_info_ptr, &mod_time) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1559
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1560
         png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1561
#ifdef PNG_TIME_RFC1123_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1562
         if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1563
            tIME_string[(sizeof tIME_string) - 1] = '\0';
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1564
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1565
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1566
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1567
            strncpy(tIME_string, "*** invalid time ***", sizeof tIME_string);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1568
            tIME_string[(sizeof tIME_string)-1] = '\0';
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1569
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1570
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1571
         tIME_chunk_present++;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1572
#endif /* TIME_RFC1123 */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1573
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1574
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1575
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1576
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1577
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1578
      png_unknown_chunkp unknowns;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1579
      int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr,
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1580
         &unknowns);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1581
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1582
      if (num_unknowns != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1583
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1584
         png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1585
           num_unknowns);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1586
#if PNG_LIBPNG_VER < 10600
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1587
         /* Copy the locations from the read_info_ptr.  The automatically
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1588
          * generated locations in write_end_info_ptr are wrong prior to 1.6.0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1589
          * because they are reset from the write pointer (removed in 1.6.0).
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1590
          */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1591
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1592
            int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1593
            for (i = 0; i < num_unknowns; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1594
              png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1595
                unknowns[i].location);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1596
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1597
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1598
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1599
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1600
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1601
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1602
#ifdef PNG_WRITE_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1603
#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1604
   /* Normally one would use Z_DEFAULT_STRATEGY for text compression.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1605
    * This is here just to make pngtest replicate the results from libpng
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1606
    * versions prior to 1.5.4, and to test this new API.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1607
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1608
   png_set_text_compression_strategy(write_ptr, Z_FILTERED);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1609
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1610
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1611
   /* When the unknown vpAg/sTER chunks are written by pngtest the only way to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1612
    * do it is to write them *before* calling png_write_end.  When unknown
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1613
    * chunks are written by libpng, however, they are written just before IEND.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1614
    * There seems to be no way round this, however vpAg/sTER are not expected
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1615
    * after IDAT.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1616
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1617
   write_chunks(write_ptr, after_IDAT);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1618
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1619
   png_write_end(write_ptr, write_end_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1620
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1621
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1622
#ifdef PNG_EASY_ACCESS_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1623
   if (verbose != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1624
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1625
      png_uint_32 iwidth, iheight;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1626
      iwidth = png_get_image_width(write_ptr, write_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1627
      iheight = png_get_image_height(write_ptr, write_info_ptr);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1628
      fprintf(STDERR, "\n Image width = %lu, height = %lu\n",
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1629
         (unsigned long)iwidth, (unsigned long)iheight);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1630
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1631
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1632
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1633
   pngtest_debug("Destroying data structs");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1634
#ifdef SINGLE_ROWBUF_ALLOC
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1635
   pngtest_debug("destroying row_buf for read_ptr");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1636
   png_free(read_ptr, row_buf);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1637
   row_buf = NULL;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1638
#endif /* SINGLE_ROWBUF_ALLOC */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1639
   pngtest_debug("destroying read_ptr, read_info_ptr, end_info_ptr");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1640
   png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1641
#ifdef PNG_WRITE_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1642
   pngtest_debug("destroying write_end_info_ptr");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1643
   png_destroy_info_struct(write_ptr, &write_end_info_ptr);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1644
   pngtest_debug("destroying write_ptr, write_info_ptr");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1645
   png_destroy_write_struct(&write_ptr, &write_info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1646
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1647
   pngtest_debug("Destruction complete.");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1648
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1649
   FCLOSE(fpin);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1650
   FCLOSE(fpout);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1651
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1652
   /* Summarize any warnings or errors and in 'strict' mode fail the test.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1653
    * Unsupported chunks can result in warnings, in that case ignore the strict
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1654
    * setting, otherwise fail the test on warnings as well as errors.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1655
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1656
   if (error_count > 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1657
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1658
      /* We don't really expect to get here because of the setjmp handling
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1659
       * above, but this is safe.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1660
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1661
      fprintf(STDERR, "\n  %s: %d libpng errors found (%d warnings)",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1662
         inname, error_count, warning_count);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1663
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1664
      if (strict != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1665
         return (1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1666
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1667
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1668
#  ifdef PNG_WRITE_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1669
      /* If there is no write support nothing was written! */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1670
      else if (unsupported_chunks > 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1671
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1672
         fprintf(STDERR, "\n  %s: unsupported chunks (%d)%s",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1673
            inname, unsupported_chunks, strict ? ": IGNORED --strict!" : "");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1674
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1675
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1676
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1677
   else if (warning_count > 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1678
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1679
      fprintf(STDERR, "\n  %s: %d libpng warnings found",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1680
         inname, warning_count);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1681
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1682
      if (strict != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1683
         return (1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1684
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1685
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1686
   pngtest_debug("Opening files for comparison");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1687
   if ((fpin = fopen(inname, "rb")) == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1688
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1689
      fprintf(STDERR, "Could not find file %s\n", inname);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1690
      return (1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1691
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1692
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1693
   if ((fpout = fopen(outname, "rb")) == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1694
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1695
      fprintf(STDERR, "Could not find file %s\n", outname);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1696
      FCLOSE(fpin);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1697
      return (1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1698
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1699
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1700
#if defined (PNG_WRITE_SUPPORTED) /* else nothing was written */ &&\
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1701
    defined (PNG_WRITE_FILTER_SUPPORTED)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1702
   if (interlace_preserved != 0) /* else the files will be changed */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1703
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1704
      for (;;)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1705
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1706
         static int wrote_question = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1707
         png_size_t num_in, num_out;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1708
         char inbuf[256], outbuf[256];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1709
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1710
         num_in = fread(inbuf, 1, sizeof inbuf, fpin);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1711
         num_out = fread(outbuf, 1, sizeof outbuf, fpout);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1712
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1713
         if (num_in != num_out)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1714
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1715
            fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1716
                    inname, outname);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1717
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1718
            if (wrote_question == 0 && unsupported_chunks == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1719
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1720
               fprintf(STDERR,
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1721
         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1722
                 inname, PNG_ZBUF_SIZE);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1723
               fprintf(STDERR,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1724
                 "\n   filtering heuristic (libpng default), compression");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1725
               fprintf(STDERR,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1726
                 " level (zlib default),\n   and zlib version (%s)?\n\n",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1727
                 ZLIB_VERSION);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1728
               wrote_question = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1729
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1730
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1731
            FCLOSE(fpin);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1732
            FCLOSE(fpout);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1733
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1734
            if (strict != 0 && unsupported_chunks == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1735
              return (1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1736
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1737
            else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1738
              return (0);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1739
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1740
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1741
         if (num_in == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1742
            break;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1743
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1744
         if (memcmp(inbuf, outbuf, num_in))
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1745
         {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1746
            fprintf(STDERR, "\nFiles %s and %s are different\n", inname,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1747
               outname);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1748
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1749
            if (wrote_question == 0 && unsupported_chunks == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1750
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1751
               fprintf(STDERR,
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1752
         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1753
                    inname, PNG_ZBUF_SIZE);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1754
               fprintf(STDERR,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1755
                 "\n   filtering heuristic (libpng default), compression");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1756
               fprintf(STDERR,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1757
                 " level (zlib default),\n   and zlib version (%s)?\n\n",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1758
                 ZLIB_VERSION);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1759
               wrote_question = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1760
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1761
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1762
            FCLOSE(fpin);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1763
            FCLOSE(fpout);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1764
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1765
            /* NOTE: the unsupported_chunks escape is permitted here because
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1766
             * unsupported text chunk compression will result in the compression
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1767
             * mode being changed (to NONE) yet, in the test case, the result
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1768
             * can be exactly the same size!
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1769
             */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1770
            if (strict != 0 && unsupported_chunks == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1771
              return (1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1772
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1773
            else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1774
              return (0);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1775
         }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1776
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1777
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1778
#endif /* WRITE && WRITE_FILTER */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1779
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1780
   FCLOSE(fpin);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1781
   FCLOSE(fpout);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1782
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1783
   return (0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1784
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1785
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1786
/* Input and output filenames */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1787
#ifdef RISCOS
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1788
static PNG_CONST char *inname = "pngtest/png";
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1789
static PNG_CONST char *outname = "pngout/png";
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1790
#else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1791
static PNG_CONST char *inname = "pngtest.png";
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1792
static PNG_CONST char *outname = "pngout.png";
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1793
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1794
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1795
int
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1796
main(int argc, char *argv[])
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1797
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1798
   int multiple = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1799
   int ierror = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1800
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1801
   png_structp dummy_ptr;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1802
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1803
   fprintf(STDERR, "\n Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1804
   fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1805
   fprintf(STDERR, "%s", png_get_copyright(NULL));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1806
   /* Show the version of libpng used in building the library */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1807
   fprintf(STDERR, " library (%lu):%s",
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1808
      (unsigned long)png_access_version_number(),
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1809
      png_get_header_version(NULL));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1810
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1811
   /* Show the version of libpng used in building the application */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1812
   fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1813
      PNG_HEADER_VERSION_STRING);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1814
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1815
   /* Do some consistency checking on the memory allocation settings, I'm
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1816
    * not sure this matters, but it is nice to know, the first of these
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1817
    * tests should be impossible because of the way the macros are set
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1818
    * in pngconf.h
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1819
    */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1820
#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1821
      fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1822
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1823
   /* I think the following can happen. */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1824
#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1825
      fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1826
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1827
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1828
   if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1829
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1830
      fprintf(STDERR,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1831
         "Warning: versions are different between png.h and png.c\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1832
      fprintf(STDERR, "  png.h version: %s\n", PNG_LIBPNG_VER_STRING);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1833
      fprintf(STDERR, "  png.c version: %s\n\n", png_libpng_ver);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1834
      ++ierror;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1835
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1836
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1837
   if (argc > 1)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1838
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1839
      if (strcmp(argv[1], "-m") == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1840
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1841
         multiple = 1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1842
         status_dots_requested = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1843
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1844
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1845
      else if (strcmp(argv[1], "-mv") == 0 ||
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1846
               strcmp(argv[1], "-vm") == 0 )
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1847
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1848
         multiple = 1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1849
         verbose = 1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1850
         status_dots_requested = 1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1851
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1852
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1853
      else if (strcmp(argv[1], "-v") == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1854
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1855
         verbose = 1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1856
         status_dots_requested = 1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1857
         inname = argv[2];
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1858
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1859
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1860
      else if (strcmp(argv[1], "--strict") == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1861
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1862
         status_dots_requested = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1863
         verbose = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1864
         inname = argv[2];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1865
         strict++;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1866
         relaxed = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1867
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1868
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1869
      else if (strcmp(argv[1], "--relaxed") == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1870
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1871
         status_dots_requested = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1872
         verbose = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1873
         inname = argv[2];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1874
         strict = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1875
         relaxed++;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1876
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1877
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1878
      else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1879
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1880
         inname = argv[1];
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1881
         status_dots_requested = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1882
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1883
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1884
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1885
   if (multiple == 0 && argc == 3 + verbose)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1886
     outname = argv[2 + verbose];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1887
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1888
   if ((multiple == 0 && argc > 3 + verbose) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1889
       (multiple != 0 && argc < 2))
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1890
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1891
     fprintf(STDERR,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1892
       "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1893
        argv[0], argv[0]);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1894
     fprintf(STDERR,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1895
       "  reads/writes one PNG file (without -m) or multiple files (-m)\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1896
     fprintf(STDERR,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1897
       "  with -m %s is used as a temporary file\n", outname);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1898
     exit(1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1899
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1900
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1901
   if (multiple != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1902
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1903
      int i;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1904
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1905
      int allocation_now = current_allocation;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1906
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1907
      for (i=2; i<argc; ++i)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1908
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1909
         int kerror;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1910
         fprintf(STDERR, "\n Testing %s:", argv[i]);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1911
#if PNG_DEBUG > 0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1912
         fprintf(STDERR, "\n");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1913
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1914
         kerror = test_one_file(argv[i], outname);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1915
         if (kerror == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1916
         {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1917
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1918
            fprintf(STDERR, "\n PASS (%lu zero samples)\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1919
               (unsigned long)zero_samples);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1920
#else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1921
            fprintf(STDERR, " PASS\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1922
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1923
#ifdef PNG_TIME_RFC1123_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1924
            if (tIME_chunk_present != 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1925
               fprintf(STDERR, " tIME = %s\n", tIME_string);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1926
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1927
            tIME_chunk_present = 0;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1928
#endif /* TIME_RFC1123 */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1929
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1930
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1931
         else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1932
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1933
            fprintf(STDERR, " FAIL\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1934
            ierror += kerror;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1935
         }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1936
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1937
         if (allocation_now != current_allocation)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1938
            fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1939
               current_allocation - allocation_now);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1940
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1941
         if (current_allocation != 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1942
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1943
            memory_infop pinfo = pinformation;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1944
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1945
            fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1946
               current_allocation);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1947
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1948
            while (pinfo != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1949
            {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1950
               fprintf(STDERR, " %lu bytes at %p\n",
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1951
                 (unsigned long)pinfo->size,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1952
                 pinfo->pointer);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1953
               pinfo = pinfo->next;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1954
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1955
         }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1956
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1957
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1958
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1959
         fprintf(STDERR, " Current memory allocation: %10d bytes\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1960
            current_allocation);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1961
         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1962
            maximum_allocation);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1963
         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1964
            total_allocation);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1965
         fprintf(STDERR, "     Number of allocations: %10d\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1966
            num_allocations);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1967
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1968
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1969
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1970
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1971
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1972
      int i;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1973
      for (i = 0; i<3; ++i)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1974
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1975
         int kerror;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1976
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1977
         int allocation_now = current_allocation;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1978
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1979
         if (i == 1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1980
            status_dots_requested = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1981
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1982
         else if (verbose == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1983
            status_dots_requested = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1984
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1985
         if (i == 0 || verbose == 1 || ierror != 0)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1986
         {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1987
            fprintf(STDERR, "\n Testing %s:", inname);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1988
#if PNG_DEBUG > 0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1989
            fprintf(STDERR, "\n");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1990
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1991
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1992
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1993
         kerror = test_one_file(inname, outname);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1994
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1995
         if (kerror == 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1996
         {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1997
            if (verbose == 1 || i == 2)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1998
            {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1999
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2000
                fprintf(STDERR, "\n PASS (%lu zero samples)\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2001
                   (unsigned long)zero_samples);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2002
#else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2003
                fprintf(STDERR, " PASS\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2004
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2005
#ifdef PNG_TIME_RFC1123_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2006
             if (tIME_chunk_present != 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2007
                fprintf(STDERR, " tIME = %s\n", tIME_string);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2008
#endif /* TIME_RFC1123 */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2009
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2010
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2011
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2012
         else
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2013
         {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2014
            if (verbose == 0 && i != 2)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2015
            {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2016
               fprintf(STDERR, "\n Testing %s:", inname);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2017
#if PNG_DEBUG > 0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2018
               fprintf(STDERR, "\n");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2019
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2020
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2021
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2022
            fprintf(STDERR, " FAIL\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2023
            ierror += kerror;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2024
         }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2025
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2026
         if (allocation_now != current_allocation)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2027
             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2028
               current_allocation - allocation_now);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2029
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2030
         if (current_allocation != 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2031
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2032
             memory_infop pinfo = pinformation;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2033
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2034
             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2035
                current_allocation);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2036
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2037
             while (pinfo != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2038
             {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2039
                fprintf(STDERR, " %lu bytes at %p\n",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2040
                   (unsigned long)pinfo->size, pinfo->pointer);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2041
                pinfo = pinfo->next;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2042
             }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2043
          }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2044
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2045
       }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2046
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2047
       fprintf(STDERR, " Current memory allocation: %10d bytes\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2048
          current_allocation);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2049
       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2050
          maximum_allocation);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2051
       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2052
          total_allocation);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2053
       fprintf(STDERR, "     Number of allocations: %10d\n",
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2054
            num_allocations);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2055
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2056
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2057
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2058
#ifdef PNGTEST_TIMING
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2059
   t_stop = (float)clock();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2060
   t_misc += (t_stop - t_start);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2061
   t_start = t_stop;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2062
   fprintf(STDERR, " CPU time used = %.3f seconds",
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2063
      (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2064
   fprintf(STDERR, " (decoding %.3f,\n",
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2065
      t_decode/(float)CLOCKS_PER_SEC);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2066
   fprintf(STDERR, "        encoding %.3f ,",
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2067
      t_encode/(float)CLOCKS_PER_SEC);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2068
   fprintf(STDERR, " other %.3f seconds)\n\n",
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2069
      t_misc/(float)CLOCKS_PER_SEC);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2070
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2071
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2072
   if (ierror == 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2073
      fprintf(STDERR, " libpng passes test\n");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2074
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2075
   else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2076
      fprintf(STDERR, " libpng FAILS test\n");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2077
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2078
   dummy_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2079
   fprintf(STDERR, " Default limits:\n");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2080
   fprintf(STDERR, "  width_max  = %lu\n",
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2081
      (unsigned long) png_get_user_width_max(dummy_ptr));
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2082
   fprintf(STDERR, "  height_max = %lu\n",
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2083
      (unsigned long) png_get_user_height_max(dummy_ptr));
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2084
   if (png_get_chunk_cache_max(dummy_ptr) == 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2085
      fprintf(STDERR, "  cache_max  = unlimited\n");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2086
   else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2087
      fprintf(STDERR, "  cache_max  = %lu\n",
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2088
         (unsigned long) png_get_chunk_cache_max(dummy_ptr));
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2089
   if (png_get_chunk_malloc_max(dummy_ptr) == 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2090
      fprintf(STDERR, "  malloc_max = unlimited\n");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2091
   else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2092
      fprintf(STDERR, "  malloc_max = %lu\n",
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2093
         (unsigned long) png_get_chunk_malloc_max(dummy_ptr));
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2094
   png_destroy_read_struct(&dummy_ptr, NULL, NULL);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2095
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2096
   return (int)(ierror != 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2097
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2098
#else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2099
int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2100
main(void)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2101
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2102
   fprintf(STDERR,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2103
      " test ignored because libpng was not built with read support\n");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2104
   /* And skip this test */
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
  2105
   return SKIP;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2106
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2107
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2108
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2109
/* Generate a compiler error if there is an old png.h in the search path. */
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
  2110
typedef png_libpng_version_1_6_23 Your_png_h_is_not_version_1_6_23;