src/java.desktop/share/native/libsplashscreen/libpng/png.c
author chegar
Thu, 17 Oct 2019 20:54:25 +0100
branchdatagramsocketimpl-branch
changeset 58679 9c3209ff7550
parent 58678 9cf78a70fa4f
parent 57618 53154e45385a
permissions -rw-r--r--
datagramsocketimpl-branch: merge with default
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
/* png.c - location for general purpose libpng functions
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
 *
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
    32
 * Copyright (c) 2018-2019 Cosmin Truta
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
    33
 * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
    34
 * Copyright (c) 1996-1997 Andreas Dilger
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
    35
 * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    36
 *
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
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    42
#include "pngpriv.h"
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
/* Generate a compiler error if there is an old png.h in the search path. */
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
    45
typedef png_libpng_version_1_6_37 Your_png_h_is_not_version_1_6_37;
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    46
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    47
#ifdef __GNUC__
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    48
/* The version tests may need to be added to, but the problem warning has
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    49
 * consistently been fixed in GCC versions which obtain wide-spread release.
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    50
 * The problem is that many versions of GCC rearrange comparison expressions in
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    51
 * the optimizer in such a way that the results of the comparison will change
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    52
 * if signed integer overflow occurs.  Such comparisons are not permitted in
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    53
 * ANSI C90, however GCC isn't clever enough to work out that that do not occur
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    54
 * below in png_ascii_from_fp and png_muldiv, so it produces a warning with
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    55
 * -Wextra.  Unfortunately this is highly dependent on the optimizer and the
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    56
 * machine architecture so the warning comes and goes unpredictably and is
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    57
 * impossible to "fix", even were that a good idea.
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    58
 */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    59
#if __GNUC__ == 7 && __GNUC_MINOR__ == 1
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    60
#define GCC_STRICT_OVERFLOW 1
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    61
#endif /* GNU 7.1.x */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    62
#endif /* GNU */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    63
#ifndef GCC_STRICT_OVERFLOW
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    64
#define GCC_STRICT_OVERFLOW 0
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    65
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
/* Tells libpng that we have already handled the first "num_bytes" bytes
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
 * of the PNG file signature.  If the PNG data is embedded into another
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
 * stream we can set num_bytes = 8 so that libpng will not attempt to read
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
 * or write any of the magic bytes before it starts on the IHDR.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
#ifdef PNG_READ_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    75
png_set_sig_bytes(png_structrp png_ptr, int num_bytes)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
{
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    77
   unsigned int nb = (unsigned int)num_bytes;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    78
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    79
   png_debug(1, "in png_set_sig_bytes");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    80
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    81
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    82
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    83
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    84
   if (num_bytes < 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    85
      nb = 0;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    86
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    87
   if (nb > 8)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    88
      png_error(png_ptr, "Too many bytes for PNG signature");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
    90
   png_ptr->sig_bytes = (png_byte)nb;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    91
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
    92
90ce3da70b43 Initial load
duke
parents:
diff changeset
    93
/* Checks whether the supplied bytes match the PNG signature.  We allow
90ce3da70b43 Initial load
duke
parents:
diff changeset
    94
 * checking less than the full 8-byte signature so that those apps that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    95
 * already read the first few bytes of a file to determine the file type
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
 * can simply check the remaining bytes for extra assurance.  Returns
90ce3da70b43 Initial load
duke
parents:
diff changeset
    97
 * an integer less than, equal to, or greater than zero if sig is found,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    98
 * respectively, to be less than, to match, or be greater than the correct
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    99
 * PNG signature (this is the same behavior as strcmp, memcmp, etc).
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   100
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
int PNGAPI
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
   102
png_sig_cmp(png_const_bytep sig, size_t start, size_t num_to_check)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   103
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   105
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
   if (num_to_check > 8)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   107
      num_to_check = 8;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   108
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
   else if (num_to_check < 1)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
      return (-1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
   if (start > 7)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
      return (-1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
   if (start + num_to_check > 8)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
      num_to_check = 8 - start;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   118
   return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   121
#endif /* READ */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   124
/* Function to allocate memory for zlib */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   125
PNG_FUNCTION(voidpf /* PRIVATE */,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   126
png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   128
   png_alloc_size_t num_bytes = size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   130
   if (png_ptr == NULL)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   131
      return NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   132
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   133
   if (items >= (~(png_alloc_size_t)0)/size)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   135
      png_warning (png_voidcast(png_structrp, png_ptr),
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   136
          "Potential overflow in png_zalloc()");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   137
      return NULL;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   139
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   140
   num_bytes *= items;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   141
   return png_malloc_warn(png_voidcast(png_structrp, png_ptr), num_bytes);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   142
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   144
/* Function to free memory for zlib */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   145
void /* PRIVATE */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   146
png_zfree(voidpf png_ptr, voidpf ptr)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   148
   png_free(png_voidcast(png_const_structrp,png_ptr), ptr);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   149
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
 * in case CRC is > 32 bits to leave the top bits 0.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   153
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   155
png_reset_crc(png_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
{
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   157
   /* The cast is safe because the crc is a 32-bit value. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   158
   png_ptr->crc = (png_uint_32)crc32(0, Z_NULL, 0);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   160
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
/* Calculate the CRC over a section of data.  We can only pass as
90ce3da70b43 Initial load
duke
parents:
diff changeset
   162
 * much data to this routine as the largest single buffer size.  We
90ce3da70b43 Initial load
duke
parents:
diff changeset
   163
 * also check that this data will actually be used before going to the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   164
 * trouble of calculating it.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   165
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   166
void /* PRIVATE */
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
   167
png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, size_t length)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   168
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
   int need_crc = 1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   171
   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   173
      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
90ce3da70b43 Initial load
duke
parents:
diff changeset
   174
          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
         need_crc = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   177
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   178
   else /* critical */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   180
      if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
         need_crc = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   184
   /* 'uLong' is defined in zlib.h as unsigned long; this means that on some
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   185
    * systems it is a 64-bit value.  crc32, however, returns 32 bits so the
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   186
    * following cast is safe.  'uInt' may be no more than 16 bits, so it is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   187
    * necessary to perform a loop here.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   188
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   189
   if (need_crc != 0 && length > 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   190
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   191
      uLong crc = png_ptr->crc; /* Should never issue a warning */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   192
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   193
      do
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   194
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   195
         uInt safe_length = (uInt)length;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   196
#ifndef __COVERITY__
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   197
         if (safe_length == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   198
            safe_length = (uInt)-1; /* evil, but safe */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   199
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   200
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   201
         crc = crc32(crc, ptr, safe_length);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   202
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   203
         /* The following should never issue compiler warnings; if they do the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   204
          * target system has characteristics that will probably violate other
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   205
          * assumptions within the libpng code.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   206
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   207
         ptr += safe_length;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   208
         length -= safe_length;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   209
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   210
      while (length > 0);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   211
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   212
      /* And the following is always safe because the crc is only 32 bits. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   213
      png_ptr->crc = (png_uint_32)crc;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   214
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   217
/* Check a user supplied version number, called from both read and write
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   218
 * functions that create a png_struct.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   219
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   220
int
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   221
png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   222
{
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   223
   /* Libpng versions 1.0.0 and later are binary compatible if the version
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   224
    * string matches through the second '.'; we must recompile any
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   225
    * applications that use any older library version.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   226
    */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   227
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   228
   if (user_png_ver != NULL)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   229
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   230
      int i = -1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   231
      int found_dots = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   232
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   233
      do
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   234
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   235
         i++;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   236
         if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i])
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   237
            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   238
         if (user_png_ver[i] == '.')
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   239
            found_dots++;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   240
      } while (found_dots < 2 && user_png_ver[i] != 0 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   241
            PNG_LIBPNG_VER_STRING[i] != 0);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   242
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   243
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   244
   else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   245
      png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   246
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   247
   if ((png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   248
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   249
#ifdef PNG_WARNINGS_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   250
      size_t pos = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   251
      char m[128];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   252
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   253
      pos = png_safecat(m, (sizeof m), pos,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   254
          "Application built with libpng-");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   255
      pos = png_safecat(m, (sizeof m), pos, user_png_ver);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   256
      pos = png_safecat(m, (sizeof m), pos, " but running with ");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   257
      pos = png_safecat(m, (sizeof m), pos, PNG_LIBPNG_VER_STRING);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   258
      PNG_UNUSED(pos)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   259
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   260
      png_warning(png_ptr, m);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   261
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   262
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   263
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   264
      png_ptr->flags = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   265
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   266
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   267
      return 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   268
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   269
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   270
   /* Success return. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   271
   return 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   272
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   273
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   274
/* Generic function to create a png_struct for either read or write - this
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   275
 * contains the common initialization.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   276
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   277
PNG_FUNCTION(png_structp /* PRIVATE */,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   278
png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   279
    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   280
    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   281
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   282
   png_struct create_struct;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   283
#  ifdef PNG_SETJMP_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   284
      jmp_buf create_jmp_buf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   285
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   286
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   287
   /* This temporary stack-allocated structure is used to provide a place to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   288
    * build enough context to allow the user provided memory allocator (if any)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   289
    * to be called.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   290
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   291
   memset(&create_struct, 0, (sizeof create_struct));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   292
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   293
   /* Added at libpng-1.2.6 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   294
#  ifdef PNG_USER_LIMITS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   295
      create_struct.user_width_max = PNG_USER_WIDTH_MAX;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   296
      create_struct.user_height_max = PNG_USER_HEIGHT_MAX;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   297
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   298
#     ifdef PNG_USER_CHUNK_CACHE_MAX
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   299
      /* Added at libpng-1.2.43 and 1.4.0 */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   300
      create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   301
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   302
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   303
#     ifdef PNG_USER_CHUNK_MALLOC_MAX
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   304
      /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   305
       * in png_struct regardless.
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   306
       */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   307
      create_struct.user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   308
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   309
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   310
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   311
   /* The following two API calls simply set fields in png_struct, so it is safe
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   312
    * to do them now even though error handling is not yet set up.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   313
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   314
#  ifdef PNG_USER_MEM_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   315
      png_set_mem_fn(&create_struct, mem_ptr, malloc_fn, free_fn);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   316
#  else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   317
      PNG_UNUSED(mem_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   318
      PNG_UNUSED(malloc_fn)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   319
      PNG_UNUSED(free_fn)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   320
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   321
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   322
   /* (*error_fn) can return control to the caller after the error_ptr is set,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   323
    * this will result in a memory leak unless the error_fn does something
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   324
    * extremely sophisticated.  The design lacks merit but is implicit in the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   325
    * API.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   326
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   327
   png_set_error_fn(&create_struct, error_ptr, error_fn, warn_fn);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   328
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   329
#  ifdef PNG_SETJMP_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   330
      if (!setjmp(create_jmp_buf))
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   331
#  endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   332
      {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   333
#  ifdef PNG_SETJMP_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   334
         /* Temporarily fake out the longjmp information until we have
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   335
          * successfully completed this function.  This only works if we have
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   336
          * setjmp() support compiled in, but it is safe - this stuff should
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   337
          * never happen.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   338
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   339
         create_struct.jmp_buf_ptr = &create_jmp_buf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   340
         create_struct.jmp_buf_size = 0; /*stack allocation*/
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   341
         create_struct.longjmp_fn = longjmp;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   342
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   343
         /* Call the general version checker (shared with read and write code):
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   344
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   345
         if (png_user_version_check(&create_struct, user_png_ver) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   346
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   347
            png_structrp png_ptr = png_voidcast(png_structrp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   348
                png_malloc_warn(&create_struct, (sizeof *png_ptr)));
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   349
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   350
            if (png_ptr != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   351
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   352
               /* png_ptr->zstream holds a back-pointer to the png_struct, so
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   353
                * this can only be done now:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   354
                */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   355
               create_struct.zstream.zalloc = png_zalloc;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   356
               create_struct.zstream.zfree = png_zfree;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   357
               create_struct.zstream.opaque = png_ptr;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   358
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   359
#              ifdef PNG_SETJMP_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   360
               /* Eliminate the local error handling: */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   361
               create_struct.jmp_buf_ptr = NULL;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   362
               create_struct.jmp_buf_size = 0;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   363
               create_struct.longjmp_fn = 0;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   364
#              endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   365
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   366
               *png_ptr = create_struct;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   367
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   368
               /* This is the successful return point */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   369
               return png_ptr;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   370
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   371
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   372
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   373
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   374
   /* A longjmp because of a bug in the application storage allocator or a
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   375
    * simple failure to allocate the png_struct.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   376
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   377
   return NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   378
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   379
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   380
/* Allocate the memory for an info_struct for the application. */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   381
PNG_FUNCTION(png_infop,PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   382
png_create_info_struct,(png_const_structrp png_ptr),PNG_ALLOCATED)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   383
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   384
   png_inforp info_ptr;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   385
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   386
   png_debug(1, "in png_create_info_struct");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   387
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   388
   if (png_ptr == NULL)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   389
      return NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   390
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   391
   /* Use the internal API that does not (or at least should not) error out, so
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   392
    * that this call always returns ok.  The application typically sets up the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   393
    * error handling *after* creating the info_struct because this is the way it
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   394
    * has always been done in 'example.c'.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   395
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   396
   info_ptr = png_voidcast(png_inforp, png_malloc_base(png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   397
       (sizeof *info_ptr)));
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   398
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   399
   if (info_ptr != NULL)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   400
      memset(info_ptr, 0, (sizeof *info_ptr));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   401
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   402
   return info_ptr;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   403
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   404
90ce3da70b43 Initial load
duke
parents:
diff changeset
   405
/* This function frees the memory associated with a single info struct.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   406
 * Normally, one would use either png_destroy_read_struct() or
90ce3da70b43 Initial load
duke
parents:
diff changeset
   407
 * png_destroy_write_struct() to free an info struct, but this may be
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   408
 * useful for some applications.  From libpng 1.6.0 this function is also used
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   409
 * internally to implement the png_info release part of the 'struct' destroy
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   410
 * APIs.  This ensures that all possible approaches free the same data (all of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   411
 * it).
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   412
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   413
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   414
png_destroy_info_struct(png_const_structrp png_ptr, png_infopp info_ptr_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   415
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   416
   png_inforp info_ptr = NULL;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   417
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   418
   png_debug(1, "in png_destroy_info_struct");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   419
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   420
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   421
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   422
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   423
   if (info_ptr_ptr != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   424
      info_ptr = *info_ptr_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   425
90ce3da70b43 Initial load
duke
parents:
diff changeset
   426
   if (info_ptr != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   427
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   428
      /* Do this first in case of an error below; if the app implements its own
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   429
       * memory management this can lead to png_free calling png_error, which
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   430
       * will abort this routine and return control to the app error handler.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   431
       * An infinite loop may result if it then tries to free the same info
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   432
       * ptr.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   433
       */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   434
      *info_ptr_ptr = NULL;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   435
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   436
      png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   437
      memset(info_ptr, 0, (sizeof *info_ptr));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   438
      png_free(png_ptr, info_ptr);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   439
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   440
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   441
90ce3da70b43 Initial load
duke
parents:
diff changeset
   442
/* Initialize the info structure.  This is now an internal function (0.89)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   443
 * and applications using it are urged to use png_create_info_struct()
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   444
 * instead.  Use deprecated in 1.6.0, internal use removed (used internally it
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   445
 * is just a memset).
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   446
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   447
 * NOTE: it is almost inconceivable that this API is used because it bypasses
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   448
 * the user-memory mechanism and the user error handling/warning mechanisms in
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   449
 * those cases where it does anything other than a memset.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   450
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   451
PNG_FUNCTION(void,PNGAPI
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
   452
png_info_init_3,(png_infopp ptr_ptr, size_t png_info_struct_size),
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   453
    PNG_DEPRECATED)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   454
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   455
   png_inforp info_ptr = *ptr_ptr;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   456
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   457
   png_debug(1, "in png_info_init_3");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   458
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   459
   if (info_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   460
      return;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   461
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   462
   if ((sizeof (png_info)) > png_info_struct_size)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   463
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   464
      *ptr_ptr = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   465
      /* The following line is why this API should not be used: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   466
      free(info_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   467
      info_ptr = png_voidcast(png_inforp, png_malloc_base(NULL,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   468
          (sizeof *info_ptr)));
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   469
      if (info_ptr == NULL)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   470
         return;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   471
      *ptr_ptr = info_ptr;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   472
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   473
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   474
   /* Set everything to 0 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   475
   memset(info_ptr, 0, (sizeof *info_ptr));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   476
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   477
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   478
/* The following API is not called internally */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   479
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   480
png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   481
    int freer, png_uint_32 mask)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   482
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   483
   png_debug(1, "in png_data_freer");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   484
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   485
   if (png_ptr == NULL || info_ptr == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   486
      return;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   487
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   488
   if (freer == PNG_DESTROY_WILL_FREE_DATA)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   489
      info_ptr->free_me |= mask;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   490
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   491
   else if (freer == PNG_USER_WILL_FREE_DATA)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   492
      info_ptr->free_me &= ~mask;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   493
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   494
   else
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   495
      png_error(png_ptr, "Unknown freer parameter in png_data_freer");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   496
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   497
90ce3da70b43 Initial load
duke
parents:
diff changeset
   498
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   499
png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   500
    int num)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   501
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   502
   png_debug(1, "in png_free_data");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   503
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   504
   if (png_ptr == NULL || info_ptr == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   505
      return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   506
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   507
#ifdef PNG_TEXT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   508
   /* Free text item num or (if num == -1) all text items */
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   509
   if (info_ptr->text != NULL &&
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   510
       ((mask & PNG_FREE_TEXT) & info_ptr->free_me) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   511
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   512
      if (num != -1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   513
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   514
         png_free(png_ptr, info_ptr->text[num].key);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   515
         info_ptr->text[num].key = NULL;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   516
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   517
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   518
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   519
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   520
         int i;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   521
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   522
         for (i = 0; i < info_ptr->num_text; i++)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   523
            png_free(png_ptr, info_ptr->text[i].key);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   524
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   525
         png_free(png_ptr, info_ptr->text);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   526
         info_ptr->text = NULL;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   527
         info_ptr->num_text = 0;
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   528
         info_ptr->max_text = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   529
      }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   530
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   531
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   532
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   533
#ifdef PNG_tRNS_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   534
   /* Free any tRNS entry */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   535
   if (((mask & PNG_FREE_TRNS) & info_ptr->free_me) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   536
   {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   537
      info_ptr->valid &= ~PNG_INFO_tRNS;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   538
      png_free(png_ptr, info_ptr->trans_alpha);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   539
      info_ptr->trans_alpha = NULL;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   540
      info_ptr->num_trans = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   541
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   542
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   543
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   544
#ifdef PNG_sCAL_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   545
   /* Free any sCAL entry */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   546
   if (((mask & PNG_FREE_SCAL) & info_ptr->free_me) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   547
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   548
      png_free(png_ptr, info_ptr->scal_s_width);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   549
      png_free(png_ptr, info_ptr->scal_s_height);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   550
      info_ptr->scal_s_width = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   551
      info_ptr->scal_s_height = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   552
      info_ptr->valid &= ~PNG_INFO_sCAL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   553
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   554
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   555
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   556
#ifdef PNG_pCAL_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   557
   /* Free any pCAL entry */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   558
   if (((mask & PNG_FREE_PCAL) & info_ptr->free_me) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   559
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   560
      png_free(png_ptr, info_ptr->pcal_purpose);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   561
      png_free(png_ptr, info_ptr->pcal_units);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   562
      info_ptr->pcal_purpose = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   563
      info_ptr->pcal_units = NULL;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   564
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   565
      if (info_ptr->pcal_params != NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   566
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   567
            int i;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   568
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   569
            for (i = 0; i < info_ptr->pcal_nparams; i++)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   570
               png_free(png_ptr, info_ptr->pcal_params[i]);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   571
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   572
            png_free(png_ptr, info_ptr->pcal_params);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   573
            info_ptr->pcal_params = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   574
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   575
      info_ptr->valid &= ~PNG_INFO_pCAL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   576
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   577
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   578
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   579
#ifdef PNG_iCCP_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   580
   /* Free any profile entry */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   581
   if (((mask & PNG_FREE_ICCP) & info_ptr->free_me) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   582
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   583
      png_free(png_ptr, info_ptr->iccp_name);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   584
      png_free(png_ptr, info_ptr->iccp_profile);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   585
      info_ptr->iccp_name = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   586
      info_ptr->iccp_profile = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   587
      info_ptr->valid &= ~PNG_INFO_iCCP;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   588
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   589
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   590
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   591
#ifdef PNG_sPLT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   592
   /* Free a given sPLT entry, or (if num == -1) all sPLT entries */
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   593
   if (info_ptr->splt_palettes != NULL &&
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   594
       ((mask & PNG_FREE_SPLT) & info_ptr->free_me) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   595
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   596
      if (num != -1)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   597
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   598
         png_free(png_ptr, info_ptr->splt_palettes[num].name);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   599
         png_free(png_ptr, info_ptr->splt_palettes[num].entries);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   600
         info_ptr->splt_palettes[num].name = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   601
         info_ptr->splt_palettes[num].entries = NULL;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   602
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   603
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   604
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   605
      {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   606
         int i;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   607
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   608
         for (i = 0; i < info_ptr->splt_palettes_num; i++)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   609
         {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   610
            png_free(png_ptr, info_ptr->splt_palettes[i].name);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   611
            png_free(png_ptr, info_ptr->splt_palettes[i].entries);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   612
         }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   613
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   614
         png_free(png_ptr, info_ptr->splt_palettes);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   615
         info_ptr->splt_palettes = NULL;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   616
         info_ptr->splt_palettes_num = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   617
         info_ptr->valid &= ~PNG_INFO_sPLT;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   618
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   619
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   620
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   621
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   622
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   623
   if (info_ptr->unknown_chunks != NULL &&
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   624
       ((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   625
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   626
      if (num != -1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   627
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   628
          png_free(png_ptr, info_ptr->unknown_chunks[num].data);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   629
          info_ptr->unknown_chunks[num].data = NULL;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   630
      }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   631
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   632
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   633
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   634
         int i;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   635
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   636
         for (i = 0; i < info_ptr->unknown_chunks_num; i++)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   637
            png_free(png_ptr, info_ptr->unknown_chunks[i].data);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   638
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   639
         png_free(png_ptr, info_ptr->unknown_chunks);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   640
         info_ptr->unknown_chunks = NULL;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   641
         info_ptr->unknown_chunks_num = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   642
      }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   643
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   644
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   645
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   646
#ifdef PNG_eXIf_SUPPORTED
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   647
   /* Free any eXIf entry */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   648
   if (((mask & PNG_FREE_EXIF) & info_ptr->free_me) != 0)
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   649
   {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   650
# ifdef PNG_READ_eXIf_SUPPORTED
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   651
      if (info_ptr->eXIf_buf)
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   652
      {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   653
         png_free(png_ptr, info_ptr->eXIf_buf);
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   654
         info_ptr->eXIf_buf = NULL;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   655
      }
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   656
# endif
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   657
      if (info_ptr->exif)
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   658
      {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   659
         png_free(png_ptr, info_ptr->exif);
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   660
         info_ptr->exif = NULL;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   661
      }
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   662
      info_ptr->valid &= ~PNG_INFO_eXIf;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   663
   }
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   664
#endif
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   665
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   666
#ifdef PNG_hIST_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   667
   /* Free any hIST entry */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   668
   if (((mask & PNG_FREE_HIST) & info_ptr->free_me) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   669
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   670
      png_free(png_ptr, info_ptr->hist);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   671
      info_ptr->hist = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   672
      info_ptr->valid &= ~PNG_INFO_hIST;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   673
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   674
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   675
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   676
   /* Free any PLTE entry that was internally allocated */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   677
   if (((mask & PNG_FREE_PLTE) & info_ptr->free_me) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   678
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   679
      png_free(png_ptr, info_ptr->palette);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   680
      info_ptr->palette = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   681
      info_ptr->valid &= ~PNG_INFO_PLTE;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   682
      info_ptr->num_palette = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   683
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   684
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   685
#ifdef PNG_INFO_IMAGE_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   686
   /* Free any image bits attached to the info structure */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   687
   if (((mask & PNG_FREE_ROWS) & info_ptr->free_me) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   688
   {
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   689
      if (info_ptr->row_pointers != NULL)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   690
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   691
         png_uint_32 row;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   692
         for (row = 0; row < info_ptr->height; row++)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   693
            png_free(png_ptr, info_ptr->row_pointers[row]);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   694
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   695
         png_free(png_ptr, info_ptr->row_pointers);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   696
         info_ptr->row_pointers = NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   697
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   698
      info_ptr->valid &= ~PNG_INFO_IDAT;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   699
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   700
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   701
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   702
   if (num != -1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   703
      mask &= ~PNG_FREE_MUL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   704
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   705
   info_ptr->free_me &= ~mask;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   706
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   707
#endif /* READ || WRITE */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   708
90ce3da70b43 Initial load
duke
parents:
diff changeset
   709
/* This function returns a pointer to the io_ptr associated with the user
90ce3da70b43 Initial load
duke
parents:
diff changeset
   710
 * functions.  The application should free any memory associated with this
90ce3da70b43 Initial load
duke
parents:
diff changeset
   711
 * pointer before png_write_destroy() or png_read_destroy() are called.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   712
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   713
png_voidp PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   714
png_get_io_ptr(png_const_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   715
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   716
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   717
      return (NULL);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   718
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   719
   return (png_ptr->io_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   720
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   721
90ce3da70b43 Initial load
duke
parents:
diff changeset
   722
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   723
#  ifdef PNG_STDIO_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   724
/* Initialize the default input/output functions for the PNG file.  If you
90ce3da70b43 Initial load
duke
parents:
diff changeset
   725
 * use your own read or write routines, you can call either png_set_read_fn()
90ce3da70b43 Initial load
duke
parents:
diff changeset
   726
 * or png_set_write_fn() instead of png_init_io().  If you have defined
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   727
 * PNG_NO_STDIO or otherwise disabled PNG_STDIO_SUPPORTED, you must use a
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   728
 * function of your own because "FILE *" isn't necessarily available.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   729
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   730
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   731
png_init_io(png_structrp png_ptr, png_FILE_p fp)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   732
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   733
   png_debug(1, "in png_init_io");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   734
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   735
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   736
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   737
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   738
   png_ptr->io_ptr = (png_voidp)fp;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   739
}
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   740
#  endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   741
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   742
#  ifdef PNG_SAVE_INT_32_SUPPORTED
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   743
/* PNG signed integers are saved in 32-bit 2's complement format.  ANSI C-90
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   744
 * defines a cast of a signed integer to an unsigned integer either to preserve
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   745
 * the value, if it is positive, or to calculate:
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   746
 *
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   747
 *     (UNSIGNED_MAX+1) + integer
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   748
 *
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   749
 * Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   750
 * negative integral value is added the result will be an unsigned value
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   751
 * correspnding to the 2's complement representation.
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   752
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   753
void PNGAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   754
png_save_int_32(png_bytep buf, png_int_32 i)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   755
{
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   756
   png_save_uint_32(buf, (png_uint_32)i);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   757
}
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   758
#  endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   759
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   760
#  ifdef PNG_TIME_RFC1123_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   761
/* Convert the supplied time into an RFC 1123 string suitable for use in
90ce3da70b43 Initial load
duke
parents:
diff changeset
   762
 * a "Creation Time" or other text-based time string.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   763
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   764
int PNGAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   765
png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   766
{
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
   767
   static const char short_months[12][4] =
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   768
        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
90ce3da70b43 Initial load
duke
parents:
diff changeset
   769
         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
90ce3da70b43 Initial load
duke
parents:
diff changeset
   770
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   771
   if (out == NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   772
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   773
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   774
   if (ptime->year > 9999 /* RFC1123 limitation */ ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   775
       ptime->month == 0    ||  ptime->month > 12  ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   776
       ptime->day   == 0    ||  ptime->day   > 31  ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   777
       ptime->hour  > 23    ||  ptime->minute > 59 ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   778
       ptime->second > 60)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   779
      return 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   780
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   781
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   782
      size_t pos = 0;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   783
      char number_buf[5]; /* enough for a four-digit year */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   784
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   785
#     define APPEND_STRING(string) pos = png_safecat(out, 29, pos, (string))
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   786
#     define APPEND_NUMBER(format, value)\
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   787
         APPEND_STRING(PNG_FORMAT_NUMBER(number_buf, format, (value)))
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   788
#     define APPEND(ch) if (pos < 28) out[pos++] = (ch)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   789
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   790
      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, (unsigned)ptime->day);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   791
      APPEND(' ');
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   792
      APPEND_STRING(short_months[(ptime->month - 1)]);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   793
      APPEND(' ');
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   794
      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->year);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   795
      APPEND(' ');
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   796
      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->hour);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   797
      APPEND(':');
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   798
      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->minute);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   799
      APPEND(':');
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   800
      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->second);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   801
      APPEND_STRING(" +0000"); /* This reliably terminates the buffer */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   802
      PNG_UNUSED (pos)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   803
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   804
#     undef APPEND
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   805
#     undef APPEND_NUMBER
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   806
#     undef APPEND_STRING
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   807
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   808
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   809
   return 1;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   810
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   811
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   812
#    if PNG_LIBPNG_VER < 10700
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   813
/* To do: remove the following from libpng-1.7 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   814
/* Original API that uses a private buffer in png_struct.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   815
 * Deprecated because it causes png_struct to carry a spurious temporary
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   816
 * buffer (png_struct::time_buffer), better to have the caller pass this in.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   817
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   818
png_const_charp PNGAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   819
png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   820
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   821
   if (png_ptr != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   822
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   823
      /* The only failure above if png_ptr != NULL is from an invalid ptime */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   824
      if (png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   825
         png_warning(png_ptr, "Ignoring invalid time value");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   826
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   827
      else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   828
         return png_ptr->time_buffer;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   829
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   830
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   831
   return NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   832
}
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   833
#    endif /* LIBPNG_VER < 10700 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   834
#  endif /* TIME_RFC1123 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   835
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   836
#endif /* READ || WRITE */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   837
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   838
png_const_charp PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   839
png_get_copyright(png_const_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   840
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   841
   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   842
#ifdef PNG_STRING_COPYRIGHT
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   843
   return PNG_STRING_COPYRIGHT
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   844
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   845
   return PNG_STRING_NEWLINE \
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
   846
      "libpng version 1.6.37" PNG_STRING_NEWLINE \
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
   847
      "Copyright (c) 2018-2019 Cosmin Truta" PNG_STRING_NEWLINE \
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
   848
      "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   849
      PNG_STRING_NEWLINE \
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   850
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   851
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   852
      PNG_STRING_NEWLINE;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   853
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   854
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   855
90ce3da70b43 Initial load
duke
parents:
diff changeset
   856
/* The following return the library version as a short string in the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   857
 * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
90ce3da70b43 Initial load
duke
parents:
diff changeset
   858
 * used with your application, print out PNG_LIBPNG_VER_STRING, which
90ce3da70b43 Initial load
duke
parents:
diff changeset
   859
 * is defined in png.h.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   860
 * Note: now there is no difference between png_get_libpng_ver() and
90ce3da70b43 Initial load
duke
parents:
diff changeset
   861
 * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   862
 * it is guaranteed that png.c uses the correct version of png.h.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   863
 */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   864
png_const_charp PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   865
png_get_libpng_ver(png_const_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   866
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   867
   /* Version of *.c files used when building libpng */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   868
   return png_get_header_ver(png_ptr);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   869
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   870
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   871
png_const_charp PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   872
png_get_header_ver(png_const_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   873
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   874
   /* Version of *.h files used when building libpng */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   875
   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   876
   return PNG_LIBPNG_VER_STRING;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   877
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   878
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   879
png_const_charp PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   880
png_get_header_version(png_const_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   881
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   882
   /* Returns longer string containing both version and date */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   883
   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   884
#ifdef __STDC__
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   885
   return PNG_HEADER_VERSION_STRING
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   886
#  ifndef PNG_READ_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   887
      " (NO READ SUPPORT)"
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   888
#  endif
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   889
      PNG_STRING_NEWLINE;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   890
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   891
   return PNG_HEADER_VERSION_STRING;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   892
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   893
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   894
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   895
#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   896
/* NOTE: this routine is not used internally! */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   897
/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   898
 * large of png_color.  This lets grayscale images be treated as
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   899
 * paletted.  Most useful for gamma correction and simplification
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   900
 * of code.  This API is not used internally.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   901
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   902
void PNGAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   903
png_build_grayscale_palette(int bit_depth, png_colorp palette)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   904
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   905
   int num_palette;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   906
   int color_inc;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   907
   int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   908
   int v;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   909
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   910
   png_debug(1, "in png_do_build_grayscale_palette");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   911
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   912
   if (palette == NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   913
      return;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   914
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   915
   switch (bit_depth)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   916
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   917
      case 1:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   918
         num_palette = 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   919
         color_inc = 0xff;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   920
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   921
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   922
      case 2:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   923
         num_palette = 4;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   924
         color_inc = 0x55;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   925
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   926
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   927
      case 4:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   928
         num_palette = 16;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   929
         color_inc = 0x11;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   930
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   931
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   932
      case 8:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   933
         num_palette = 256;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   934
         color_inc = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   935
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   936
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   937
      default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   938
         num_palette = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   939
         color_inc = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   940
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   941
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   942
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   943
   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   944
   {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   945
      palette[i].red = (png_byte)(v & 0xff);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   946
      palette[i].green = (png_byte)(v & 0xff);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   947
      palette[i].blue = (png_byte)(v & 0xff);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   948
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   949
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   950
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   951
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   952
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   953
int PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   954
png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   955
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   956
   /* Check chunk_name and return "keep" value if it's on the list, else 0 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   957
   png_const_bytep p, p_end;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   958
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   959
   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   960
      return PNG_HANDLE_CHUNK_AS_DEFAULT;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   961
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   962
   p_end = png_ptr->chunk_list;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   963
   p = p_end + png_ptr->num_chunk_list*5; /* beyond end */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   964
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   965
   /* The code is the fifth byte after each four byte string.  Historically this
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   966
    * code was always searched from the end of the list, this is no longer
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
   967
    * necessary because the 'set' routine handles duplicate entries correctly.
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   968
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   969
   do /* num_chunk_list > 0, so at least one */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   970
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   971
      p -= 5;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   972
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   973
      if (memcmp(chunk_name, p, 4) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   974
         return p[4];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   975
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   976
   while (p > p_end);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   977
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   978
   /* This means that known chunks should be processed and unknown chunks should
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   979
    * be handled according to the value of png_ptr->unknown_default; this can be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   980
    * confusing because, as a result, there are two levels of defaulting for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   981
    * unknown chunks.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   982
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   983
   return PNG_HANDLE_CHUNK_AS_DEFAULT;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   984
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   985
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   986
#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   987
   defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   988
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   989
png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   990
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   991
   png_byte chunk_string[5];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   992
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   993
   PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   994
   return png_handle_as_unknown(png_ptr, chunk_string);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   995
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   996
#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   997
#endif /* SET_UNKNOWN_CHUNKS */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   998
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   999
#ifdef PNG_READ_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1000
/* This function, added to libpng-1.0.6g, is untested. */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1001
int PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1002
png_reset_zstream(png_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1003
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1004
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1005
      return Z_STREAM_ERROR;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1006
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1007
   /* WARNING: this resets the window bits to the maximum! */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1008
   return (inflateReset(&png_ptr->zstream));
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1009
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1010
#endif /* READ */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1011
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1012
/* This function was added to libpng-1.0.7 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1013
png_uint_32 PNGAPI
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1014
png_access_version_number(void)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1015
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1016
   /* Version of *.c files used when building libpng */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1017
   return((png_uint_32)PNG_LIBPNG_VER);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1018
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1019
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1020
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1021
/* Ensure that png_ptr->zstream.msg holds some appropriate error message string.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1022
 * If it doesn't 'ret' is used to set it to something appropriate, even in cases
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1023
 * like Z_OK or Z_STREAM_END where the error code is apparently a success code.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1024
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1025
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1026
png_zstream_error(png_structrp png_ptr, int ret)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1027
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1028
   /* Translate 'ret' into an appropriate error string, priority is given to the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1029
    * one in zstream if set.  This always returns a string, even in cases like
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1030
    * Z_OK or Z_STREAM_END where the error code is a success code.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1031
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1032
   if (png_ptr->zstream.msg == NULL) switch (ret)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1033
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1034
      default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1035
      case Z_OK:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1036
         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return code");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1037
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1038
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1039
      case Z_STREAM_END:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1040
         /* Normal exit */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1041
         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected end of LZ stream");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1042
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1043
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1044
      case Z_NEED_DICT:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1045
         /* This means the deflate stream did not have a dictionary; this
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1046
          * indicates a bogus PNG.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1047
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1048
         png_ptr->zstream.msg = PNGZ_MSG_CAST("missing LZ dictionary");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1049
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1050
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1051
      case Z_ERRNO:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1052
         /* gz APIs only: should not happen */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1053
         png_ptr->zstream.msg = PNGZ_MSG_CAST("zlib IO error");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1054
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1055
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1056
      case Z_STREAM_ERROR:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1057
         /* internal libpng error */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1058
         png_ptr->zstream.msg = PNGZ_MSG_CAST("bad parameters to zlib");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1059
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1060
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1061
      case Z_DATA_ERROR:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1062
         png_ptr->zstream.msg = PNGZ_MSG_CAST("damaged LZ stream");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1063
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1064
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1065
      case Z_MEM_ERROR:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1066
         png_ptr->zstream.msg = PNGZ_MSG_CAST("insufficient memory");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1067
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1068
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1069
      case Z_BUF_ERROR:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1070
         /* End of input or output; not a problem if the caller is doing
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1071
          * incremental read or write.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1072
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1073
         png_ptr->zstream.msg = PNGZ_MSG_CAST("truncated");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1074
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1075
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1076
      case Z_VERSION_ERROR:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1077
         png_ptr->zstream.msg = PNGZ_MSG_CAST("unsupported zlib version");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1078
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1079
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1080
      case PNG_UNEXPECTED_ZLIB_RETURN:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1081
         /* Compile errors here mean that zlib now uses the value co-opted in
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1082
          * pngpriv.h for PNG_UNEXPECTED_ZLIB_RETURN; update the switch above
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1083
          * and change pngpriv.h.  Note that this message is "... return",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1084
          * whereas the default/Z_OK one is "... return code".
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1085
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1086
         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1087
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1088
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1089
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1090
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1091
/* png_convert_size: a PNGAPI but no longer in png.h, so deleted
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1092
 * at libpng 1.5.5!
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1093
 */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1094
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1095
/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1096
#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1097
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1098
png_colorspace_check_gamma(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1099
    png_colorspacerp colorspace, png_fixed_point gAMA, int from)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1100
   /* This is called to check a new gamma value against an existing one.  The
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1101
    * routine returns false if the new gamma value should not be written.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1102
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1103
    * 'from' says where the new gamma value comes from:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1104
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1105
    *    0: the new gamma value is the libpng estimate for an ICC profile
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1106
    *    1: the new gamma value comes from a gAMA chunk
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1107
    *    2: the new gamma value comes from an sRGB chunk
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1108
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1109
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1110
   png_fixed_point gtest;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1111
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1112
   if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1113
       (png_muldiv(&gtest, colorspace->gamma, PNG_FP_1, gAMA) == 0  ||
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1114
      png_gamma_significant(gtest) != 0))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1115
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1116
      /* Either this is an sRGB image, in which case the calculated gamma
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1117
       * approximation should match, or this is an image with a profile and the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1118
       * value libpng calculates for the gamma of the profile does not match the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1119
       * value recorded in the file.  The former, sRGB, case is an error, the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1120
       * latter is just a warning.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1121
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1122
      if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1123
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1124
         png_chunk_report(png_ptr, "gamma value does not match sRGB",
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1125
             PNG_CHUNK_ERROR);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1126
         /* Do not overwrite an sRGB value */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1127
         return from == 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1128
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1129
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1130
      else /* sRGB tag not involved */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1131
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1132
         png_chunk_report(png_ptr, "gamma value does not match libpng estimate",
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1133
             PNG_CHUNK_WARNING);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1134
         return from == 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1135
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1136
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1137
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1138
   return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1139
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1140
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1141
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1142
png_colorspace_set_gamma(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1143
    png_colorspacerp colorspace, png_fixed_point gAMA)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1144
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1145
   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  1146
    * occur.  Since the fixed point representation is asymmetrical it is
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1147
    * possible for 1/gamma to overflow the limit of 21474 and this means the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1148
    * gamma value must be at least 5/100000 and hence at most 20000.0.  For
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1149
    * safety the limits here are a little narrower.  The values are 0.00016 to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1150
    * 6250.0, which are truly ridiculous gamma values (and will produce
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1151
    * displays that are all black or all white.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1152
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1153
    * In 1.6.0 this test replaces the ones in pngrutil.c, in the gAMA chunk
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1154
    * handling code, which only required the value to be >0.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1155
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1156
   png_const_charp errmsg;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1157
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1158
   if (gAMA < 16 || gAMA > 625000000)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1159
      errmsg = "gamma value out of range";
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1160
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1161
#  ifdef PNG_READ_gAMA_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1162
   /* Allow the application to set the gamma value more than once */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1163
   else if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1164
      (colorspace->flags & PNG_COLORSPACE_FROM_gAMA) != 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1165
      errmsg = "duplicate";
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1166
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1167
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1168
   /* Do nothing if the colorspace is already invalid */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1169
   else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1170
      return;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1171
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1172
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1173
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1174
      if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1175
          1/*from gAMA*/) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1176
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1177
         /* Store this gamma value. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1178
         colorspace->gamma = gAMA;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1179
         colorspace->flags |=
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1180
            (PNG_COLORSPACE_HAVE_GAMMA | PNG_COLORSPACE_FROM_gAMA);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1181
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1182
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1183
      /* At present if the check_gamma test fails the gamma of the colorspace is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1184
       * not updated however the colorspace is not invalidated.  This
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1185
       * corresponds to the case where the existing gamma comes from an sRGB
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1186
       * chunk or profile.  An error message has already been output.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1187
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1188
      return;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1189
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1190
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1191
   /* Error exit - errmsg has been set. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1192
   colorspace->flags |= PNG_COLORSPACE_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1193
   png_chunk_report(png_ptr, errmsg, PNG_CHUNK_WRITE_ERROR);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1194
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1195
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1196
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1197
png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1198
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1199
   if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1200
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1201
      /* Everything is invalid */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1202
      info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1203
         PNG_INFO_iCCP);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1204
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1205
#     ifdef PNG_COLORSPACE_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1206
      /* Clean up the iCCP profile now if it won't be used. */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1207
      png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, -1/*not used*/);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1208
#     else
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1209
      PNG_UNUSED(png_ptr)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1210
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1211
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1212
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1213
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1214
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1215
#     ifdef PNG_COLORSPACE_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1216
      /* Leave the INFO_iCCP flag set if the pngset.c code has already set
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1217
       * it; this allows a PNG to contain a profile which matches sRGB and
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1218
       * yet still have that profile retrievable by the application.
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1219
       */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1220
      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1221
         info_ptr->valid |= PNG_INFO_sRGB;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1222
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1223
      else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1224
         info_ptr->valid &= ~PNG_INFO_sRGB;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1225
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1226
      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1227
         info_ptr->valid |= PNG_INFO_cHRM;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1228
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1229
      else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1230
         info_ptr->valid &= ~PNG_INFO_cHRM;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1231
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1232
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1233
      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1234
         info_ptr->valid |= PNG_INFO_gAMA;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1235
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1236
      else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1237
         info_ptr->valid &= ~PNG_INFO_gAMA;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1238
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1239
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1240
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1241
#ifdef PNG_READ_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1242
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1243
png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1244
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1245
   if (info_ptr == NULL) /* reduce code size; check here not in the caller */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1246
      return;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1247
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1248
   info_ptr->colorspace = png_ptr->colorspace;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1249
   png_colorspace_sync_info(png_ptr, info_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1250
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1251
#endif
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1252
#endif /* GAMMA */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1253
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1254
#ifdef PNG_COLORSPACE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1255
/* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1256
 * cHRM, as opposed to using chromaticities.  These internal APIs return
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1257
 * non-zero on a parameter error.  The X, Y and Z values are required to be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1258
 * positive and less than 1.0.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1259
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1260
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1261
png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1262
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1263
   png_int_32 d, dwhite, whiteX, whiteY;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1264
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1265
   d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1266
   if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1267
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1268
   if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1269
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1270
   dwhite = d;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1271
   whiteX = XYZ->red_X;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1272
   whiteY = XYZ->red_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1273
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1274
   d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1275
   if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1276
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1277
   if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1278
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1279
   dwhite += d;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1280
   whiteX += XYZ->green_X;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1281
   whiteY += XYZ->green_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1282
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1283
   d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1284
   if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1285
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1286
   if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1287
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1288
   dwhite += d;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1289
   whiteX += XYZ->blue_X;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1290
   whiteY += XYZ->blue_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1291
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1292
   /* The reference white is simply the sum of the end-point (X,Y,Z) vectors,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1293
    * thus:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1294
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1295
   if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1296
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1297
   if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1298
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1299
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1300
   return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1301
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1302
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1303
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1304
png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1305
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1306
   png_fixed_point red_inverse, green_inverse, blue_scale;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1307
   png_fixed_point left, right, denominator;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1308
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1309
   /* Check xy and, implicitly, z.  Note that wide gamut color spaces typically
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1310
    * have end points with 0 tristimulus values (these are impossible end
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1311
    * points, but they are used to cover the possible colors).  We check
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1312
    * xy->whitey against 5, not 0, to avoid a possible integer overflow.
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1313
    */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1314
   if (xy->redx   < 0 || xy->redx > PNG_FP_1) return 1;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1315
   if (xy->redy   < 0 || xy->redy > PNG_FP_1-xy->redx) return 1;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1316
   if (xy->greenx < 0 || xy->greenx > PNG_FP_1) return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1317
   if (xy->greeny < 0 || xy->greeny > PNG_FP_1-xy->greenx) return 1;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1318
   if (xy->bluex  < 0 || xy->bluex > PNG_FP_1) return 1;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1319
   if (xy->bluey  < 0 || xy->bluey > PNG_FP_1-xy->bluex) return 1;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1320
   if (xy->whitex < 0 || xy->whitex > PNG_FP_1) return 1;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1321
   if (xy->whitey < 5 || xy->whitey > PNG_FP_1-xy->whitex) return 1;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1322
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1323
   /* The reverse calculation is more difficult because the original tristimulus
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1324
    * value had 9 independent values (red,green,blue)x(X,Y,Z) however only 8
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1325
    * derived values were recorded in the cHRM chunk;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1326
    * (red,green,blue,white)x(x,y).  This loses one degree of freedom and
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1327
    * therefore an arbitrary ninth value has to be introduced to undo the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1328
    * original transformations.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1329
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1330
    * Think of the original end-points as points in (X,Y,Z) space.  The
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1331
    * chromaticity values (c) have the property:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1332
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1333
    *           C
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1334
    *   c = ---------
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1335
    *       X + Y + Z
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1336
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1337
    * For each c (x,y,z) from the corresponding original C (X,Y,Z).  Thus the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1338
    * three chromaticity values (x,y,z) for each end-point obey the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1339
    * relationship:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1340
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1341
    *   x + y + z = 1
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1342
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1343
    * This describes the plane in (X,Y,Z) space that intersects each axis at the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1344
    * value 1.0; call this the chromaticity plane.  Thus the chromaticity
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1345
    * calculation has scaled each end-point so that it is on the x+y+z=1 plane
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1346
    * and chromaticity is the intersection of the vector from the origin to the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1347
    * (X,Y,Z) value with the chromaticity plane.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1348
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1349
    * To fully invert the chromaticity calculation we would need the three
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1350
    * end-point scale factors, (red-scale, green-scale, blue-scale), but these
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1351
    * were not recorded.  Instead we calculated the reference white (X,Y,Z) and
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1352
    * recorded the chromaticity of this.  The reference white (X,Y,Z) would have
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1353
    * given all three of the scale factors since:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1354
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1355
    *    color-C = color-c * color-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1356
    *    white-C = red-C + green-C + blue-C
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1357
    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1358
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1359
    * But cHRM records only white-x and white-y, so we have lost the white scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1360
    * factor:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1361
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1362
    *    white-C = white-c*white-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1363
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1364
    * To handle this the inverse transformation makes an arbitrary assumption
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1365
    * about white-scale:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1366
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1367
    *    Assume: white-Y = 1.0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1368
    *    Hence:  white-scale = 1/white-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1369
    *    Or:     red-Y + green-Y + blue-Y = 1.0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1370
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1371
    * Notice the last statement of the assumption gives an equation in three of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1372
    * the nine values we want to calculate.  8 more equations come from the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1373
    * above routine as summarised at the top above (the chromaticity
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1374
    * calculation):
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1375
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1376
    *    Given: color-x = color-X / (color-X + color-Y + color-Z)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1377
    *    Hence: (color-x - 1)*color-X + color.x*color-Y + color.x*color-Z = 0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1378
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1379
    * This is 9 simultaneous equations in the 9 variables "color-C" and can be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1380
    * solved by Cramer's rule.  Cramer's rule requires calculating 10 9x9 matrix
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1381
    * determinants, however this is not as bad as it seems because only 28 of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1382
    * the total of 90 terms in the various matrices are non-zero.  Nevertheless
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1383
    * Cramer's rule is notoriously numerically unstable because the determinant
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1384
    * calculation involves the difference of large, but similar, numbers.  It is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1385
    * difficult to be sure that the calculation is stable for real world values
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1386
    * and it is certain that it becomes unstable where the end points are close
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1387
    * together.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1388
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1389
    * So this code uses the perhaps slightly less optimal but more
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1390
    * understandable and totally obvious approach of calculating color-scale.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1391
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1392
    * This algorithm depends on the precision in white-scale and that is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1393
    * (1/white-y), so we can immediately see that as white-y approaches 0 the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1394
    * accuracy inherent in the cHRM chunk drops off substantially.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1395
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1396
    * libpng arithmetic: a simple inversion of the above equations
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1397
    * ------------------------------------------------------------
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1398
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1399
    *    white_scale = 1/white-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1400
    *    white-X = white-x * white-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1401
    *    white-Y = 1.0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1402
    *    white-Z = (1 - white-x - white-y) * white_scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1403
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1404
    *    white-C = red-C + green-C + blue-C
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1405
    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1406
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1407
    * This gives us three equations in (red-scale,green-scale,blue-scale) where
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1408
    * all the coefficients are now known:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1409
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1410
    *    red-x*red-scale + green-x*green-scale + blue-x*blue-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1411
    *       = white-x/white-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1412
    *    red-y*red-scale + green-y*green-scale + blue-y*blue-scale = 1
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1413
    *    red-z*red-scale + green-z*green-scale + blue-z*blue-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1414
    *       = (1 - white-x - white-y)/white-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1415
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1416
    * In the last equation color-z is (1 - color-x - color-y) so we can add all
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1417
    * three equations together to get an alternative third:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1418
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1419
    *    red-scale + green-scale + blue-scale = 1/white-y = white-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1420
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1421
    * So now we have a Cramer's rule solution where the determinants are just
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1422
    * 3x3 - far more tractible.  Unfortunately 3x3 determinants still involve
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1423
    * multiplication of three coefficients so we can't guarantee to avoid
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1424
    * overflow in the libpng fixed point representation.  Using Cramer's rule in
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1425
    * floating point is probably a good choice here, but it's not an option for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1426
    * fixed point.  Instead proceed to simplify the first two equations by
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1427
    * eliminating what is likely to be the largest value, blue-scale:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1428
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1429
    *    blue-scale = white-scale - red-scale - green-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1430
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1431
    * Hence:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1432
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1433
    *    (red-x - blue-x)*red-scale + (green-x - blue-x)*green-scale =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1434
    *                (white-x - blue-x)*white-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1435
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1436
    *    (red-y - blue-y)*red-scale + (green-y - blue-y)*green-scale =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1437
    *                1 - blue-y*white-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1438
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1439
    * And now we can trivially solve for (red-scale,green-scale):
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1440
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1441
    *    green-scale =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1442
    *                (white-x - blue-x)*white-scale - (red-x - blue-x)*red-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1443
    *                -----------------------------------------------------------
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1444
    *                                  green-x - blue-x
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1445
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1446
    *    red-scale =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1447
    *                1 - blue-y*white-scale - (green-y - blue-y) * green-scale
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1448
    *                ---------------------------------------------------------
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1449
    *                                  red-y - blue-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1450
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1451
    * Hence:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1452
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1453
    *    red-scale =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1454
    *          ( (green-x - blue-x) * (white-y - blue-y) -
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1455
    *            (green-y - blue-y) * (white-x - blue-x) ) / white-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1456
    * -------------------------------------------------------------------------
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1457
    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1458
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1459
    *    green-scale =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1460
    *          ( (red-y - blue-y) * (white-x - blue-x) -
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1461
    *            (red-x - blue-x) * (white-y - blue-y) ) / white-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1462
    * -------------------------------------------------------------------------
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1463
    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1464
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1465
    * Accuracy:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1466
    * The input values have 5 decimal digits of accuracy.  The values are all in
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1467
    * the range 0 < value < 1, so simple products are in the same range but may
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1468
    * need up to 10 decimal digits to preserve the original precision and avoid
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1469
    * underflow.  Because we are using a 32-bit signed representation we cannot
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1470
    * match this; the best is a little over 9 decimal digits, less than 10.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1471
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1472
    * The approach used here is to preserve the maximum precision within the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1473
    * signed representation.  Because the red-scale calculation above uses the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1474
    * difference between two products of values that must be in the range -1..+1
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1475
    * it is sufficient to divide the product by 7; ceil(100,000/32767*2).  The
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1476
    * factor is irrelevant in the calculation because it is applied to both
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1477
    * numerator and denominator.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1478
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1479
    * Note that the values of the differences of the products of the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1480
    * chromaticities in the above equations tend to be small, for example for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1481
    * the sRGB chromaticities they are:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1482
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1483
    * red numerator:    -0.04751
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1484
    * green numerator:  -0.08788
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1485
    * denominator:      -0.2241 (without white-y multiplication)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1486
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1487
    *  The resultant Y coefficients from the chromaticities of some widely used
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1488
    *  color space definitions are (to 15 decimal places):
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1489
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1490
    *  sRGB
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1491
    *    0.212639005871510 0.715168678767756 0.072192315360734
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1492
    *  Kodak ProPhoto
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1493
    *    0.288071128229293 0.711843217810102 0.000085653960605
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1494
    *  Adobe RGB
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1495
    *    0.297344975250536 0.627363566255466 0.075291458493998
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1496
    *  Adobe Wide Gamut RGB
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1497
    *    0.258728243040113 0.724682314948566 0.016589442011321
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1498
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1499
   /* By the argument, above overflow should be impossible here. The return
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1500
    * value of 2 indicates an internal error to the caller.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1501
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1502
   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1503
      return 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1504
   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1505
      return 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1506
   denominator = left - right;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1507
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1508
   /* Now find the red numerator. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1509
   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1510
      return 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1511
   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1512
      return 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1513
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1514
   /* Overflow is possible here and it indicates an extreme set of PNG cHRM
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1515
    * chunk values.  This calculation actually returns the reciprocal of the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1516
    * scale value because this allows us to delay the multiplication of white-y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1517
    * into the denominator, which tends to produce a small number.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1518
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1519
   if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1520
       red_inverse <= xy->whitey /* r+g+b scales = white scale */)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1521
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1522
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1523
   /* Similarly for green_inverse: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1524
   if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1525
      return 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1526
   if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1527
      return 2;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1528
   if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1529
       green_inverse <= xy->whitey)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1530
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1531
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1532
   /* And the blue scale, the checks above guarantee this can't overflow but it
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1533
    * can still produce 0 for extreme cHRM values.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1534
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1535
   blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1536
       png_reciprocal(green_inverse);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1537
   if (blue_scale <= 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1538
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1539
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1540
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1541
   /* And fill in the png_XYZ: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1542
   if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1543
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1544
   if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1545
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1546
   if (png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1547
       red_inverse) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1548
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1549
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1550
   if (png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1551
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1552
   if (png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1553
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1554
   if (png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1555
       green_inverse) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1556
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1557
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1558
   if (png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1559
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1560
   if (png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1561
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1562
   if (png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1563
       PNG_FP_1) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1564
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1565
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1566
   return 0; /*success*/
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1567
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1568
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1569
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1570
png_XYZ_normalize(png_XYZ *XYZ)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1571
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1572
   png_int_32 Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1573
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1574
   if (XYZ->red_Y < 0 || XYZ->green_Y < 0 || XYZ->blue_Y < 0 ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1575
      XYZ->red_X < 0 || XYZ->green_X < 0 || XYZ->blue_X < 0 ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1576
      XYZ->red_Z < 0 || XYZ->green_Z < 0 || XYZ->blue_Z < 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1577
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1578
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1579
   /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1580
    * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1581
    * relying on addition of two positive values producing a negative one is not
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1582
    * safe.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1583
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1584
   Y = XYZ->red_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1585
   if (0x7fffffff - Y < XYZ->green_X)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1586
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1587
   Y += XYZ->green_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1588
   if (0x7fffffff - Y < XYZ->blue_X)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1589
      return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1590
   Y += XYZ->blue_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1591
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1592
   if (Y != PNG_FP_1)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1593
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1594
      if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1595
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1596
      if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1597
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1598
      if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1599
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1600
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1601
      if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1602
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1603
      if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1604
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1605
      if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1606
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1607
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1608
      if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1609
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1610
      if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1611
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1612
      if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1613
         return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1614
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1615
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1616
   return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1617
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1618
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1619
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1620
png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1621
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1622
   /* Allow an error of +/-0.01 (absolute value) on each chromaticity */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1623
   if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1624
       PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1625
       PNG_OUT_OF_RANGE(xy1->redx,   xy2->redx,  delta) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1626
       PNG_OUT_OF_RANGE(xy1->redy,   xy2->redy,  delta) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1627
       PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1628
       PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1629
       PNG_OUT_OF_RANGE(xy1->bluex,  xy2->bluex, delta) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1630
       PNG_OUT_OF_RANGE(xy1->bluey,  xy2->bluey, delta))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1631
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1632
   return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1633
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1634
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1635
/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1636
 * chunk chromaticities.  Earlier checks used to simply look for the overflow
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1637
 * condition (where the determinant of the matrix to solve for XYZ ends up zero
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1638
 * because the chromaticity values are not all distinct.)  Despite this it is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1639
 * theoretically possible to produce chromaticities that are apparently valid
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1640
 * but that rapidly degrade to invalid, potentially crashing, sets because of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1641
 * arithmetic inaccuracies when calculations are performed on them.  The new
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1642
 * check is to round-trip xy -> XYZ -> xy and then check that the result is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1643
 * within a small percentage of the original.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1644
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1645
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1646
png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1647
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1648
   int result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1649
   png_xy xy_test;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1650
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1651
   /* As a side-effect this routine also returns the XYZ endpoints. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1652
   result = png_XYZ_from_xy(XYZ, xy);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1653
   if (result != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1654
      return result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1655
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1656
   result = png_xy_from_XYZ(&xy_test, XYZ);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1657
   if (result != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1658
      return result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1659
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1660
   if (png_colorspace_endpoints_match(xy, &xy_test,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1661
       5/*actually, the math is pretty accurate*/) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1662
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1663
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1664
   /* Too much slip */
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
/* This is the check going the other way.  The XYZ is modified to normalize it
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1669
 * (another side-effect) and the xy chromaticities are returned.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1670
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1671
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1672
png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1673
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1674
   int result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1675
   png_XYZ XYZtemp;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1676
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1677
   result = png_XYZ_normalize(XYZ);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1678
   if (result != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1679
      return result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1680
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1681
   result = png_xy_from_XYZ(xy, XYZ);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1682
   if (result != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1683
      return result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1684
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1685
   XYZtemp = *XYZ;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1686
   return png_colorspace_check_xy(&XYZtemp, xy);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1687
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1688
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1689
/* Used to check for an endpoint match against sRGB */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1690
static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1691
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1692
   /* color      x       y */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1693
   /* red   */ 64000, 33000,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1694
   /* green */ 30000, 60000,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1695
   /* blue  */ 15000,  6000,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1696
   /* white */ 31270, 32900
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1697
};
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1698
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1699
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1700
png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1701
    png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1702
    int preferred)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1703
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1704
   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1705
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1706
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1707
   /* The consistency check is performed on the chromaticities; this factors out
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1708
    * variations because of the normalization (or not) of the end point Y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1709
    * values.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1710
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1711
   if (preferred < 2 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1712
       (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1713
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1714
      /* The end points must be reasonably close to any we already have.  The
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1715
       * following allows an error of up to +/-.001
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1716
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1717
      if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1718
          100) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1719
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1720
         colorspace->flags |= PNG_COLORSPACE_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1721
         png_benign_error(png_ptr, "inconsistent chromaticities");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1722
         return 0; /* failed */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1723
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1724
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1725
      /* Only overwrite with preferred values */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1726
      if (preferred == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1727
         return 1; /* ok, but no change */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1728
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1729
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1730
   colorspace->end_points_xy = *xy;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1731
   colorspace->end_points_XYZ = *XYZ;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1732
   colorspace->flags |= PNG_COLORSPACE_HAVE_ENDPOINTS;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1733
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1734
   /* The end points are normally quoted to two decimal digits, so allow +/-0.01
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1735
    * on this test.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1736
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1737
   if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1738
      colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1739
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1740
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1741
      colorspace->flags &= PNG_COLORSPACE_CANCEL(
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1742
         PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1743
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1744
   return 2; /* ok and changed */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1745
}
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1746
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1747
int /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1748
png_colorspace_set_chromaticities(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1749
    png_colorspacerp colorspace, const png_xy *xy, int preferred)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1750
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1751
   /* We must check the end points to ensure they are reasonable - in the past
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1752
    * color management systems have crashed as a result of getting bogus
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1753
    * colorant values, while this isn't the fault of libpng it is the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1754
    * responsibility of libpng because PNG carries the bomb and libpng is in a
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1755
    * position to protect against it.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1756
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1757
   png_XYZ XYZ;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1758
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1759
   switch (png_colorspace_check_xy(&XYZ, xy))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1760
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1761
      case 0: /* success */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1762
         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1763
             preferred);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1764
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1765
      case 1:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1766
         /* We can't invert the chromaticities so we can't produce value XYZ
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1767
          * values.  Likely as not a color management system will fail too.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1768
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1769
         colorspace->flags |= PNG_COLORSPACE_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1770
         png_benign_error(png_ptr, "invalid chromaticities");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1771
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1772
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1773
      default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1774
         /* libpng is broken; this should be a warning but if it happens we
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1775
          * want error reports so for the moment it is an error.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1776
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1777
         colorspace->flags |= PNG_COLORSPACE_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1778
         png_error(png_ptr, "internal error checking chromaticities");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1779
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1780
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1781
   return 0; /* failed */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1782
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1783
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1784
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1785
png_colorspace_set_endpoints(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1786
    png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1787
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1788
   png_XYZ XYZ = *XYZ_in;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1789
   png_xy xy;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1790
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1791
   switch (png_colorspace_check_XYZ(&xy, &XYZ))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1792
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1793
      case 0:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1794
         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1795
             preferred);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1796
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1797
      case 1:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1798
         /* End points are invalid. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1799
         colorspace->flags |= PNG_COLORSPACE_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1800
         png_benign_error(png_ptr, "invalid end points");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1801
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1802
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1803
      default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1804
         colorspace->flags |= PNG_COLORSPACE_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1805
         png_error(png_ptr, "internal error checking chromaticities");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1806
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1807
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1808
   return 0; /* failed */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1809
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1810
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1811
#if defined(PNG_sRGB_SUPPORTED) || defined(PNG_iCCP_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1812
/* Error message generation */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1813
static char
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1814
png_icc_tag_char(png_uint_32 byte)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1815
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1816
   byte &= 0xff;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1817
   if (byte >= 32 && byte <= 126)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1818
      return (char)byte;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1819
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1820
      return '?';
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1821
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1822
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1823
static void
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1824
png_icc_tag_name(char *name, png_uint_32 tag)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1825
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1826
   name[0] = '\'';
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1827
   name[1] = png_icc_tag_char(tag >> 24);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1828
   name[2] = png_icc_tag_char(tag >> 16);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1829
   name[3] = png_icc_tag_char(tag >>  8);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1830
   name[4] = png_icc_tag_char(tag      );
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1831
   name[5] = '\'';
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1832
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1833
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1834
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1835
is_ICC_signature_char(png_alloc_size_t it)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1836
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1837
   return it == 32 || (it >= 48 && it <= 57) || (it >= 65 && it <= 90) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1838
      (it >= 97 && it <= 122);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1839
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1840
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1841
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1842
is_ICC_signature(png_alloc_size_t it)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1843
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1844
   return is_ICC_signature_char(it >> 24) /* checks all the top bits */ &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1845
      is_ICC_signature_char((it >> 16) & 0xff) &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1846
      is_ICC_signature_char((it >> 8) & 0xff) &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1847
      is_ICC_signature_char(it & 0xff);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1848
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1849
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1850
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1851
png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1852
    png_const_charp name, png_alloc_size_t value, png_const_charp reason)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1853
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1854
   size_t pos;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1855
   char message[196]; /* see below for calculation */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1856
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1857
   if (colorspace != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1858
      colorspace->flags |= PNG_COLORSPACE_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1859
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1860
   pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1861
   pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1862
   pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1863
   if (is_ICC_signature(value) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1864
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1865
      /* So 'value' is at most 4 bytes and the following cast is safe */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1866
      png_icc_tag_name(message+pos, (png_uint_32)value);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1867
      pos += 6; /* total +8; less than the else clause */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1868
      message[pos++] = ':';
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1869
      message[pos++] = ' ';
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1870
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1871
#  ifdef PNG_WARNINGS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1872
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1873
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1874
         char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1875
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1876
         pos = png_safecat(message, (sizeof message), pos,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1877
             png_format_number(number, number+(sizeof number),
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1878
             PNG_NUMBER_FORMAT_x, value));
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1879
         pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1880
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1881
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1882
   /* The 'reason' is an arbitrary message, allow +79 maximum 195 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1883
   pos = png_safecat(message, (sizeof message), pos, reason);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1884
   PNG_UNUSED(pos)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1885
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1886
   /* This is recoverable, but make it unconditionally an app_error on write to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1887
    * avoid writing invalid ICC profiles into PNG files (i.e., we handle them
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1888
    * on read, with a warning, but on write unless the app turns off
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1889
    * application errors the PNG won't be written.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1890
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1891
   png_chunk_report(png_ptr, message,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1892
       (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1893
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1894
   return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1895
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1896
#endif /* sRGB || iCCP */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1897
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1898
#ifdef PNG_sRGB_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1899
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1900
png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1901
    int intent)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1902
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1903
   /* sRGB sets known gamma, end points and (from the chunk) intent. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1904
   /* IMPORTANT: these are not necessarily the values found in an ICC profile
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1905
    * because ICC profiles store values adapted to a D50 environment; it is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1906
    * expected that the ICC profile mediaWhitePointTag will be D50; see the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1907
    * checks and code elsewhere to understand this better.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1908
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1909
    * These XYZ values, which are accurate to 5dp, produce rgb to gray
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1910
    * coefficients of (6968,23435,2366), which are reduced (because they add up
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1911
    * to 32769 not 32768) to (6968,23434,2366).  These are the values that
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1912
    * libpng has traditionally used (and are the best values given the 15bit
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1913
    * algorithm used by the rgb to gray code.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1914
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1915
   static const png_XYZ sRGB_XYZ = /* D65 XYZ (*not* the D50 adapted values!) */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1916
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1917
      /* color      X      Y      Z */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1918
      /* red   */ 41239, 21264,  1933,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1919
      /* green */ 35758, 71517, 11919,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1920
      /* blue  */ 18048,  7219, 95053
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1921
   };
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1922
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1923
   /* Do nothing if the colorspace is already invalidated. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1924
   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1925
      return 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1926
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1927
   /* Check the intent, then check for existing settings.  It is valid for the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1928
    * PNG file to have cHRM or gAMA chunks along with sRGB, but the values must
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1929
    * be consistent with the correct values.  If, however, this function is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1930
    * called below because an iCCP chunk matches sRGB then it is quite
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1931
    * conceivable that an older app recorded incorrect gAMA and cHRM because of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1932
    * an incorrect calculation based on the values in the profile - this does
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1933
    * *not* invalidate the profile (though it still produces an error, which can
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1934
    * be ignored.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1935
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1936
   if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1937
      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  1938
          (png_alloc_size_t)intent, "invalid sRGB rendering intent");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1939
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1940
   if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1941
       colorspace->rendering_intent != intent)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1942
      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  1943
         (png_alloc_size_t)intent, "inconsistent rendering intents");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1944
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1945
   if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1946
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1947
      png_benign_error(png_ptr, "duplicate sRGB information ignored");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1948
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1949
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1950
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1951
   /* If the standard sRGB cHRM chunk does not match the one from the PNG file
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1952
    * warn but overwrite the value with the correct one.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1953
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1954
   if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1955
       !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1956
       100))
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1957
      png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1958
         PNG_CHUNK_ERROR);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1959
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1960
   /* This check is just done for the error reporting - the routine always
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1961
    * returns true when the 'from' argument corresponds to sRGB (2).
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1962
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1963
   (void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1964
       2/*from sRGB*/);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1965
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1966
   /* intent: bugs in GCC force 'int' to be used as the parameter type. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1967
   colorspace->rendering_intent = (png_uint_16)intent;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1968
   colorspace->flags |= PNG_COLORSPACE_HAVE_INTENT;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1969
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1970
   /* endpoints */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1971
   colorspace->end_points_xy = sRGB_xy;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1972
   colorspace->end_points_XYZ = sRGB_XYZ;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1973
   colorspace->flags |=
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1974
      (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1975
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1976
   /* gamma */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1977
   colorspace->gamma = PNG_GAMMA_sRGB_INVERSE;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1978
   colorspace->flags |= PNG_COLORSPACE_HAVE_GAMMA;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1979
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1980
   /* Finally record that we have an sRGB profile */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1981
   colorspace->flags |=
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1982
      (PNG_COLORSPACE_MATCHES_sRGB|PNG_COLORSPACE_FROM_sRGB);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1983
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1984
   return 1; /* set */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1985
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1986
#endif /* sRGB */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1987
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1988
#ifdef PNG_iCCP_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1989
/* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1990
 * is XYZ(0.9642,1.0,0.8249), which scales to:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1991
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1992
 *    (63189.8112, 65536, 54060.6464)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1993
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1994
static const png_byte D50_nCIEXYZ[12] =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1995
   { 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1996
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1997
static int /* bool */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1998
icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1999
    png_const_charp name, png_uint_32 profile_length)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2000
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2001
   if (profile_length < 132)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2002
      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2003
          "too short");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2004
   return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2005
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2006
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2007
#ifdef PNG_READ_iCCP_SUPPORTED
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2008
int /* PRIVATE */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2009
png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2010
    png_const_charp name, png_uint_32 profile_length)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2011
{
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2012
   if (!icc_check_length(png_ptr, colorspace, name, profile_length))
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2013
      return 0;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2014
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2015
   /* This needs to be here because the 'normal' check is in
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2016
    * png_decompress_chunk, yet this happens after the attempt to
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2017
    * png_malloc_base the required data.  We only need this on read; on write
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2018
    * the caller supplies the profile buffer so libpng doesn't allocate it.  See
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2019
    * the call to icc_check_length below (the write case).
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2020
    */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2021
#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2022
      else if (png_ptr->user_chunk_malloc_max > 0 &&
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2023
               png_ptr->user_chunk_malloc_max < profile_length)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2024
         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2025
             "exceeds application limits");
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2026
#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2027
      else if (PNG_USER_CHUNK_MALLOC_MAX < profile_length)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2028
         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2029
             "exceeds libpng limits");
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2030
#  else /* !SET_USER_LIMITS */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2031
      /* This will get compiled out on all 32-bit and better systems. */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2032
      else if (PNG_SIZE_MAX < profile_length)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2033
         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2034
             "exceeds system limits");
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2035
#  endif /* !SET_USER_LIMITS */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2036
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2037
   return 1;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2038
}
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2039
#endif /* READ_iCCP */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2040
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2041
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2042
png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2043
    png_const_charp name, png_uint_32 profile_length,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2044
    png_const_bytep profile/* first 132 bytes only */, int color_type)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2045
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2046
   png_uint_32 temp;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2047
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2048
   /* Length check; this cannot be ignored in this code because profile_length
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2049
    * is used later to check the tag table, so even if the profile seems over
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2050
    * long profile_length from the caller must be correct.  The caller can fix
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2051
    * this up on read or write by just passing in the profile header length.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2052
    */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2053
   temp = png_get_uint_32(profile);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2054
   if (temp != profile_length)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2055
      return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2056
          "length does not match profile");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2057
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2058
   temp = (png_uint_32) (*(profile+8));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2059
   if (temp > 3 && (profile_length & 3))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2060
      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2061
          "invalid length");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2062
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2063
   temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2064
   if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2065
      profile_length < 132+12*temp) /* truncated tag table */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2066
      return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2067
          "tag count too large");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2068
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2069
   /* The 'intent' must be valid or we can't store it, ICC limits the intent to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2070
    * 16 bits.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2071
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2072
   temp = png_get_uint_32(profile+64);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2073
   if (temp >= 0xffff) /* The ICC limit */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2074
      return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2075
          "invalid rendering intent");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2076
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2077
   /* This is just a warning because the profile may be valid in future
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2078
    * versions.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2079
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2080
   if (temp >= PNG_sRGB_INTENT_LAST)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2081
      (void)png_icc_profile_error(png_ptr, NULL, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2082
          "intent outside defined range");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2083
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2084
   /* At this point the tag table can't be checked because it hasn't necessarily
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2085
    * been loaded; however, various header fields can be checked.  These checks
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2086
    * are for values permitted by the PNG spec in an ICC profile; the PNG spec
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2087
    * restricts the profiles that can be passed in an iCCP chunk (they must be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2088
    * appropriate to processing PNG data!)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2089
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2090
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2091
   /* Data checks (could be skipped).  These checks must be independent of the
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  2092
    * version number; however, the version number doesn't accommodate changes in
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2093
    * the header fields (just the known tags and the interpretation of the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2094
    * data.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2095
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2096
   temp = png_get_uint_32(profile+36); /* signature 'ascp' */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2097
   if (temp != 0x61637370)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2098
      return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2099
          "invalid signature");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2100
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2101
   /* Currently the PCS illuminant/adopted white point (the computational
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2102
    * white point) are required to be D50,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2103
    * however the profile contains a record of the illuminant so perhaps ICC
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2104
    * expects to be able to change this in the future (despite the rationale in
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2105
    * the introduction for using a fixed PCS adopted white.)  Consequently the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2106
    * following is just a warning.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2107
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2108
   if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2109
      (void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2110
          "PCS illuminant is not D50");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2111
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2112
   /* The PNG spec requires this:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2113
    * "If the iCCP chunk is present, the image samples conform to the colour
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2114
    * space represented by the embedded ICC profile as defined by the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2115
    * International Color Consortium [ICC]. The colour space of the ICC profile
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2116
    * shall be an RGB colour space for colour images (PNG colour types 2, 3, and
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2117
    * 6), or a greyscale colour space for greyscale images (PNG colour types 0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2118
    * and 4)."
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2119
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2120
    * This checking code ensures the embedded profile (on either read or write)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2121
    * conforms to the specification requirements.  Notice that an ICC 'gray'
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2122
    * color-space profile contains the information to transform the monochrome
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2123
    * data to XYZ or L*a*b (according to which PCS the profile uses) and this
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2124
    * should be used in preference to the standard libpng K channel replication
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2125
    * into R, G and B channels.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2126
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2127
    * Previously it was suggested that an RGB profile on grayscale data could be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2128
    * handled.  However it it is clear that using an RGB profile in this context
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2129
    * must be an error - there is no specification of what it means.  Thus it is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2130
    * almost certainly more correct to ignore the profile.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2131
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2132
   temp = png_get_uint_32(profile+16); /* data colour space field */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2133
   switch (temp)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2134
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2135
      case 0x52474220: /* 'RGB ' */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2136
         if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2137
            return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2138
                "RGB color space not permitted on grayscale PNG");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2139
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2140
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2141
      case 0x47524159: /* 'GRAY' */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2142
         if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2143
            return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2144
                "Gray color space not permitted on RGB PNG");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2145
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2146
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2147
      default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2148
         return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2149
             "invalid ICC profile color space");
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2150
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2151
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2152
   /* It is up to the application to check that the profile class matches the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2153
    * application requirements; the spec provides no guidance, but it's pretty
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2154
    * weird if the profile is not scanner ('scnr'), monitor ('mntr'), printer
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2155
    * ('prtr') or 'spac' (for generic color spaces).  Issue a warning in these
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2156
    * cases.  Issue an error for device link or abstract profiles - these don't
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2157
    * contain the records necessary to transform the color-space to anything
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2158
    * other than the target device (and not even that for an abstract profile).
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2159
    * Profiles of these classes may not be embedded in images.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2160
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2161
   temp = png_get_uint_32(profile+12); /* profile/device class */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2162
   switch (temp)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2163
   {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2164
      case 0x73636e72: /* 'scnr' */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2165
      case 0x6d6e7472: /* 'mntr' */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2166
      case 0x70727472: /* 'prtr' */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2167
      case 0x73706163: /* 'spac' */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2168
         /* All supported */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2169
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2170
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2171
      case 0x61627374: /* 'abst' */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2172
         /* May not be embedded in an image */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2173
         return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2174
             "invalid embedded Abstract ICC profile");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2175
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2176
      case 0x6c696e6b: /* 'link' */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2177
         /* DeviceLink profiles cannot be interpreted in a non-device specific
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2178
          * fashion, if an app uses the AToB0Tag in the profile the results are
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2179
          * undefined unless the result is sent to the intended device,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2180
          * therefore a DeviceLink profile should not be found embedded in a
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2181
          * PNG.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2182
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2183
         return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2184
             "unexpected DeviceLink ICC profile class");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2185
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2186
      case 0x6e6d636c: /* 'nmcl' */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2187
         /* A NamedColor profile is also device specific, however it doesn't
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2188
          * contain an AToB0 tag that is open to misinterpretation.  Almost
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2189
          * certainly it will fail the tests below.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2190
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2191
         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2192
             "unexpected NamedColor ICC profile class");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2193
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2194
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2195
      default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2196
         /* To allow for future enhancements to the profile accept unrecognized
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2197
          * profile classes with a warning, these then hit the test below on the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2198
          * tag content to ensure they are backward compatible with one of the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2199
          * understood profiles.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2200
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2201
         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2202
             "unrecognized ICC profile class");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2203
         break;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2204
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2205
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2206
   /* For any profile other than a device link one the PCS must be encoded
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2207
    * either in XYZ or Lab.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2208
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2209
   temp = png_get_uint_32(profile+20);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2210
   switch (temp)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2211
   {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2212
      case 0x58595a20: /* 'XYZ ' */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2213
      case 0x4c616220: /* 'Lab ' */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2214
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2215
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2216
      default:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2217
         return png_icc_profile_error(png_ptr, colorspace, name, temp,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2218
             "unexpected ICC PCS encoding");
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2219
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2220
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2221
   return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2222
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2223
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2224
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2225
png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2226
    png_const_charp name, png_uint_32 profile_length,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2227
    png_const_bytep profile /* header plus whole tag table */)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2228
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2229
   png_uint_32 tag_count = png_get_uint_32(profile+128);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2230
   png_uint_32 itag;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2231
   png_const_bytep tag = profile+132; /* The first tag */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2232
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2233
   /* First scan all the tags in the table and add bits to the icc_info value
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2234
    * (temporarily in 'tags').
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2235
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2236
   for (itag=0; itag < tag_count; ++itag, tag += 12)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2237
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2238
      png_uint_32 tag_id = png_get_uint_32(tag+0);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2239
      png_uint_32 tag_start = png_get_uint_32(tag+4); /* must be aligned */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2240
      png_uint_32 tag_length = png_get_uint_32(tag+8);/* not padded */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2241
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2242
      /* The ICC specification does not exclude zero length tags, therefore the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2243
       * start might actually be anywhere if there is no data, but this would be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2244
       * a clear abuse of the intent of the standard so the start is checked for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2245
       * being in range.  All defined tag types have an 8 byte header - a 4 byte
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2246
       * type signature then 0.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2247
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2248
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2249
      /* This is a hard error; potentially it can cause read outside the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2250
       * profile.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2251
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2252
      if (tag_start > profile_length || tag_length > profile_length - tag_start)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2253
         return png_icc_profile_error(png_ptr, colorspace, name, tag_id,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2254
             "ICC profile tag outside profile");
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2255
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2256
      if ((tag_start & 3) != 0)
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2257
      {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2258
         /* CNHP730S.icc shipped with Microsoft Windows 64 violates this; it is
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2259
          * only a warning here because libpng does not care about the
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2260
          * alignment.
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2261
          */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2262
         (void)png_icc_profile_error(png_ptr, NULL, name, tag_id,
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2263
             "ICC profile tag start not a multiple of 4");
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2264
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2265
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2266
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2267
   return 1; /* success, maybe with warnings */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2268
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2269
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2270
#ifdef PNG_sRGB_SUPPORTED
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2271
#if PNG_sRGB_PROFILE_CHECKS >= 0
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2272
/* Information about the known ICC sRGB profiles */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2273
static const struct
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2274
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2275
   png_uint_32 adler, crc, length;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2276
   png_uint_32 md5[4];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2277
   png_byte    have_md5;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2278
   png_byte    is_broken;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2279
   png_uint_16 intent;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2280
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2281
#  define PNG_MD5(a,b,c,d) { a, b, c, d }, (a!=0)||(b!=0)||(c!=0)||(d!=0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2282
#  define PNG_ICC_CHECKSUM(adler, crc, md5, intent, broke, date, length, fname)\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2283
      { adler, crc, length, md5, broke, intent },
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2284
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2285
} png_sRGB_checks[] =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2286
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2287
   /* This data comes from contrib/tools/checksum-icc run on downloads of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2288
    * all four ICC sRGB profiles from www.color.org.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2289
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2290
   /* adler32, crc32, MD5[4], intent, date, length, file-name */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2291
   PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2292
       PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2293
       "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2294
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2295
   /* ICC sRGB v2 perceptual no black-compensation: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2296
   PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2297
       PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2298
       "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2299
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2300
   PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2301
       PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2302
       "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2303
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2304
   /* ICC sRGB v4 perceptual */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2305
   PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2306
       PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2307
       "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2308
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2309
   /* The following profiles have no known MD5 checksum. If there is a match
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2310
    * on the (empty) MD5 the other fields are used to attempt a match and
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2311
    * a warning is produced.  The first two of these profiles have a 'cprt' tag
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2312
    * which suggests that they were also made by Hewlett Packard.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2313
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2314
   PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2315
       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2316
       "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2317
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2318
   /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2319
    * match the D50 PCS illuminant in the header (it is in fact the D65 values,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2320
    * so the white point is recorded as the un-adapted value.)  The profiles
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2321
    * below only differ in one byte - the intent - and are basically the same as
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2322
    * the previous profile except for the mediaWhitePointTag error and a missing
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2323
    * chromaticAdaptationTag.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2324
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2325
   PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2326
       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2327
       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2328
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2329
   PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2330
       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2331
       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2332
};
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2333
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2334
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2335
png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2336
    png_const_bytep profile, uLong adler)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2337
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2338
   /* The quick check is to verify just the MD5 signature and trust the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2339
    * rest of the data.  Because the profile has already been verified for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2340
    * correctness this is safe.  png_colorspace_set_sRGB will check the 'intent'
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2341
    * field too, so if the profile has been edited with an intent not defined
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2342
    * by sRGB (but maybe defined by a later ICC specification) the read of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2343
    * the profile will fail at that point.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2344
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2345
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2346
   png_uint_32 length = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2347
   png_uint_32 intent = 0x10000; /* invalid */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2348
#if PNG_sRGB_PROFILE_CHECKS > 1
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2349
   uLong crc = 0; /* the value for 0 length data */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2350
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2351
   unsigned int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2352
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2353
#ifdef PNG_SET_OPTION_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2354
   /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2355
   if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) ==
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2356
               PNG_OPTION_ON)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2357
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2358
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2359
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2360
   for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2361
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2362
      if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2363
         png_get_uint_32(profile+88) == png_sRGB_checks[i].md5[1] &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2364
         png_get_uint_32(profile+92) == png_sRGB_checks[i].md5[2] &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2365
         png_get_uint_32(profile+96) == png_sRGB_checks[i].md5[3])
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2366
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2367
         /* This may be one of the old HP profiles without an MD5, in that
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2368
          * case we can only use the length and Adler32 (note that these
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2369
          * are not used by default if there is an MD5!)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2370
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2371
#        if PNG_sRGB_PROFILE_CHECKS == 0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2372
            if (png_sRGB_checks[i].have_md5 != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2373
               return 1+png_sRGB_checks[i].is_broken;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2374
#        endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2375
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2376
         /* Profile is unsigned or more checks have been configured in. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2377
         if (length == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2378
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2379
            length = png_get_uint_32(profile);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2380
            intent = png_get_uint_32(profile+64);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2381
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2382
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2383
         /* Length *and* intent must match */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2384
         if (length == (png_uint_32) png_sRGB_checks[i].length &&
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2385
            intent == (png_uint_32) png_sRGB_checks[i].intent)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2386
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2387
            /* Now calculate the adler32 if not done already. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2388
            if (adler == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2389
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2390
               adler = adler32(0, NULL, 0);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2391
               adler = adler32(adler, profile, length);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2392
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2393
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2394
            if (adler == png_sRGB_checks[i].adler)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2395
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2396
               /* These basic checks suggest that the data has not been
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2397
                * modified, but if the check level is more than 1 perform
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2398
                * our own crc32 checksum on the data.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2399
                */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2400
#              if PNG_sRGB_PROFILE_CHECKS > 1
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2401
                  if (crc == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2402
                  {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2403
                     crc = crc32(0, NULL, 0);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2404
                     crc = crc32(crc, profile, length);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2405
                  }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2406
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2407
                  /* So this check must pass for the 'return' below to happen.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2408
                   */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2409
                  if (crc == png_sRGB_checks[i].crc)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2410
#              endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2411
               {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2412
                  if (png_sRGB_checks[i].is_broken != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2413
                  {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2414
                     /* These profiles are known to have bad data that may cause
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2415
                      * problems if they are used, therefore attempt to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2416
                      * discourage their use, skip the 'have_md5' warning below,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2417
                      * which is made irrelevant by this error.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2418
                      */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2419
                     png_chunk_report(png_ptr, "known incorrect sRGB profile",
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2420
                         PNG_CHUNK_ERROR);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2421
                  }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2422
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2423
                  /* Warn that this being done; this isn't even an error since
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2424
                   * the profile is perfectly valid, but it would be nice if
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2425
                   * people used the up-to-date ones.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2426
                   */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2427
                  else if (png_sRGB_checks[i].have_md5 == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2428
                  {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2429
                     png_chunk_report(png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2430
                         "out-of-date sRGB profile with no signature",
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2431
                         PNG_CHUNK_WARNING);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2432
                  }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2433
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2434
                  return 1+png_sRGB_checks[i].is_broken;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2435
               }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2436
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2437
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2438
# if PNG_sRGB_PROFILE_CHECKS > 0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2439
         /* The signature matched, but the profile had been changed in some
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2440
          * way.  This probably indicates a data error or uninformed hacking.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2441
          * Fall through to "no match".
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2442
          */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2443
         png_chunk_report(png_ptr,
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2444
             "Not recognizing known sRGB profile that has been edited",
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2445
             PNG_CHUNK_WARNING);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2446
         break;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2447
# endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2448
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2449
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2450
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2451
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2452
   return 0; /* no match */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2453
}
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2454
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2455
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2456
png_icc_set_sRGB(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2457
    png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2458
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2459
   /* Is this profile one of the known ICC sRGB profiles?  If it is, just set
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2460
    * the sRGB information.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2461
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2462
   if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2463
      (void)png_colorspace_set_sRGB(png_ptr, colorspace,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2464
         (int)/*already checked*/png_get_uint_32(profile+64));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2465
}
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2466
#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2467
#endif /* sRGB */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2468
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2469
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2470
png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2471
    png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2472
    int color_type)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2473
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2474
   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2475
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2476
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2477
   if (icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2478
       png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2479
           color_type) != 0 &&
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2480
       png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2481
           profile) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2482
   {
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2483
#     if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2484
         /* If no sRGB support, don't try storing sRGB information */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2485
         png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2486
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2487
      return 1;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2488
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2489
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2490
   /* Failure case */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2491
   return 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2492
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2493
#endif /* iCCP */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2494
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2495
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2496
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2497
png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2498
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2499
   /* Set the rgb_to_gray coefficients from the colorspace. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2500
   if (png_ptr->rgb_to_gray_coefficients_set == 0 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2501
      (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2502
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2503
      /* png_set_background has not been called, get the coefficients from the Y
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2504
       * values of the colorspace colorants.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2505
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2506
      png_fixed_point r = png_ptr->colorspace.end_points_XYZ.red_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2507
      png_fixed_point g = png_ptr->colorspace.end_points_XYZ.green_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2508
      png_fixed_point b = png_ptr->colorspace.end_points_XYZ.blue_Y;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2509
      png_fixed_point total = r+g+b;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2510
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2511
      if (total > 0 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2512
         r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2513
         g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2514
         b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2515
         r+g+b <= 32769)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2516
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2517
         /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2518
          * all of the coefficients were rounded up.  Handle this by
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2519
          * reducing the *largest* coefficient by 1; this matches the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2520
          * approach used for the default coefficients in pngrtran.c
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2521
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2522
         int add = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2523
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2524
         if (r+g+b > 32768)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2525
            add = -1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2526
         else if (r+g+b < 32768)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2527
            add = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2528
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2529
         if (add != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2530
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2531
            if (g >= r && g >= b)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2532
               g += add;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2533
            else if (r >= g && r >= b)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2534
               r += add;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2535
            else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2536
               b += add;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2537
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2538
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2539
         /* Check for an internal error. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2540
         if (r+g+b != 32768)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2541
            png_error(png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2542
                "internal error handling cHRM coefficients");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2543
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2544
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2545
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2546
            png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2547
            png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2548
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2549
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2550
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2551
      /* This is a png_error at present even though it could be ignored -
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2552
       * it should never happen, but it is important that if it does, the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2553
       * bug is fixed.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2554
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2555
      else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2556
         png_error(png_ptr, "internal error handling cHRM->XYZ");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2557
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2558
}
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2559
#endif /* READ_RGB_TO_GRAY */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2560
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2561
#endif /* COLORSPACE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2562
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2563
#ifdef __GNUC__
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2564
/* This exists solely to work round a warning from GNU C. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2565
static int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2566
png_gt(size_t a, size_t b)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2567
{
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2568
   return a > b;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2569
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2570
#else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2571
#   define png_gt(a,b) ((a) > (b))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2572
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2573
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2574
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2575
png_check_IHDR(png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2576
    png_uint_32 width, png_uint_32 height, int bit_depth,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2577
    int color_type, int interlace_type, int compression_type,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2578
    int filter_type)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2579
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2580
   int error = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2581
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2582
   /* Check for width and height valid values */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2583
   if (width == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2584
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2585
      png_warning(png_ptr, "Image width is zero in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2586
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2587
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2588
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2589
   if (width > PNG_UINT_31_MAX)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2590
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2591
      png_warning(png_ptr, "Invalid image width in IHDR");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2592
      error = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2593
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2594
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2595
   if (png_gt(((width + 7) & (~7U)),
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2596
       ((PNG_SIZE_MAX
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2597
           - 48        /* big_row_buf hack */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2598
           - 1)        /* filter byte */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2599
           / 8)        /* 8-byte RGBA pixels */
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2600
           - 1))       /* extra max_pixel_depth pad */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2601
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2602
      /* The size of the row must be within the limits of this architecture.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2603
       * Because the read code can perform arbitrary transformations the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2604
       * maximum size is checked here.  Because the code in png_read_start_row
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2605
       * adds extra space "for safety's sake" in several places a conservative
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2606
       * limit is used here.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2607
       *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2608
       * NOTE: it would be far better to check the size that is actually used,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2609
       * but the effect in the real world is minor and the changes are more
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2610
       * extensive, therefore much more dangerous and much more difficult to
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2611
       * write in a way that avoids compiler warnings.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2612
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2613
      png_warning(png_ptr, "Image width is too large for this architecture");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2614
      error = 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2615
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2616
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2617
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2618
   if (width > png_ptr->user_width_max)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2619
#else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2620
   if (width > PNG_USER_WIDTH_MAX)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2621
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2622
   {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2623
      png_warning(png_ptr, "Image width exceeds user limit in IHDR");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2624
      error = 1;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2625
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2626
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2627
   if (height == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2628
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2629
      png_warning(png_ptr, "Image height is zero in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2630
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2631
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2632
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2633
   if (height > PNG_UINT_31_MAX)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2634
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2635
      png_warning(png_ptr, "Invalid image height in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2636
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2637
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2638
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2639
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2640
   if (height > png_ptr->user_height_max)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2641
#else
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2642
   if (height > PNG_USER_HEIGHT_MAX)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2643
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2644
   {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2645
      png_warning(png_ptr, "Image height exceeds user limit in IHDR");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2646
      error = 1;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2647
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2648
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2649
   /* Check other values */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2650
   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2651
       bit_depth != 8 && bit_depth != 16)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2652
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2653
      png_warning(png_ptr, "Invalid bit depth in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2654
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2655
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2656
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2657
   if (color_type < 0 || color_type == 1 ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2658
       color_type == 5 || color_type > 6)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2659
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2660
      png_warning(png_ptr, "Invalid color type in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2661
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2662
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2663
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2664
   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2665
       ((color_type == PNG_COLOR_TYPE_RGB ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2666
         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2667
         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2668
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2669
      png_warning(png_ptr, "Invalid color type/bit depth combination in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2670
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2671
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2672
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2673
   if (interlace_type >= PNG_INTERLACE_LAST)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2674
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2675
      png_warning(png_ptr, "Unknown interlace method in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2676
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2677
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2678
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2679
   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2680
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2681
      png_warning(png_ptr, "Unknown compression method in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2682
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2683
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2684
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2685
#ifdef PNG_MNG_FEATURES_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2686
   /* Accept filter_method 64 (intrapixel differencing) only if
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2687
    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2688
    * 2. Libpng did not read a PNG signature (this filter_method is only
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2689
    *    used in PNG datastreams that are embedded in MNG datastreams) and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2690
    * 3. The application called png_permit_mng_features with a mask that
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2691
    *    included PNG_FLAG_MNG_FILTER_64 and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2692
    * 4. The filter_method is 64 and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2693
    * 5. The color_type is RGB or RGBA
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2694
    */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2695
   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2696
       png_ptr->mng_features_permitted != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2697
      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2698
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2699
   if (filter_type != PNG_FILTER_TYPE_BASE)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2700
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2701
      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2702
          (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2703
          ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2704
          (color_type == PNG_COLOR_TYPE_RGB ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2705
          color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2706
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2707
         png_warning(png_ptr, "Unknown filter method in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2708
         error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2709
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2710
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2711
      if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2712
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2713
         png_warning(png_ptr, "Invalid filter method in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2714
         error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2715
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2716
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2717
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2718
#else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2719
   if (filter_type != PNG_FILTER_TYPE_BASE)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2720
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2721
      png_warning(png_ptr, "Unknown filter method in IHDR");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2722
      error = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2723
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2724
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2725
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2726
   if (error == 1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2727
      png_error(png_ptr, "Invalid IHDR data");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2728
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2729
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2730
#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2731
/* ASCII to fp functions */
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  2732
/* Check an ASCII formatted floating point value, see the more detailed
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2733
 * comments in pngpriv.h
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2734
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2735
/* The following is used internally to preserve the sticky flags */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2736
#define png_fp_add(state, flags) ((state) |= (flags))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2737
#define png_fp_set(state, value) ((state) = (value) | ((state) & PNG_FP_STICKY))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2738
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2739
int /* PRIVATE */
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  2740
png_check_fp_number(png_const_charp string, size_t size, int *statep,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  2741
    png_size_tp whereami)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2742
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2743
   int state = *statep;
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  2744
   size_t i = *whereami;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2745
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2746
   while (i < size)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2747
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2748
      int type;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2749
      /* First find the type of the next character */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2750
      switch (string[i])
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2751
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2752
      case 43:  type = PNG_FP_SAW_SIGN;                   break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2753
      case 45:  type = PNG_FP_SAW_SIGN + PNG_FP_NEGATIVE; break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2754
      case 46:  type = PNG_FP_SAW_DOT;                    break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2755
      case 48:  type = PNG_FP_SAW_DIGIT;                  break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2756
      case 49: case 50: case 51: case 52:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2757
      case 53: case 54: case 55: case 56:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2758
      case 57:  type = PNG_FP_SAW_DIGIT + PNG_FP_NONZERO; break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2759
      case 69:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2760
      case 101: type = PNG_FP_SAW_E;                      break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2761
      default:  goto PNG_FP_End;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2762
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2763
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2764
      /* Now deal with this type according to the current
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2765
       * state, the type is arranged to not overlap the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2766
       * bits of the PNG_FP_STATE.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2767
       */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2768
      switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2769
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2770
      case PNG_FP_INTEGER + PNG_FP_SAW_SIGN:
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2771
         if ((state & PNG_FP_SAW_ANY) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2772
            goto PNG_FP_End; /* not a part of the number */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2773
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2774
         png_fp_add(state, type);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2775
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2776
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2777
      case PNG_FP_INTEGER + PNG_FP_SAW_DOT:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2778
         /* Ok as trailer, ok as lead of fraction. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2779
         if ((state & PNG_FP_SAW_DOT) != 0) /* two dots */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2780
            goto PNG_FP_End;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2781
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2782
         else if ((state & PNG_FP_SAW_DIGIT) != 0) /* trailing dot? */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2783
            png_fp_add(state, type);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2784
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2785
         else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2786
            png_fp_set(state, PNG_FP_FRACTION | type);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2787
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2788
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2789
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2790
      case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT:
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2791
         if ((state & PNG_FP_SAW_DOT) != 0) /* delayed fraction */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2792
            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2793
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2794
         png_fp_add(state, type | PNG_FP_WAS_VALID);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2795
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2796
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2797
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2798
      case PNG_FP_INTEGER + PNG_FP_SAW_E:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2799
         if ((state & PNG_FP_SAW_DIGIT) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2800
            goto PNG_FP_End;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2801
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2802
         png_fp_set(state, PNG_FP_EXPONENT);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2803
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2804
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2805
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2806
   /* case PNG_FP_FRACTION + PNG_FP_SAW_SIGN:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2807
         goto PNG_FP_End; ** no sign in fraction */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2808
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2809
   /* case PNG_FP_FRACTION + PNG_FP_SAW_DOT:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2810
         goto PNG_FP_End; ** Because SAW_DOT is always set */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2811
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2812
      case PNG_FP_FRACTION + PNG_FP_SAW_DIGIT:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2813
         png_fp_add(state, type | PNG_FP_WAS_VALID);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2814
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2815
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2816
      case PNG_FP_FRACTION + PNG_FP_SAW_E:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2817
         /* This is correct because the trailing '.' on an
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2818
          * integer is handled above - so we can only get here
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2819
          * with the sequence ".E" (with no preceding digits).
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2820
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2821
         if ((state & PNG_FP_SAW_DIGIT) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2822
            goto PNG_FP_End;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2823
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2824
         png_fp_set(state, PNG_FP_EXPONENT);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2825
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2826
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2827
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2828
      case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN:
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2829
         if ((state & PNG_FP_SAW_ANY) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2830
            goto PNG_FP_End; /* not a part of the number */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2831
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2832
         png_fp_add(state, PNG_FP_SAW_SIGN);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2833
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2834
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2835
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2836
   /* case PNG_FP_EXPONENT + PNG_FP_SAW_DOT:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2837
         goto PNG_FP_End; */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2838
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2839
      case PNG_FP_EXPONENT + PNG_FP_SAW_DIGIT:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2840
         png_fp_add(state, PNG_FP_SAW_DIGIT | PNG_FP_WAS_VALID);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2841
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2842
         break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2843
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2844
   /* case PNG_FP_EXPONEXT + PNG_FP_SAW_E:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2845
         goto PNG_FP_End; */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2846
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2847
      default: goto PNG_FP_End; /* I.e. break 2 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2848
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2849
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2850
      /* The character seems ok, continue. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2851
      ++i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2852
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2853
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2854
PNG_FP_End:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2855
   /* Here at the end, update the state and return the correct
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2856
    * return code.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2857
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2858
   *statep = state;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2859
   *whereami = i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2860
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2861
   return (state & PNG_FP_SAW_DIGIT) != 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2862
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2863
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2864
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2865
/* The same but for a complete string. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2866
int
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  2867
png_check_fp_string(png_const_charp string, size_t size)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2868
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2869
   int        state=0;
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  2870
   size_t char_index=0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2871
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2872
   if (png_check_fp_number(string, size, &state, &char_index) != 0 &&
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2873
      (char_index == size || string[char_index] == 0))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2874
      return state /* must be non-zero - see above */;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2875
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2876
   return 0; /* i.e. fail */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2877
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2878
#endif /* pCAL || sCAL */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2879
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2880
#ifdef PNG_sCAL_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2881
#  ifdef PNG_FLOATING_POINT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2882
/* Utility used below - a simple accurate power of ten from an integral
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2883
 * exponent.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2884
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2885
static double
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2886
png_pow10(int power)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2887
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2888
   int recip = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2889
   double d = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2890
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2891
   /* Handle negative exponent with a reciprocal at the end because
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2892
    * 10 is exact whereas .1 is inexact in base 2
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2893
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2894
   if (power < 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2895
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2896
      if (power < DBL_MIN_10_EXP) return 0;
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2897
      recip = 1; power = -power;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2898
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2899
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2900
   if (power > 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2901
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2902
      /* Decompose power bitwise. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2903
      double mult = 10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2904
      do
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2905
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2906
         if (power & 1) d *= mult;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2907
         mult *= mult;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2908
         power >>= 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2909
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2910
      while (power > 0);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2911
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  2912
      if (recip != 0) d = 1/d;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2913
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2914
   /* else power is 0 and d is 1 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2915
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2916
   return d;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2917
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2918
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2919
/* Function to format a floating point value in ASCII with a given
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2920
 * precision.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2921
 */
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2922
#if GCC_STRICT_OVERFLOW
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2923
#pragma GCC diagnostic push
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2924
/* The problem arises below with exp_b10, which can never overflow because it
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2925
 * comes, originally, from frexp and is therefore limited to a range which is
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2926
 * typically +/-710 (log2(DBL_MAX)/log2(DBL_MIN)).
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2927
 */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2928
#pragma GCC diagnostic warning "-Wstrict-overflow=2"
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2929
#endif /* GCC_STRICT_OVERFLOW */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2930
void /* PRIVATE */
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  2931
png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, size_t size,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2932
    double fp, unsigned int precision)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2933
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2934
   /* We use standard functions from math.h, but not printf because
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2935
    * that would require stdio.  The caller must supply a buffer of
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2936
    * sufficient size or we will png_error.  The tests on size and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2937
    * the space in ascii[] consumed are indicated below.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2938
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2939
   if (precision < 1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2940
      precision = DBL_DIG;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2941
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2942
   /* Enforce the limit of the implementation precision too. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2943
   if (precision > DBL_DIG+1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2944
      precision = DBL_DIG+1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2945
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2946
   /* Basic sanity checks */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2947
   if (size >= precision+5) /* See the requirements below. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2948
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2949
      if (fp < 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2950
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2951
         fp = -fp;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2952
         *ascii++ = 45; /* '-'  PLUS 1 TOTAL 1 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2953
         --size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2954
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2955
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2956
      if (fp >= DBL_MIN && fp <= DBL_MAX)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2957
      {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  2958
         int exp_b10;   /* A base 10 exponent */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2959
         double base;   /* 10^exp_b10 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2960
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2961
         /* First extract a base 10 exponent of the number,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2962
          * the calculation below rounds down when converting
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2963
          * from base 2 to base 10 (multiply by log10(2) -
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2964
          * 0.3010, but 77/256 is 0.3008, so exp_b10 needs to
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2965
          * be increased.  Note that the arithmetic shift
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2966
          * performs a floor() unlike C arithmetic - using a
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2967
          * C multiply would break the following for negative
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2968
          * exponents.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2969
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2970
         (void)frexp(fp, &exp_b10); /* exponent to base 2 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2971
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2972
         exp_b10 = (exp_b10 * 77) >> 8; /* <= exponent to base 10 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2973
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2974
         /* Avoid underflow here. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2975
         base = png_pow10(exp_b10); /* May underflow */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2976
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2977
         while (base < DBL_MIN || base < fp)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2978
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2979
            /* And this may overflow. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2980
            double test = png_pow10(exp_b10+1);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2981
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2982
            if (test <= DBL_MAX)
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2983
            {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2984
               ++exp_b10; base = test;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2985
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2986
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2987
            else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2988
               break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2989
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2990
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2991
         /* Normalize fp and correct exp_b10, after this fp is in the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2992
          * range [.1,1) and exp_b10 is both the exponent and the digit
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2993
          * *before* which the decimal point should be inserted
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2994
          * (starting with 0 for the first digit).  Note that this
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2995
          * works even if 10^exp_b10 is out of range because of the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2996
          * test on DBL_MAX above.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2997
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  2998
         fp /= base;
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  2999
         while (fp >= 1)
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3000
         {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3001
            fp /= 10; ++exp_b10;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3002
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3003
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3004
         /* Because of the code above fp may, at this point, be
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3005
          * less than .1, this is ok because the code below can
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3006
          * handle the leading zeros this generates, so no attempt
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3007
          * is made to correct that here.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3008
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3009
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3010
         {
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3011
            unsigned int czero, clead, cdigits;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3012
            char exponent[10];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3013
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3014
            /* Allow up to two leading zeros - this will not lengthen
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3015
             * the number compared to using E-n.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3016
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3017
            if (exp_b10 < 0 && exp_b10 > -3) /* PLUS 3 TOTAL 4 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3018
            {
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3019
               czero = 0U-exp_b10; /* PLUS 2 digits: TOTAL 3 */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3020
               exp_b10 = 0;      /* Dot added below before first output. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3021
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3022
            else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3023
               czero = 0;    /* No zeros to add */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3024
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3025
            /* Generate the digit list, stripping trailing zeros and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3026
             * inserting a '.' before a digit if the exponent is 0.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3027
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3028
            clead = czero; /* Count of leading zeros */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3029
            cdigits = 0;   /* Count of digits in list. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3030
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3031
            do
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3032
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3033
               double d;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3034
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3035
               fp *= 10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3036
               /* Use modf here, not floor and subtract, so that
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3037
                * the separation is done in one step.  At the end
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3038
                * of the loop don't break the number into parts so
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3039
                * that the final digit is rounded.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3040
                */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3041
               if (cdigits+czero+1 < precision+clead)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3042
                  fp = modf(fp, &d);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3043
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3044
               else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3045
               {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3046
                  d = floor(fp + .5);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3047
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3048
                  if (d > 9)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3049
                  {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3050
                     /* Rounding up to 10, handle that here. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3051
                     if (czero > 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3052
                     {
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3053
                        --czero; d = 1;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3054
                        if (cdigits == 0) --clead;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3055
                     }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3056
                     else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3057
                     {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3058
                        while (cdigits > 0 && d > 9)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3059
                        {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3060
                           int ch = *--ascii;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3061
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3062
                           if (exp_b10 != (-1))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3063
                              ++exp_b10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3064
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3065
                           else if (ch == 46)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3066
                           {
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3067
                              ch = *--ascii; ++size;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3068
                              /* Advance exp_b10 to '1', so that the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3069
                               * decimal point happens after the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3070
                               * previous digit.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3071
                               */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3072
                              exp_b10 = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3073
                           }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3074
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3075
                           --cdigits;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3076
                           d = ch - 47;  /* I.e. 1+(ch-48) */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3077
                        }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3078
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3079
                        /* Did we reach the beginning? If so adjust the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3080
                         * exponent but take into account the leading
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3081
                         * decimal point.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3082
                         */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3083
                        if (d > 9)  /* cdigits == 0 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3084
                        {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3085
                           if (exp_b10 == (-1))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3086
                           {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3087
                              /* Leading decimal point (plus zeros?), if
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3088
                               * we lose the decimal point here it must
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3089
                               * be reentered below.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3090
                               */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3091
                              int ch = *--ascii;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3092
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3093
                              if (ch == 46)
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3094
                              {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3095
                                 ++size; exp_b10 = 1;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3096
                              }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3097
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3098
                              /* Else lost a leading zero, so 'exp_b10' is
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3099
                               * still ok at (-1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3100
                               */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3101
                           }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3102
                           else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3103
                              ++exp_b10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3104
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3105
                           /* In all cases we output a '1' */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3106
                           d = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3107
                        }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3108
                     }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3109
                  }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3110
                  fp = 0; /* Guarantees termination below. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3111
               }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3112
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3113
               if (d == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3114
               {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3115
                  ++czero;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3116
                  if (cdigits == 0) ++clead;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3117
               }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3118
               else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3119
               {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3120
                  /* Included embedded zeros in the digit count. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3121
                  cdigits += czero - clead;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3122
                  clead = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3123
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3124
                  while (czero > 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3125
                  {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3126
                     /* exp_b10 == (-1) means we just output the decimal
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3127
                      * place - after the DP don't adjust 'exp_b10' any
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3128
                      * more!
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3129
                      */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3130
                     if (exp_b10 != (-1))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3131
                     {
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3132
                        if (exp_b10 == 0)
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3133
                        {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3134
                           *ascii++ = 46; --size;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3135
                        }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3136
                        /* PLUS 1: TOTAL 4 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3137
                        --exp_b10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3138
                     }
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3139
                     *ascii++ = 48; --czero;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3140
                  }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3141
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3142
                  if (exp_b10 != (-1))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3143
                  {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3144
                     if (exp_b10 == 0)
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3145
                     {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3146
                        *ascii++ = 46; --size; /* counted above */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3147
                     }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3148
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3149
                     --exp_b10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3150
                  }
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3151
                  *ascii++ = (char)(48 + (int)d); ++cdigits;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3152
               }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3153
            }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3154
            while (cdigits+czero < precision+clead && fp > DBL_MIN);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3155
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3156
            /* The total output count (max) is now 4+precision */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3157
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3158
            /* Check for an exponent, if we don't need one we are
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  3159
             * done and just need to terminate the string.  At this
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  3160
             * point, exp_b10==(-1) is effectively a flag: it got
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  3161
             * to '-1' because of the decrement, after outputting
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  3162
             * the decimal point above. (The exponent required is
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  3163
             * *not* -1.)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3164
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3165
            if (exp_b10 >= (-1) && exp_b10 <= 2)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3166
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3167
               /* The following only happens if we didn't output the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3168
                * leading zeros above for negative exponent, so this
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3169
                * doesn't add to the digit requirement.  Note that the
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3170
                * two zeros here can only be output if the two leading
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3171
                * zeros were *not* output, so this doesn't increase
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3172
                * the output count.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3173
                */
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3174
               while (exp_b10-- > 0) *ascii++ = 48;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3175
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3176
               *ascii = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3177
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3178
               /* Total buffer requirement (including the '\0') is
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3179
                * 5+precision - see check at the start.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3180
                */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3181
               return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3182
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3183
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3184
            /* Here if an exponent is required, adjust size for
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3185
             * the digits we output but did not count.  The total
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3186
             * digit output here so far is at most 1+precision - no
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3187
             * decimal point and no leading or trailing zeros have
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3188
             * been output.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3189
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3190
            size -= cdigits;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3191
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3192
            *ascii++ = 69; --size;    /* 'E': PLUS 1 TOTAL 2+precision */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3193
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3194
            /* The following use of an unsigned temporary avoids ambiguities in
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3195
             * the signed arithmetic on exp_b10 and permits GCC at least to do
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3196
             * better optimization.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3197
             */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3198
            {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3199
               unsigned int uexp_b10;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3200
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3201
               if (exp_b10 < 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3202
               {
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3203
                  *ascii++ = 45; --size; /* '-': PLUS 1 TOTAL 3+precision */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3204
                  uexp_b10 = 0U-exp_b10;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3205
               }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3206
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3207
               else
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3208
                  uexp_b10 = 0U+exp_b10;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3209
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3210
               cdigits = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3211
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3212
               while (uexp_b10 > 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3213
               {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3214
                  exponent[cdigits++] = (char)(48 + uexp_b10 % 10);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3215
                  uexp_b10 /= 10;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3216
               }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3217
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3218
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3219
            /* Need another size check here for the exponent digits, so
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3220
             * this need not be considered above.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3221
             */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3222
            if (size > cdigits)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3223
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3224
               while (cdigits > 0) *ascii++ = exponent[--cdigits];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3225
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3226
               *ascii = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3227
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3228
               return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3229
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3230
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3231
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3232
      else if (!(fp >= DBL_MIN))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3233
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3234
         *ascii++ = 48; /* '0' */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3235
         *ascii = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3236
         return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3237
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3238
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3239
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3240
         *ascii++ = 105; /* 'i' */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3241
         *ascii++ = 110; /* 'n' */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3242
         *ascii++ = 102; /* 'f' */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3243
         *ascii = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3244
         return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3245
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3246
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3247
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3248
   /* Here on buffer too small. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3249
   png_error(png_ptr, "ASCII conversion buffer too small");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3250
}
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3251
#if GCC_STRICT_OVERFLOW
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3252
#pragma GCC diagnostic pop
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3253
#endif /* GCC_STRICT_OVERFLOW */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3254
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3255
#  endif /* FLOATING_POINT */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3256
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3257
#  ifdef PNG_FIXED_POINT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3258
/* Function to format a fixed point value in ASCII.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3259
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3260
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3261
png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  3262
    size_t size, png_fixed_point fp)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3263
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3264
   /* Require space for 10 decimal digits, a decimal point, a minus sign and a
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3265
    * trailing \0, 13 characters:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3266
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3267
   if (size > 12)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3268
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3269
      png_uint_32 num;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3270
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3271
      /* Avoid overflow here on the minimum integer. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3272
      if (fp < 0)
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3273
      {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3274
         *ascii++ = 45; num = (png_uint_32)(-fp);
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3275
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3276
      else
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3277
         num = (png_uint_32)fp;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3278
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3279
      if (num <= 0x80000000) /* else overflowed */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3280
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3281
         unsigned int ndigits = 0, first = 16 /* flag value */;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3282
         char digits[10];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3283
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3284
         while (num)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3285
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3286
            /* Split the low digit off num: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3287
            unsigned int tmp = num/10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3288
            num -= tmp*10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3289
            digits[ndigits++] = (char)(48 + num);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3290
            /* Record the first non-zero digit, note that this is a number
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3291
             * starting at 1, it's not actually the array index.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3292
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3293
            if (first == 16 && num > 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3294
               first = ndigits;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3295
            num = tmp;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3296
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3297
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3298
         if (ndigits > 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3299
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3300
            while (ndigits > 5) *ascii++ = digits[--ndigits];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3301
            /* The remaining digits are fractional digits, ndigits is '5' or
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3302
             * smaller at this point.  It is certainly not zero.  Check for a
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3303
             * non-zero fractional digit:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3304
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3305
            if (first <= 5)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3306
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3307
               unsigned int i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3308
               *ascii++ = 46; /* decimal point */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3309
               /* ndigits may be <5 for small numbers, output leading zeros
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3310
                * then ndigits digits to first:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3311
                */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3312
               i = 5;
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3313
               while (ndigits < i)
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3314
               {
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3315
                  *ascii++ = 48; --i;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3316
               }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3317
               while (ndigits >= first) *ascii++ = digits[--ndigits];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3318
               /* Don't output the trailing zeros! */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3319
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3320
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3321
         else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3322
            *ascii++ = 48;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3323
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3324
         /* And null terminate the string: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3325
         *ascii = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3326
         return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3327
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3328
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3329
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3330
   /* Here on buffer too small. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3331
   png_error(png_ptr, "ASCII conversion buffer too small");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3332
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3333
#   endif /* FIXED_POINT */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3334
#endif /* SCAL */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3335
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3336
#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3337
   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3338
   (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3339
   defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3340
   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3341
   (defined(PNG_sCAL_SUPPORTED) && \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3342
   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3343
png_fixed_point
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3344
png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3345
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3346
   double r = floor(100000 * fp + .5);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3347
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3348
   if (r > 2147483647. || r < -2147483648.)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3349
      png_fixed_error(png_ptr, text);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3350
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3351
#  ifndef PNG_ERROR_TEXT_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3352
   PNG_UNUSED(text)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3353
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3354
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3355
   return (png_fixed_point)r;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  3356
}
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3357
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3358
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3359
#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3360
    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3361
/* muldiv functions */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3362
/* This API takes signed arguments and rounds the result to the nearest
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3363
 * integer (or, for a fixed point number - the standard argument - to
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3364
 * the nearest .00001).  Overflow and divide by zero are signalled in
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3365
 * the result, a boolean - true on success, false on overflow.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3366
 */
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3367
#if GCC_STRICT_OVERFLOW /* from above */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3368
/* It is not obvious which comparison below gets optimized in such a way that
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3369
 * signed overflow would change the result; looking through the code does not
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3370
 * reveal any tests which have the form GCC complains about, so presumably the
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3371
 * optimizer is moving an add or subtract into the 'if' somewhere.
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3372
 */
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3373
#pragma GCC diagnostic push
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3374
#pragma GCC diagnostic warning "-Wstrict-overflow=2"
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3375
#endif /* GCC_STRICT_OVERFLOW */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3376
int
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3377
png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3378
    png_int_32 divisor)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3379
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3380
   /* Return a * times / divisor, rounded. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3381
   if (divisor != 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3382
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3383
      if (a == 0 || times == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3384
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3385
         *res = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3386
         return 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3387
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3388
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3389
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3390
#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3391
         double r = a;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3392
         r *= times;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3393
         r /= divisor;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3394
         r = floor(r+.5);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3395
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3396
         /* A png_fixed_point is a 32-bit integer. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3397
         if (r <= 2147483647. && r >= -2147483648.)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3398
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3399
            *res = (png_fixed_point)r;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3400
            return 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3401
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3402
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3403
         int negative = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3404
         png_uint_32 A, T, D;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3405
         png_uint_32 s16, s32, s00;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3406
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3407
         if (a < 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3408
            negative = 1, A = -a;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3409
         else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3410
            A = a;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3411
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3412
         if (times < 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3413
            negative = !negative, T = -times;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3414
         else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3415
            T = times;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3416
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3417
         if (divisor < 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3418
            negative = !negative, D = -divisor;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3419
         else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3420
            D = divisor;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3421
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3422
         /* Following can't overflow because the arguments only
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3423
          * have 31 bits each, however the result may be 32 bits.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3424
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3425
         s16 = (A >> 16) * (T & 0xffff) +
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3426
                           (A & 0xffff) * (T >> 16);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3427
         /* Can't overflow because the a*times bit is only 30
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3428
          * bits at most.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3429
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3430
         s32 = (A >> 16) * (T >> 16) + (s16 >> 16);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3431
         s00 = (A & 0xffff) * (T & 0xffff);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3432
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3433
         s16 = (s16 & 0xffff) << 16;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3434
         s00 += s16;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3435
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3436
         if (s00 < s16)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3437
            ++s32; /* carry */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3438
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3439
         if (s32 < D) /* else overflow */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3440
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3441
            /* s32.s00 is now the 64-bit product, do a standard
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3442
             * division, we know that s32 < D, so the maximum
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3443
             * required shift is 31.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3444
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3445
            int bitshift = 32;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3446
            png_fixed_point result = 0; /* NOTE: signed */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3447
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3448
            while (--bitshift >= 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3449
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3450
               png_uint_32 d32, d00;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3451
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3452
               if (bitshift > 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3453
                  d32 = D >> (32-bitshift), d00 = D << bitshift;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3454
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3455
               else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3456
                  d32 = 0, d00 = D;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3457
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3458
               if (s32 > d32)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3459
               {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3460
                  if (s00 < d00) --s32; /* carry */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3461
                  s32 -= d32, s00 -= d00, result += 1<<bitshift;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3462
               }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3463
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3464
               else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3465
                  if (s32 == d32 && s00 >= d00)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3466
                     s32 = 0, s00 -= d00, result += 1<<bitshift;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3467
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3468
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3469
            /* Handle the rounding. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3470
            if (s00 >= (D >> 1))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3471
               ++result;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3472
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3473
            if (negative != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3474
               result = -result;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3475
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3476
            /* Check for overflow. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3477
            if ((negative != 0 && result <= 0) ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3478
                (negative == 0 && result >= 0))
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3479
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3480
               *res = result;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3481
               return 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3482
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3483
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3484
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3485
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3486
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3487
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3488
   return 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3489
}
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3490
#if GCC_STRICT_OVERFLOW
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3491
#pragma GCC diagnostic pop
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3492
#endif /* GCC_STRICT_OVERFLOW */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3493
#endif /* READ_GAMMA || INCH_CONVERSIONS */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3494
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3495
#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3496
/* The following is for when the caller doesn't much care about the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3497
 * result.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3498
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3499
png_fixed_point
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3500
png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3501
    png_int_32 divisor)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3502
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3503
   png_fixed_point result;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3504
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3505
   if (png_muldiv(&result, a, times, divisor) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3506
      return result;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3507
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3508
   png_warning(png_ptr, "fixed point overflow ignored");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3509
   return 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3510
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3511
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3512
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3513
#ifdef PNG_GAMMA_SUPPORTED /* more fixed point functions for gamma */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3514
/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3515
png_fixed_point
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3516
png_reciprocal(png_fixed_point a)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3517
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3518
#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3519
   double r = floor(1E10/a+.5);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3520
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3521
   if (r <= 2147483647. && r >= -2147483648.)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3522
      return (png_fixed_point)r;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3523
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3524
   png_fixed_point res;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3525
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3526
   if (png_muldiv(&res, 100000, 100000, a) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3527
      return res;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3528
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3529
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3530
   return 0; /* error/overflow */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3531
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3532
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3533
/* This is the shared test on whether a gamma value is 'significant' - whether
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3534
 * it is worth doing gamma correction.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3535
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3536
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3537
png_gamma_significant(png_fixed_point gamma_val)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3538
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3539
   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3540
       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3541
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3542
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3543
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3544
#ifdef PNG_READ_GAMMA_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3545
#ifdef PNG_16BIT_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3546
/* A local convenience routine. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3547
static png_fixed_point
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3548
png_product2(png_fixed_point a, png_fixed_point b)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3549
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3550
   /* The required result is 1/a * 1/b; the following preserves accuracy. */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3551
#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3552
   double r = a * 1E-5;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3553
   r *= b;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3554
   r = floor(r+.5);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3555
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3556
   if (r <= 2147483647. && r >= -2147483648.)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3557
      return (png_fixed_point)r;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3558
#else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3559
   png_fixed_point res;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3560
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3561
   if (png_muldiv(&res, a, b, 100000) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3562
      return res;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3563
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3564
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3565
   return 0; /* overflow */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3566
}
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3567
#endif /* 16BIT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3568
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3569
/* The inverse of the above. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3570
png_fixed_point
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3571
png_reciprocal2(png_fixed_point a, png_fixed_point b)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3572
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3573
   /* The required result is 1/a * 1/b; the following preserves accuracy. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3574
#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3575
   if (a != 0 && b != 0)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3576
   {
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3577
      double r = 1E15/a;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3578
      r /= b;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3579
      r = floor(r+.5);
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3580
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3581
      if (r <= 2147483647. && r >= -2147483648.)
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3582
         return (png_fixed_point)r;
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3583
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3584
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3585
   /* This may overflow because the range of png_fixed_point isn't symmetric,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3586
    * but this API is only used for the product of file and screen gamma so it
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3587
    * doesn't matter that the smallest number it can produce is 1/21474, not
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3588
    * 1/100000
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3589
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3590
   png_fixed_point res = png_product2(a, b);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3591
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3592
   if (res != 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3593
      return png_reciprocal(res);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3594
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3595
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3596
   return 0; /* overflow */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3597
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3598
#endif /* READ_GAMMA */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3599
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3600
#ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3601
#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3602
/* Fixed point gamma.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3603
 *
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3604
 * The code to calculate the tables used below can be found in the shell script
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3605
 * contrib/tools/intgamma.sh
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3606
 *
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3607
 * To calculate gamma this code implements fast log() and exp() calls using only
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3608
 * fixed point arithmetic.  This code has sufficient precision for either 8-bit
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3609
 * or 16-bit sample values.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3610
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3611
 * The tables used here were calculated using simple 'bc' programs, but C double
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3612
 * precision floating point arithmetic would work fine.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3613
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3614
 * 8-bit log table
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3615
 *   This is a table of -log(value/255)/log(2) for 'value' in the range 128 to
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3616
 *   255, so it's the base 2 logarithm of a normalized 8-bit floating point
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3617
 *   mantissa.  The numbers are 32-bit fractions.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3618
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3619
static const png_uint_32
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3620
png_8bit_l2[128] =
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3621
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3622
   4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3623
   3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3624
   3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3625
   3455425220U, 3413129301U, 3371120137U, 3329393864U, 3287946700U, 3246774933U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3626
   3205874930U, 3165243125U, 3124876025U, 3084770202U, 3044922296U, 3005329011U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3627
   2965987113U, 2926893432U, 2888044853U, 2849438323U, 2811070844U, 2772939474U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3628
   2735041326U, 2697373562U, 2659933400U, 2622718104U, 2585724991U, 2548951424U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3629
   2512394810U, 2476052606U, 2439922311U, 2404001468U, 2368287663U, 2332778523U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3630
   2297471715U, 2262364947U, 2227455964U, 2192742551U, 2158222529U, 2123893754U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3631
   2089754119U, 2055801552U, 2022034013U, 1988449497U, 1955046031U, 1921821672U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3632
   1888774511U, 1855902668U, 1823204291U, 1790677560U, 1758320682U, 1726131893U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3633
   1694109454U, 1662251657U, 1630556815U, 1599023271U, 1567649391U, 1536433567U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3634
   1505374214U, 1474469770U, 1443718700U, 1413119487U, 1382670639U, 1352370686U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3635
   1322218179U, 1292211689U, 1262349810U, 1232631153U, 1203054352U, 1173618059U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3636
   1144320946U, 1115161701U, 1086139034U, 1057251672U, 1028498358U, 999877854U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3637
   971388940U, 943030410U, 914801076U, 886699767U, 858725327U, 830876614U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3638
   803152505U, 775551890U, 748073672U, 720716771U, 693480120U, 666362667U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3639
   639363374U, 612481215U, 585715177U, 559064263U, 532527486U, 506103872U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3640
   479792461U, 453592303U, 427502463U, 401522014U, 375650043U, 349885648U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3641
   324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3642
   172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3643
   24347096U, 0U
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3644
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3645
#if 0
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3646
   /* The following are the values for 16-bit tables - these work fine for the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3647
    * 8-bit conversions but produce very slightly larger errors in the 16-bit
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3648
    * log (about 1.2 as opposed to 0.7 absolute error in the final value).  To
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3649
    * use these all the shifts below must be adjusted appropriately.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3650
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3651
   65166, 64430, 63700, 62976, 62257, 61543, 60835, 60132, 59434, 58741, 58054,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3652
   57371, 56693, 56020, 55352, 54689, 54030, 53375, 52726, 52080, 51439, 50803,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3653
   50170, 49542, 48918, 48298, 47682, 47070, 46462, 45858, 45257, 44661, 44068,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3654
   43479, 42894, 42312, 41733, 41159, 40587, 40020, 39455, 38894, 38336, 37782,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3655
   37230, 36682, 36137, 35595, 35057, 34521, 33988, 33459, 32932, 32408, 31887,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3656
   31369, 30854, 30341, 29832, 29325, 28820, 28319, 27820, 27324, 26830, 26339,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3657
   25850, 25364, 24880, 24399, 23920, 23444, 22970, 22499, 22029, 21562, 21098,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3658
   20636, 20175, 19718, 19262, 18808, 18357, 17908, 17461, 17016, 16573, 16132,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3659
   15694, 15257, 14822, 14390, 13959, 13530, 13103, 12678, 12255, 11834, 11415,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3660
   10997, 10582, 10168, 9756, 9346, 8937, 8531, 8126, 7723, 7321, 6921, 6523,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3661
   6127, 5732, 5339, 4947, 4557, 4169, 3782, 3397, 3014, 2632, 2251, 1872, 1495,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3662
   1119, 744, 372
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3663
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3664
};
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3665
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3666
static png_int_32
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3667
png_log8bit(unsigned int x)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3668
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3669
   unsigned int lg2 = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3670
   /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3671
    * because the log is actually negate that means adding 1.  The final
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3672
    * returned value thus has the range 0 (for 255 input) to 7.994 (for 1
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3673
    * input), return -1 for the overflow (log 0) case, - so the result is
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3674
    * always at most 19 bits.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3675
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3676
   if ((x &= 0xff) == 0)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3677
      return -1;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3678
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3679
   if ((x & 0xf0) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3680
      lg2  = 4, x <<= 4;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3681
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3682
   if ((x & 0xc0) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3683
      lg2 += 2, x <<= 2;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3684
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3685
   if ((x & 0x80) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3686
      lg2 += 1, x <<= 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3687
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3688
   /* result is at most 19 bits, so this cast is safe: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3689
   return (png_int_32)((lg2 << 16) + ((png_8bit_l2[x-128]+32768)>>16));
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3690
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3691
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3692
/* The above gives exact (to 16 binary places) log2 values for 8-bit images,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3693
 * for 16-bit images we use the most significant 8 bits of the 16-bit value to
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3694
 * get an approximation then multiply the approximation by a correction factor
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3695
 * determined by the remaining up to 8 bits.  This requires an additional step
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3696
 * in the 16-bit case.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3697
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3698
 * We want log2(value/65535), we have log2(v'/255), where:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3699
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3700
 *    value = v' * 256 + v''
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3701
 *          = v' * f
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3702
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3703
 * So f is value/v', which is equal to (256+v''/v') since v' is in the range 128
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3704
 * to 255 and v'' is in the range 0 to 255 f will be in the range 256 to less
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3705
 * than 258.  The final factor also needs to correct for the fact that our 8-bit
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3706
 * value is scaled by 255, whereas the 16-bit values must be scaled by 65535.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3707
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3708
 * This gives a final formula using a calculated value 'x' which is value/v' and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3709
 * scaling by 65536 to match the above table:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3710
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3711
 *   log2(x/257) * 65536
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3712
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3713
 * Since these numbers are so close to '1' we can use simple linear
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3714
 * interpolation between the two end values 256/257 (result -368.61) and 258/257
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3715
 * (result 367.179).  The values used below are scaled by a further 64 to give
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3716
 * 16-bit precision in the interpolation:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3717
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3718
 * Start (256): -23591
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3719
 * Zero  (257):      0
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3720
 * End   (258):  23499
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3721
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3722
#ifdef PNG_16BIT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3723
static png_int_32
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3724
png_log16bit(png_uint_32 x)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3725
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3726
   unsigned int lg2 = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3727
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3728
   /* As above, but now the input has 16 bits. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3729
   if ((x &= 0xffff) == 0)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3730
      return -1;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3731
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3732
   if ((x & 0xff00) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3733
      lg2  = 8, x <<= 8;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3734
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3735
   if ((x & 0xf000) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3736
      lg2 += 4, x <<= 4;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3737
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3738
   if ((x & 0xc000) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3739
      lg2 += 2, x <<= 2;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3740
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3741
   if ((x & 0x8000) == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3742
      lg2 += 1, x <<= 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3743
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3744
   /* Calculate the base logarithm from the top 8 bits as a 28-bit fractional
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3745
    * value.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3746
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3747
   lg2 <<= 28;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3748
   lg2 += (png_8bit_l2[(x>>8)-128]+8) >> 4;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3749
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3750
   /* Now we need to interpolate the factor, this requires a division by the top
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3751
    * 8 bits.  Do this with maximum precision.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3752
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3753
   x = ((x << 16) + (x >> 9)) / (x >> 8);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3754
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3755
   /* Since we divided by the top 8 bits of 'x' there will be a '1' at 1<<24,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3756
    * the value at 1<<16 (ignoring this) will be 0 or 1; this gives us exactly
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3757
    * 16 bits to interpolate to get the low bits of the result.  Round the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3758
    * answer.  Note that the end point values are scaled by 64 to retain overall
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3759
    * precision and that 'lg2' is current scaled by an extra 12 bits, so adjust
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3760
    * the overall scaling by 6-12.  Round at every step.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3761
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3762
   x -= 1U << 24;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3763
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3764
   if (x <= 65536U) /* <= '257' */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3765
      lg2 += ((23591U * (65536U-x)) + (1U << (16+6-12-1))) >> (16+6-12);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3766
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3767
   else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3768
      lg2 -= ((23499U * (x-65536U)) + (1U << (16+6-12-1))) >> (16+6-12);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3769
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3770
   /* Safe, because the result can't have more than 20 bits: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3771
   return (png_int_32)((lg2 + 2048) >> 12);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3772
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3773
#endif /* 16BIT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3774
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3775
/* The 'exp()' case must invert the above, taking a 20-bit fixed point
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3776
 * logarithmic value and returning a 16 or 8-bit number as appropriate.  In
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3777
 * each case only the low 16 bits are relevant - the fraction - since the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3778
 * integer bits (the top 4) simply determine a shift.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3779
 *
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3780
 * The worst case is the 16-bit distinction between 65535 and 65534. This
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3781
 * requires perhaps spurious accuracy in the decoding of the logarithm to
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3782
 * distinguish log2(65535/65534.5) - 10^-5 or 17 bits.  There is little chance
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3783
 * of getting this accuracy in practice.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3784
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3785
 * To deal with this the following exp() function works out the exponent of the
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  3786
 * fractional part of the logarithm by using an accurate 32-bit value from the
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3787
 * top four fractional bits then multiplying in the remaining bits.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3788
 */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3789
static const png_uint_32
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3790
png_32bit_exp[16] =
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3791
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3792
   /* NOTE: the first entry is deliberately set to the maximum 32-bit value. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3793
   4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3794
   3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3795
   2553802834U, 2445529972U, 2341847524U, 2242560872U
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3796
};
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3797
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3798
/* Adjustment table; provided to explain the numbers in the code below. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3799
#if 0
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3800
for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3801
   11 44937.64284865548751208448
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3802
   10 45180.98734845585101160448
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3803
    9 45303.31936980687359311872
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3804
    8 45364.65110595323018870784
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3805
    7 45395.35850361789624614912
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3806
    6 45410.72259715102037508096
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3807
    5 45418.40724413220722311168
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3808
    4 45422.25021786898173001728
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3809
    3 45424.17186732298419044352
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3810
    2 45425.13273269940811464704
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3811
    1 45425.61317555035558641664
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3812
    0 45425.85339951654943850496
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3813
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3814
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3815
static png_uint_32
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3816
png_exp(png_fixed_point x)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3817
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3818
   if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3819
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3820
      /* Obtain a 4-bit approximation */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3821
      png_uint_32 e = png_32bit_exp[(x >> 12) & 0x0f];
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3822
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3823
      /* Incorporate the low 12 bits - these decrease the returned value by
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3824
       * multiplying by a number less than 1 if the bit is set.  The multiplier
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3825
       * is determined by the above table and the shift. Notice that the values
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3826
       * converge on 45426 and this is used to allow linear interpolation of the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3827
       * low bits.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3828
       */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3829
      if (x & 0x800)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3830
         e -= (((e >> 16) * 44938U) +  16U) >> 5;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3831
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3832
      if (x & 0x400)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3833
         e -= (((e >> 16) * 45181U) +  32U) >> 6;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3834
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3835
      if (x & 0x200)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3836
         e -= (((e >> 16) * 45303U) +  64U) >> 7;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3837
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3838
      if (x & 0x100)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3839
         e -= (((e >> 16) * 45365U) + 128U) >> 8;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3840
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3841
      if (x & 0x080)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3842
         e -= (((e >> 16) * 45395U) + 256U) >> 9;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3843
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3844
      if (x & 0x040)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3845
         e -= (((e >> 16) * 45410U) + 512U) >> 10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3846
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3847
      /* And handle the low 6 bits in a single block. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3848
      e -= (((e >> 16) * 355U * (x & 0x3fU)) + 256U) >> 9;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3849
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3850
      /* Handle the upper bits of x. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3851
      e >>= x >> 16;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3852
      return e;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3853
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3854
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3855
   /* Check for overflow */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3856
   if (x <= 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3857
      return png_32bit_exp[0];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3858
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3859
   /* Else underflow */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3860
   return 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3861
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3862
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3863
static png_byte
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3864
png_exp8bit(png_fixed_point lg2)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3865
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3866
   /* Get a 32-bit value: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3867
   png_uint_32 x = png_exp(lg2);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3868
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3869
   /* Convert the 32-bit value to 0..255 by multiplying by 256-1. Note that the
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3870
    * second, rounding, step can't overflow because of the first, subtraction,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3871
    * step.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3872
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3873
   x -= x >> 8;
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3874
   return (png_byte)(((x + 0x7fffffU) >> 24) & 0xff);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3875
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3876
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3877
#ifdef PNG_16BIT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3878
static png_uint_16
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3879
png_exp16bit(png_fixed_point lg2)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3880
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3881
   /* Get a 32-bit value: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3882
   png_uint_32 x = png_exp(lg2);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3883
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3884
   /* Convert the 32-bit value to 0..65535 by multiplying by 65536-1: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3885
   x -= x >> 16;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3886
   return (png_uint_16)((x + 32767U) >> 16);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3887
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3888
#endif /* 16BIT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3889
#endif /* FLOATING_ARITHMETIC */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3890
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3891
png_byte
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3892
png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3893
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3894
   if (value > 0 && value < 255)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3895
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3896
#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3897
         /* 'value' is unsigned, ANSI-C90 requires the compiler to correctly
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3898
          * convert this to a floating point value.  This includes values that
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3899
          * would overflow if 'value' were to be converted to 'int'.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3900
          *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3901
          * Apparently GCC, however, does an intermediate conversion to (int)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3902
          * on some (ARM) but not all (x86) platforms, possibly because of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3903
          * hardware FP limitations.  (E.g. if the hardware conversion always
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3904
          * assumes the integer register contains a signed value.)  This results
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3905
          * in ANSI-C undefined behavior for large values.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3906
          *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3907
          * Other implementations on the same machine might actually be ANSI-C90
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3908
          * conformant and therefore compile spurious extra code for the large
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3909
          * values.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3910
          *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3911
          * We can be reasonably sure that an unsigned to float conversion
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3912
          * won't be faster than an int to float one.  Therefore this code
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3913
          * assumes responsibility for the undefined behavior, which it knows
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3914
          * can't happen because of the check above.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3915
          *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3916
          * Note the argument to this routine is an (unsigned int) because, on
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3917
          * 16-bit platforms, it is assigned a value which might be out of
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3918
          * range for an (int); that would result in undefined behavior in the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3919
          * caller if the *argument* ('value') were to be declared (int).
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3920
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3921
         double r = floor(255*pow((int)/*SAFE*/value/255.,gamma_val*.00001)+.5);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3922
         return (png_byte)r;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3923
#     else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3924
         png_int_32 lg2 = png_log8bit(value);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3925
         png_fixed_point res;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3926
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3927
         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3928
            return png_exp8bit(res);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3929
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3930
         /* Overflow. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3931
         value = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3932
#     endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3933
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3934
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  3935
   return (png_byte)(value & 0xff);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3936
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3937
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3938
#ifdef PNG_16BIT_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3939
png_uint_16
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3940
png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3941
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3942
   if (value > 0 && value < 65535)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3943
   {
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3944
# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3945
      /* The same (unsigned int)->(double) constraints apply here as above,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3946
       * however in this case the (unsigned int) to (int) conversion can
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3947
       * overflow on an ANSI-C90 compliant system so the cast needs to ensure
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3948
       * that this is not possible.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3949
       */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3950
      double r = floor(65535*pow((png_int_32)value/65535.,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3951
          gamma_val*.00001)+.5);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3952
      return (png_uint_16)r;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3953
# else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3954
      png_int_32 lg2 = png_log16bit(value);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3955
      png_fixed_point res;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3956
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3957
      if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3958
         return png_exp16bit(res);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3959
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3960
      /* Overflow. */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3961
      value = 0;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  3962
# endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3963
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3964
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3965
   return (png_uint_16)value;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3966
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3967
#endif /* 16BIT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3968
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3969
/* This does the right thing based on the bit_depth field of the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3970
 * png_struct, interpreting values as 8-bit or 16-bit.  While the result
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3971
 * is nominally a 16-bit value if bit depth is 8 then the result is
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3972
 * 8-bit (as are the arguments.)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3973
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3974
png_uint_16 /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3975
png_gamma_correct(png_structrp png_ptr, unsigned int value,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3976
    png_fixed_point gamma_val)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3977
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3978
   if (png_ptr->bit_depth == 8)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3979
      return png_gamma_8bit_correct(value, gamma_val);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3980
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3981
#ifdef PNG_16BIT_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3982
   else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3983
      return png_gamma_16bit_correct(value, gamma_val);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3984
#else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3985
      /* should not reach this */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3986
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3987
#endif /* 16BIT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3988
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3989
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  3990
#ifdef PNG_16BIT_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3991
/* Internal function to build a single 16-bit table - the table consists of
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3992
 * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3993
 * to shift the input values right (or 16-number_of_signifiant_bits).
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3994
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3995
 * The caller is responsible for ensuring that the table gets cleaned up on
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3996
 * png_error (i.e. if one of the mallocs below fails) - i.e. the *table argument
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3997
 * should be somewhere that will be cleaned.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3998
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  3999
static void
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4000
png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4001
    unsigned int shift, png_fixed_point gamma_val)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4002
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4003
   /* Various values derived from 'shift': */
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4004
   unsigned int num = 1U << (8U - shift);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4005
#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4006
   /* CSE the division and work round wacky GCC warnings (see the comments
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4007
    * in png_gamma_8bit_correct for where these come from.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4008
    */
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4009
   double fmax = 1.0 / (((png_int_32)1 << (16U - shift)) - 1);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4010
#endif
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4011
   unsigned int max = (1U << (16U - shift)) - 1U;
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4012
   unsigned int max_by_2 = 1U << (15U - shift);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4013
   unsigned int i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4014
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4015
   png_uint_16pp table = *ptable =
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4016
       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4017
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4018
   for (i = 0; i < num; i++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4019
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4020
      png_uint_16p sub_table = table[i] =
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4021
          (png_uint_16p)png_malloc(png_ptr, 256 * (sizeof (png_uint_16)));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4022
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4023
      /* The 'threshold' test is repeated here because it can arise for one of
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4024
       * the 16-bit tables even if the others don't hit it.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4025
       */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4026
      if (png_gamma_significant(gamma_val) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4027
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4028
         /* The old code would overflow at the end and this would cause the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4029
          * 'pow' function to return a result >1, resulting in an
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4030
          * arithmetic error.  This code follows the spec exactly; ig is
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4031
          * the recovered input sample, it always has 8-16 bits.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4032
          *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4033
          * We want input * 65535/max, rounded, the arithmetic fits in 32
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4034
          * bits (unsigned) so long as max <= 32767.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4035
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4036
         unsigned int j;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4037
         for (j = 0; j < 256; j++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4038
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4039
            png_uint_32 ig = (j << (8-shift)) + i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4040
#           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4041
               /* Inline the 'max' scaling operation: */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4042
               /* See png_gamma_8bit_correct for why the cast to (int) is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4043
                * required here.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4044
                */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4045
               double d = floor(65535.*pow(ig*fmax, gamma_val*.00001)+.5);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4046
               sub_table[j] = (png_uint_16)d;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4047
#           else
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4048
               if (shift != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4049
                  ig = (ig * 65535U + max_by_2)/max;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4050
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4051
               sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4052
#           endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4053
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4054
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4055
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4056
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4057
         /* We must still build a table, but do it the fast way. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4058
         unsigned int j;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4059
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4060
         for (j = 0; j < 256; j++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4061
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4062
            png_uint_32 ig = (j << (8-shift)) + i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4063
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4064
            if (shift != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4065
               ig = (ig * 65535U + max_by_2)/max;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4066
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4067
            sub_table[j] = (png_uint_16)ig;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4068
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4069
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4070
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4071
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4072
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4073
/* NOTE: this function expects the *inverse* of the overall gamma transformation
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4074
 * required.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4075
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4076
static void
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4077
png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable,
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4078
    unsigned int shift, png_fixed_point gamma_val)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4079
{
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4080
   unsigned int num = 1U << (8U - shift);
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4081
   unsigned int max = (1U << (16U - shift))-1U;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4082
   unsigned int i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4083
   png_uint_32 last;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4084
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4085
   png_uint_16pp table = *ptable =
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4086
       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4087
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4088
   /* 'num' is the number of tables and also the number of low bits of low
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4089
    * bits of the input 16-bit value used to select a table.  Each table is
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4090
    * itself indexed by the high 8 bits of the value.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4091
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4092
   for (i = 0; i < num; i++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4093
      table[i] = (png_uint_16p)png_malloc(png_ptr,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4094
          256 * (sizeof (png_uint_16)));
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4095
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4096
   /* 'gamma_val' is set to the reciprocal of the value calculated above, so
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4097
    * pow(out,g) is an *input* value.  'last' is the last input value set.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4098
    *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4099
    * In the loop 'i' is used to find output values.  Since the output is
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4100
    * 8-bit there are only 256 possible values.  The tables are set up to
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4101
    * select the closest possible output value for each input by finding
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4102
    * the input value at the boundary between each pair of output values
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4103
    * and filling the table up to that boundary with the lower output
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4104
    * value.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4105
    *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4106
    * The boundary values are 0.5,1.5..253.5,254.5.  Since these are 9-bit
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4107
    * values the code below uses a 16-bit value in i; the values start at
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4108
    * 128.5 (for 0.5) and step by 257, for a total of 254 values (the last
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4109
    * entries are filled with 255).  Start i at 128 and fill all 'last'
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4110
    * table entries <= 'max'
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4111
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4112
   last = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4113
   for (i = 0; i < 255; ++i) /* 8-bit output value */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4114
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4115
      /* Find the corresponding maximum input value */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4116
      png_uint_16 out = (png_uint_16)(i * 257U); /* 16-bit output value */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4117
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4118
      /* Find the boundary value in 16 bits: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4119
      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma_val);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4120
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4121
      /* Adjust (round) to (16-shift) bits: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4122
      bound = (bound * max + 32768U)/65535U + 1U;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4123
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4124
      while (last < bound)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4125
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4126
         table[last & (0xffU >> shift)][last >> (8U - shift)] = out;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4127
         last++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4128
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4129
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4130
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4131
   /* And fill in the final entries. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4132
   while (last < (num << 8))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4133
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4134
      table[last & (0xff >> shift)][last >> (8U - shift)] = 65535U;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4135
      last++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4136
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4137
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4138
#endif /* 16BIT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4139
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4140
/* Build a single 8-bit table: same as the 16-bit case but much simpler (and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4141
 * typically much faster).  Note that libpng currently does no sBIT processing
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4142
 * (apparently contrary to the spec) so a 256-entry table is always generated.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4143
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4144
static void
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4145
png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 55712
diff changeset
  4146
    png_fixed_point gamma_val)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4147
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4148
   unsigned int i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4149
   png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4150
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4151
   if (png_gamma_significant(gamma_val) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4152
      for (i=0; i<256; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4153
         table[i] = png_gamma_8bit_correct(i, gamma_val);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4154
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4155
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4156
      for (i=0; i<256; ++i)
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  4157
         table[i] = (png_byte)(i & 0xff);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4158
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4159
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4160
/* Used from png_read_destroy and below to release the memory used by the gamma
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4161
 * tables.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4162
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4163
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4164
png_destroy_gamma_table(png_structrp png_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4165
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4166
   png_free(png_ptr, png_ptr->gamma_table);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4167
   png_ptr->gamma_table = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4168
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4169
#ifdef PNG_16BIT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4170
   if (png_ptr->gamma_16_table != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4171
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4172
      int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4173
      int istop = (1 << (8 - png_ptr->gamma_shift));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4174
      for (i = 0; i < istop; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4175
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4176
         png_free(png_ptr, png_ptr->gamma_16_table[i]);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4177
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4178
   png_free(png_ptr, png_ptr->gamma_16_table);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4179
   png_ptr->gamma_16_table = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4180
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4181
#endif /* 16BIT */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4182
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4183
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4184
   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4185
   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4186
   png_free(png_ptr, png_ptr->gamma_from_1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4187
   png_ptr->gamma_from_1 = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4188
   png_free(png_ptr, png_ptr->gamma_to_1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4189
   png_ptr->gamma_to_1 = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4190
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4191
#ifdef PNG_16BIT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4192
   if (png_ptr->gamma_16_from_1 != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4193
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4194
      int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4195
      int istop = (1 << (8 - png_ptr->gamma_shift));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4196
      for (i = 0; i < istop; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4197
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4198
         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4199
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4200
   png_free(png_ptr, png_ptr->gamma_16_from_1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4201
   png_ptr->gamma_16_from_1 = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4202
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4203
   if (png_ptr->gamma_16_to_1 != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4204
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4205
      int i;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4206
      int istop = (1 << (8 - png_ptr->gamma_shift));
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4207
      for (i = 0; i < istop; i++)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4208
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4209
         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4210
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4211
   png_free(png_ptr, png_ptr->gamma_16_to_1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4212
   png_ptr->gamma_16_to_1 = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4213
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4214
#endif /* 16BIT */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4215
#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4216
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4217
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4218
/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4219
 * tables, we don't make a full table if we are reducing to 8-bit in
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4220
 * the future.  Note also how the gamma_16 tables are segmented so that
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4221
 * we don't need to allocate > 64K chunks for a full 16-bit table.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4222
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4223
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4224
png_build_gamma_table(png_structrp png_ptr, int bit_depth)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4225
{
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4226
   png_debug(1, "in png_build_gamma_table");
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4227
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4228
   /* Remove any existing table; this copes with multiple calls to
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4229
    * png_read_update_info. The warning is because building the gamma tables
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4230
    * multiple times is a performance hit - it's harmless but the ability to
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4231
    * call png_read_update_info() multiple times is new in 1.5.6 so it seems
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4232
    * sensible to warn if the app introduces such a hit.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4233
    */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4234
   if (png_ptr->gamma_table != NULL || png_ptr->gamma_16_table != NULL)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4235
   {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4236
      png_warning(png_ptr, "gamma table being rebuilt");
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4237
      png_destroy_gamma_table(png_ptr);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4238
   }
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4239
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4240
   if (bit_depth <= 8)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4241
   {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4242
      png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4243
          png_ptr->screen_gamma > 0 ?
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4244
          png_reciprocal2(png_ptr->colorspace.gamma,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4245
          png_ptr->screen_gamma) : PNG_FP_1);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4246
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4247
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4248
   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4249
   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4250
      if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4251
      {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4252
         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4253
             png_reciprocal(png_ptr->colorspace.gamma));
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4254
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4255
         png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4256
             png_ptr->screen_gamma > 0 ?
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4257
             png_reciprocal(png_ptr->screen_gamma) :
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4258
             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4259
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4260
#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4261
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4262
#ifdef PNG_16BIT_SUPPORTED
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4263
   else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4264
   {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4265
      png_byte shift, sig_bit;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4266
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4267
      if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4268
      {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4269
         sig_bit = png_ptr->sig_bit.red;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4270
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4271
         if (png_ptr->sig_bit.green > sig_bit)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4272
            sig_bit = png_ptr->sig_bit.green;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4273
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4274
         if (png_ptr->sig_bit.blue > sig_bit)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4275
            sig_bit = png_ptr->sig_bit.blue;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4276
      }
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4277
      else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4278
         sig_bit = png_ptr->sig_bit.gray;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4279
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4280
      /* 16-bit gamma code uses this equation:
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4281
       *
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4282
       *   ov = table[(iv & 0xff) >> gamma_shift][iv >> 8]
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4283
       *
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4284
       * Where 'iv' is the input color value and 'ov' is the output value -
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4285
       * pow(iv, gamma).
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4286
       *
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4287
       * Thus the gamma table consists of up to 256 256-entry tables.  The table
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4288
       * is selected by the (8-gamma_shift) most significant of the low 8 bits
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4289
       * of the color value then indexed by the upper 8 bits:
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4290
       *
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4291
       *   table[low bits][high 8 bits]
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4292
       *
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4293
       * So the table 'n' corresponds to all those 'iv' of:
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4294
       *
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4295
       *   <all high 8-bit values><n << gamma_shift>..<(n+1 << gamma_shift)-1>
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4296
       *
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4297
       */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4298
      if (sig_bit > 0 && sig_bit < 16U)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4299
         /* shift == insignificant bits */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4300
         shift = (png_byte)((16U - sig_bit) & 0xff);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4301
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4302
      else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4303
         shift = 0; /* keep all 16 bits */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4304
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4305
      if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4306
      {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4307
         /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4308
          * the significant bits in the *input* when the output will
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4309
          * eventually be 8 bits.  By default it is 11.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4310
          */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4311
         if (shift < (16U - PNG_MAX_GAMMA_8))
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4312
            shift = (16U - PNG_MAX_GAMMA_8);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4313
      }
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4314
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4315
      if (shift > 8U)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4316
         shift = 8U; /* Guarantees at least one table! */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4317
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4318
      png_ptr->gamma_shift = shift;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4319
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4320
      /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4321
       * PNG_COMPOSE).  This effectively smashed the background calculation for
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4322
       * 16-bit output because the 8-bit table assumes the result will be
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4323
       * reduced to 8 bits.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4324
       */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4325
      if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4326
          png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4327
          png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4328
          png_ptr->screen_gamma) : PNG_FP_1);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4329
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4330
      else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4331
          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4332
          png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4333
          png_ptr->screen_gamma) : PNG_FP_1);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4334
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4335
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4336
   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4337
   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4338
      if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4339
      {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4340
         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4341
             png_reciprocal(png_ptr->colorspace.gamma));
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4342
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4343
         /* Notice that the '16 from 1' table should be full precision, however
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4344
          * the lookup on this table still uses gamma_shift, so it can't be.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4345
          * TODO: fix this.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4346
          */
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4347
         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4348
             png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4349
             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4350
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4351
#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4352
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4353
#endif /* 16BIT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4354
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  4355
#endif /* READ_GAMMA */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4356
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4357
/* HARDWARE OR SOFTWARE OPTION SUPPORT */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4358
#ifdef PNG_SET_OPTION_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4359
int PNGAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4360
png_set_option(png_structrp png_ptr, int option, int onoff)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4361
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4362
   if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4363
      (option & 1) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4364
   {
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  4365
      png_uint_32 mask = 3U << option;
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  4366
      png_uint_32 setting = (2U + (onoff != 0)) << option;
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4367
      png_uint_32 current = png_ptr->options;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  4368
51304
66d9993dd4ad 8208353: Upgrade JDK 11 to libpng 1.6.35
prr
parents: 48280
diff changeset
  4369
      png_ptr->options = (png_uint_32)((current & ~mask) | setting);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4370
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  4371
      return (int)(current & mask) >> option;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4372
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4373
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4374
   return PNG_OPTION_INVALID;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4375
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4376
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4377
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4378
/* sRGB support */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4379
#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4380
   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4381
/* sRGB conversion tables; these are machine generated with the code in
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4382
 * contrib/tools/makesRGB.c.  The actual sRGB transfer curve defined in the
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
  4383
 * specification (see the article at https://en.wikipedia.org/wiki/SRGB)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4384
 * is used, not the gamma=1/2.2 approximation use elsewhere in libpng.
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  4385
 * The sRGB to linear table is exact (to the nearest 16-bit linear fraction).
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4386
 * The inverse (linear to sRGB) table has accuracies as follows:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4387
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4388
 * For all possible (255*65535+1) input values:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4389
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4390
 *    error: -0.515566 - 0.625971, 79441 (0.475369%) of readings inexact
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4391
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4392
 * For the input values corresponding to the 65536 16-bit values:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4393
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4394
 *    error: -0.513727 - 0.607759, 308 (0.469978%) of readings inexact
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4395
 *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4396
 * In all cases the inexact readings are only off by one.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4397
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4398
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4399
#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4400
/* The convert-to-sRGB table is only currently required for read. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4401
const png_uint_16 png_sRGB_table[256] =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4402
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4403
   0,20,40,60,80,99,119,139,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4404
   159,179,199,219,241,264,288,313,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4405
   340,367,396,427,458,491,526,562,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4406
   599,637,677,718,761,805,851,898,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4407
   947,997,1048,1101,1156,1212,1270,1330,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4408
   1391,1453,1517,1583,1651,1720,1790,1863,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4409
   1937,2013,2090,2170,2250,2333,2418,2504,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4410
   2592,2681,2773,2866,2961,3058,3157,3258,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4411
   3360,3464,3570,3678,3788,3900,4014,4129,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4412
   4247,4366,4488,4611,4736,4864,4993,5124,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4413
   5257,5392,5530,5669,5810,5953,6099,6246,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4414
   6395,6547,6700,6856,7014,7174,7335,7500,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4415
   7666,7834,8004,8177,8352,8528,8708,8889,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4416
   9072,9258,9445,9635,9828,10022,10219,10417,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4417
   10619,10822,11028,11235,11446,11658,11873,12090,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4418
   12309,12530,12754,12980,13209,13440,13673,13909,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4419
   14146,14387,14629,14874,15122,15371,15623,15878,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4420
   16135,16394,16656,16920,17187,17456,17727,18001,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4421
   18277,18556,18837,19121,19407,19696,19987,20281,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4422
   20577,20876,21177,21481,21787,22096,22407,22721,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4423
   23038,23357,23678,24002,24329,24658,24990,25325,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4424
   25662,26001,26344,26688,27036,27386,27739,28094,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4425
   28452,28813,29176,29542,29911,30282,30656,31033,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4426
   31412,31794,32179,32567,32957,33350,33745,34143,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4427
   34544,34948,35355,35764,36176,36591,37008,37429,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4428
   37852,38278,38706,39138,39572,40009,40449,40891,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4429
   41337,41785,42236,42690,43147,43606,44069,44534,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4430
   45002,45473,45947,46423,46903,47385,47871,48359,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4431
   48850,49344,49841,50341,50844,51349,51858,52369,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4432
   52884,53401,53921,54445,54971,55500,56032,56567,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4433
   57105,57646,58190,58737,59287,59840,60396,60955,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4434
   61517,62082,62650,63221,63795,64372,64952,65535
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4435
};
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4436
#endif /* SIMPLIFIED_READ */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4437
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4438
/* The base/delta tables are required for both read and write (but currently
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4439
 * only the simplified versions.)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4440
 */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4441
const png_uint_16 png_sRGB_base[512] =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4442
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4443
   128,1782,3383,4644,5675,6564,7357,8074,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4444
   8732,9346,9921,10463,10977,11466,11935,12384,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4445
   12816,13233,13634,14024,14402,14769,15125,15473,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4446
   15812,16142,16466,16781,17090,17393,17690,17981,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4447
   18266,18546,18822,19093,19359,19621,19879,20133,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4448
   20383,20630,20873,21113,21349,21583,21813,22041,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4449
   22265,22487,22707,22923,23138,23350,23559,23767,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4450
   23972,24175,24376,24575,24772,24967,25160,25352,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4451
   25542,25730,25916,26101,26284,26465,26645,26823,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4452
   27000,27176,27350,27523,27695,27865,28034,28201,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4453
   28368,28533,28697,28860,29021,29182,29341,29500,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4454
   29657,29813,29969,30123,30276,30429,30580,30730,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4455
   30880,31028,31176,31323,31469,31614,31758,31902,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4456
   32045,32186,32327,32468,32607,32746,32884,33021,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4457
   33158,33294,33429,33564,33697,33831,33963,34095,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4458
   34226,34357,34486,34616,34744,34873,35000,35127,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4459
   35253,35379,35504,35629,35753,35876,35999,36122,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4460
   36244,36365,36486,36606,36726,36845,36964,37083,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4461
   37201,37318,37435,37551,37668,37783,37898,38013,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4462
   38127,38241,38354,38467,38580,38692,38803,38915,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4463
   39026,39136,39246,39356,39465,39574,39682,39790,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4464
   39898,40005,40112,40219,40325,40431,40537,40642,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4465
   40747,40851,40955,41059,41163,41266,41369,41471,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4466
   41573,41675,41777,41878,41979,42079,42179,42279,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4467
   42379,42478,42577,42676,42775,42873,42971,43068,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4468
   43165,43262,43359,43456,43552,43648,43743,43839,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4469
   43934,44028,44123,44217,44311,44405,44499,44592,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4470
   44685,44778,44870,44962,45054,45146,45238,45329,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4471
   45420,45511,45601,45692,45782,45872,45961,46051,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4472
   46140,46229,46318,46406,46494,46583,46670,46758,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4473
   46846,46933,47020,47107,47193,47280,47366,47452,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4474
   47538,47623,47709,47794,47879,47964,48048,48133,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4475
   48217,48301,48385,48468,48552,48635,48718,48801,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4476
   48884,48966,49048,49131,49213,49294,49376,49458,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4477
   49539,49620,49701,49782,49862,49943,50023,50103,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4478
   50183,50263,50342,50422,50501,50580,50659,50738,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4479
   50816,50895,50973,51051,51129,51207,51285,51362,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4480
   51439,51517,51594,51671,51747,51824,51900,51977,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4481
   52053,52129,52205,52280,52356,52432,52507,52582,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4482
   52657,52732,52807,52881,52956,53030,53104,53178,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4483
   53252,53326,53400,53473,53546,53620,53693,53766,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4484
   53839,53911,53984,54056,54129,54201,54273,54345,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4485
   54417,54489,54560,54632,54703,54774,54845,54916,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4486
   54987,55058,55129,55199,55269,55340,55410,55480,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4487
   55550,55620,55689,55759,55828,55898,55967,56036,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4488
   56105,56174,56243,56311,56380,56448,56517,56585,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4489
   56653,56721,56789,56857,56924,56992,57059,57127,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4490
   57194,57261,57328,57395,57462,57529,57595,57662,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4491
   57728,57795,57861,57927,57993,58059,58125,58191,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4492
   58256,58322,58387,58453,58518,58583,58648,58713,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4493
   58778,58843,58908,58972,59037,59101,59165,59230,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4494
   59294,59358,59422,59486,59549,59613,59677,59740,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4495
   59804,59867,59930,59993,60056,60119,60182,60245,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4496
   60308,60370,60433,60495,60558,60620,60682,60744,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4497
   60806,60868,60930,60992,61054,61115,61177,61238,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4498
   61300,61361,61422,61483,61544,61605,61666,61727,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4499
   61788,61848,61909,61969,62030,62090,62150,62211,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4500
   62271,62331,62391,62450,62510,62570,62630,62689,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4501
   62749,62808,62867,62927,62986,63045,63104,63163,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4502
   63222,63281,63340,63398,63457,63515,63574,63632,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4503
   63691,63749,63807,63865,63923,63981,64039,64097,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4504
   64155,64212,64270,64328,64385,64443,64500,64557,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4505
   64614,64672,64729,64786,64843,64900,64956,65013,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4506
   65070,65126,65183,65239,65296,65352,65409,65465
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4507
};
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4508
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4509
const png_byte png_sRGB_delta[512] =
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4510
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4511
   207,201,158,129,113,100,90,82,77,72,68,64,61,59,56,54,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4512
   52,50,49,47,46,45,43,42,41,40,39,39,38,37,36,36,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4513
   35,34,34,33,33,32,32,31,31,30,30,30,29,29,28,28,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4514
   28,27,27,27,27,26,26,26,25,25,25,25,24,24,24,24,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4515
   23,23,23,23,23,22,22,22,22,22,22,21,21,21,21,21,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4516
   21,20,20,20,20,20,20,20,20,19,19,19,19,19,19,19,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4517
   19,18,18,18,18,18,18,18,18,18,18,17,17,17,17,17,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4518
   17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4519
   16,16,16,16,15,15,15,15,15,15,15,15,15,15,15,15,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4520
   15,15,15,15,14,14,14,14,14,14,14,14,14,14,14,14,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4521
   14,14,14,14,14,14,14,13,13,13,13,13,13,13,13,13,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4522
   13,13,13,13,13,13,13,13,13,13,13,13,13,13,12,12,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4523
   12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4524
   12,12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4525
   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4526
   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4527
   11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4528
   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4529
   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4530
   10,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4531
   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4532
   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4533
   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4534
   9,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4535
   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4536
   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4537
   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4538
   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4539
   8,8,8,8,8,8,8,8,8,7,7,7,7,7,7,7,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4540
   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4541
   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4542
   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4543
};
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4544
#endif /* SIMPLIFIED READ/WRITE sRGB support */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4545
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4546
/* SIMPLIFIED READ/WRITE SUPPORT */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4547
#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4548
   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4549
static int
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4550
png_image_free_function(png_voidp argument)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4551
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4552
   png_imagep image = png_voidcast(png_imagep, argument);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4553
   png_controlp cp = image->opaque;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4554
   png_control c;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4555
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4556
   /* Double check that we have a png_ptr - it should be impossible to get here
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4557
    * without one.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4558
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4559
   if (cp->png_ptr == NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4560
      return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4561
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4562
   /* First free any data held in the control structure. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4563
#  ifdef PNG_STDIO_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4564
      if (cp->owned_file != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4565
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4566
         FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4567
         cp->owned_file = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4568
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4569
         /* Ignore errors here. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4570
         if (fp != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4571
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4572
            cp->png_ptr->io_ptr = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4573
            (void)fclose(fp);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4574
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4575
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4576
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4577
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4578
   /* Copy the control structure so that the original, allocated, version can be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4579
    * safely freed.  Notice that a png_error here stops the remainder of the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4580
    * cleanup, but this is probably fine because that would indicate bad memory
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4581
    * problems anyway.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4582
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4583
   c = *cp;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4584
   image->opaque = &c;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4585
   png_free(c.png_ptr, cp);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4586
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4587
   /* Then the structures, calling the correct API. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4588
   if (c.for_write != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4589
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4590
#     ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4591
         png_destroy_write_struct(&c.png_ptr, &c.info_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4592
#     else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4593
         png_error(c.png_ptr, "simplified write not supported");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4594
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4595
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4596
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4597
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4598
#     ifdef PNG_SIMPLIFIED_READ_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4599
         png_destroy_read_struct(&c.png_ptr, &c.info_ptr, NULL);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4600
#     else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4601
         png_error(c.png_ptr, "simplified read not supported");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4602
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4603
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4604
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4605
   /* Success. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4606
   return 1;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4607
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4608
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4609
void PNGAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4610
png_image_free(png_imagep image)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4611
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4612
   /* Safely call the real function, but only if doing so is safe at this point
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4613
    * (if not inside an error handling context).  Otherwise assume
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4614
    * png_safe_execute will call this API after the return.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4615
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4616
   if (image != NULL && image->opaque != NULL &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4617
      image->opaque->error_buf == NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4618
   {
55712
107c8ea4f7c8 8218876: Improve PNG support options
serb
parents: 51304
diff changeset
  4619
      png_image_free_function(image);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4620
      image->opaque = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4621
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4622
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4623
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4624
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4625
png_image_error(png_imagep image, png_const_charp error_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4626
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4627
   /* Utility to log an error. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4628
   png_safecat(image->message, (sizeof image->message), 0, error_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4629
   image->warning_or_error |= PNG_IMAGE_ERROR;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4630
   png_image_free(image);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4631
   return 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4632
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4633
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4634
#endif /* SIMPLIFIED READ/WRITE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  4635
#endif /* READ || WRITE */