src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
author serb
Wed, 12 Jun 2019 13:50:37 -0700
changeset 57618 53154e45385a
parent 48280 791d551bcdb8
permissions -rw-r--r--
8217676: Upgrade libpng to 1.6.37 Reviewed-by: prr, jdv, kcr
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
/* pngerror.c - stub functions for i/o and memory allocation
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: 48280
diff changeset
    32
 * Copyright (c) 2018 Cosmin Truta
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    33
 * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 48280
diff changeset
    34
 * Copyright (c) 1996-1997 Andreas Dilger
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 48280
diff changeset
    35
 * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
 *
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    37
 * This code is released under the libpng license.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    38
 * For conditions of distribution and use, see the disclaimer
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    39
 * and license in png.h
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    40
 *
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
 * This file provides a location for all error handling.  Users who
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
 * need special error handling are expected to write replacement functions
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
 * and use png_set_error_fn() to use those functions.  See the instructions
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
 * at each function.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    47
#include "pngpriv.h"
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    50
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    51
static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    52
    png_const_charp error_message)),PNG_NORETURN);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    53
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    54
#ifdef PNG_WARNINGS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
static void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    56
png_default_warning PNGARG((png_const_structrp png_ptr,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
    57
    png_const_charp warning_message));
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    58
#endif /* WARNINGS */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
/* This function is called whenever there is a fatal error.  This function
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
 * should not be changed.  If there is a need to handle errors differently,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
 * you should supply a replacement error function and use png_set_error_fn()
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
 * to replace the error function at run-time.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
 */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    65
#ifdef PNG_ERROR_TEXT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    66
PNG_FUNCTION(void,PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    67
png_error,(png_const_structrp png_ptr, png_const_charp error_message),
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
    68
    PNG_NORETURN)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
   char msg[16];
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
   if (png_ptr != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    74
      if ((png_ptr->flags &
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 29913
diff changeset
    75
         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    76
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    77
         if (*error_message == PNG_LITERAL_SHARP)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    78
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    79
            /* Strip "#nnnn " from beginning of error message. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    80
            int offset;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    81
            for (offset = 1; offset<15; offset++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    82
               if (error_message[offset] == ' ')
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
                  break;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    84
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    85
            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    86
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    87
               int i;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    88
               for (i = 0; i < offset - 1; i++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    89
                  msg[i] = error_message[i + 1];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    90
               msg[i - 1] = '\0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    91
               error_message = msg;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    92
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    93
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    94
            else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    95
               error_message += offset;
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
    96
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    97
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
    98
         else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    99
         {
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   100
            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   101
            {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   102
               msg[0] = '0';
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   103
               msg[1] = '\0';
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   104
               error_message = msg;
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   105
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   106
         }
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   107
      }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   108
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
#endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
   if (png_ptr != NULL && png_ptr->error_fn != NULL)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   111
      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr),
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   112
          error_message);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
   /* If the custom handler doesn't exist, or if it returns,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
      use the default handler, which will not return. */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
   png_default_error(png_ptr, error_message);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
}
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   118
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   119
PNG_FUNCTION(void,PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   120
png_err,(png_const_structrp png_ptr),PNG_NORETURN)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   121
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   122
   /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   123
    * erroneously as '\0', instead of the empty string "".  This was
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   124
    * apparently an error, introduced in libpng-1.2.20, and png_default_error
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   125
    * will crash in this case.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   126
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   127
   if (png_ptr != NULL && png_ptr->error_fn != NULL)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   128
      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr), "");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   130
   /* If the custom handler doesn't exist, or if it returns,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   131
      use the default handler, which will not return. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   132
   png_default_error(png_ptr, "");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   133
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   134
#endif /* ERROR_TEXT */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   135
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   136
/* Utility to safely appends strings to a buffer.  This never errors out so
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   137
 * error checking is not required in the caller.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   138
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   139
size_t
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   140
png_safecat(png_charp buffer, size_t bufsize, size_t pos,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   141
    png_const_charp string)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   142
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   143
   if (buffer != NULL && pos < bufsize)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   144
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   145
      if (string != NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   146
         while (*string != '\0' && pos < bufsize-1)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   147
           buffer[pos++] = *string++;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   148
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   149
      buffer[pos] = '\0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   150
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   151
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   152
   return pos;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   153
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   154
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   155
#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   156
/* Utility to dump an unsigned value into a buffer, given a start pointer and
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   157
 * and end pointer (which should point just *beyond* the end of the buffer!)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   158
 * Returns the pointer to the start of the formatted string.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   159
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   160
png_charp
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   161
png_format_number(png_const_charp start, png_charp end, int format,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   162
    png_alloc_size_t number)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   163
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   164
   int count = 0;    /* number of digits output */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   165
   int mincount = 1; /* minimum number required */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   166
   int output = 0;   /* digit output (for the fixed point format) */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   167
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   168
   *--end = '\0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   169
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   170
   /* This is written so that the loop always runs at least once, even with
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   171
    * number zero.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   172
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   173
   while (end > start && (number != 0 || count < mincount))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   174
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   175
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   176
      static const char digits[] = "0123456789ABCDEF";
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   177
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   178
      switch (format)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   179
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   180
         case PNG_NUMBER_FORMAT_fixed:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   181
            /* Needs five digits (the fraction) */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   182
            mincount = 5;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   183
            if (output != 0 || number % 10 != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   184
            {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   185
               *--end = digits[number % 10];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   186
               output = 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   187
            }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   188
            number /= 10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   189
            break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   190
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   191
         case PNG_NUMBER_FORMAT_02u:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   192
            /* Expects at least 2 digits. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   193
            mincount = 2;
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   194
            /* FALLTHROUGH */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   195
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   196
         case PNG_NUMBER_FORMAT_u:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   197
            *--end = digits[number % 10];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   198
            number /= 10;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   199
            break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   200
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   201
         case PNG_NUMBER_FORMAT_02x:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   202
            /* This format expects at least two digits */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   203
            mincount = 2;
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   204
            /* FALLTHROUGH */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   205
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   206
         case PNG_NUMBER_FORMAT_x:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   207
            *--end = digits[number & 0xf];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   208
            number >>= 4;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   209
            break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   210
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   211
         default: /* an error */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   212
            number = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   213
            break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   214
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   215
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   216
      /* Keep track of the number of digits added */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   217
      ++count;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   218
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   219
      /* Float a fixed number here: */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   220
      if ((format == PNG_NUMBER_FORMAT_fixed) && (count == 5) && (end > start))
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   221
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   222
         /* End of the fraction, but maybe nothing was output?  In that case
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   223
          * drop the decimal point.  If the number is a true zero handle that
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   224
          * here.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   225
          */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   226
         if (output != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   227
            *--end = '.';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   228
         else if (number == 0) /* and !output */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   229
            *--end = '0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   230
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   231
   }
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
   return end;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   234
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   235
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   236
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   237
#ifdef PNG_WARNINGS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   238
/* This function is called whenever there is a non-fatal error.  This function
90ce3da70b43 Initial load
duke
parents:
diff changeset
   239
 * should not be changed.  If there is a need to handle warnings differently,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   240
 * you should supply a replacement warning function and use
90ce3da70b43 Initial load
duke
parents:
diff changeset
   241
 * png_set_error_fn() to replace the warning function at run-time.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   242
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   243
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   244
png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   245
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   246
   int offset = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   247
   if (png_ptr != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   248
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   249
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   250
   if ((png_ptr->flags &
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   251
       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   252
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   253
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   254
         if (*warning_message == PNG_LITERAL_SHARP)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   255
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   256
            for (offset = 1; offset < 15; offset++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   257
               if (warning_message[offset] == ' ')
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   258
                  break;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   259
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   260
      }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   261
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   262
   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   263
      (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   264
          warning_message + offset);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   265
   else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   266
      png_default_warning(png_ptr, warning_message + offset);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   267
}
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
/* These functions support 'formatted' warning messages with up to
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   270
 * PNG_WARNING_PARAMETER_COUNT parameters.  In the format string the parameter
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   271
 * is introduced by @<number>, where 'number' starts at 1.  This follows the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   272
 * standard established by X/Open for internationalizable error messages.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   273
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   274
void
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   275
png_warning_parameter(png_warning_parameters p, int number,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   276
    png_const_charp string)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   277
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   278
   if (number > 0 && number <= PNG_WARNING_PARAMETER_COUNT)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   279
      (void)png_safecat(p[number-1], (sizeof p[number-1]), 0, string);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   280
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   281
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   282
void
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   283
png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   284
    png_alloc_size_t value)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   285
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   286
   char buffer[PNG_NUMBER_BUFFER_SIZE];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   287
   png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   288
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   289
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   290
void
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   291
png_warning_parameter_signed(png_warning_parameters p, int number, int format,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   292
    png_int_32 value)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   293
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   294
   png_alloc_size_t u;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   295
   png_charp str;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   296
   char buffer[PNG_NUMBER_BUFFER_SIZE];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   297
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   298
   /* Avoid overflow by doing the negate in a png_alloc_size_t: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   299
   u = (png_alloc_size_t)value;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   300
   if (value < 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   301
      u = ~u + 1;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   302
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   303
   str = PNG_FORMAT_NUMBER(buffer, format, u);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   304
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   305
   if (value < 0 && str > buffer)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   306
      *--str = '-';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   307
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   308
   png_warning_parameter(p, number, str);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   309
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   310
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   311
void
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   312
png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   313
    png_const_charp message)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   314
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   315
   /* The internal buffer is just 192 bytes - enough for all our messages,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   316
    * overflow doesn't happen because this code checks!  If someone figures
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   317
    * out how to send us a message longer than 192 bytes, all that will
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   318
    * happen is that the message will be truncated appropriately.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   319
    */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   320
   size_t i = 0; /* Index in the msg[] buffer: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   321
   char msg[192];
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   322
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   323
   /* Each iteration through the following loop writes at most one character
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   324
    * to msg[i++] then returns here to validate that there is still space for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   325
    * the trailing '\0'.  It may (in the case of a parameter) read more than
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   326
    * one character from message[]; it must check for '\0' and continue to the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   327
    * test if it finds the end of string.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   328
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   329
   while (i<(sizeof msg)-1 && *message != '\0')
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   330
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   331
      /* '@' at end of string is now just printed (previously it was skipped);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   332
       * it is an error in the calling code to terminate the string with @.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   333
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   334
      if (p != NULL && *message == '@' && message[1] != '\0')
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   335
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   336
         int parameter_char = *++message; /* Consume the '@' */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   337
         static const char valid_parameters[] = "123456789";
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   338
         int parameter = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   339
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   340
         /* Search for the parameter digit, the index in the string is the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   341
          * parameter to use.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   342
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   343
         while (valid_parameters[parameter] != parameter_char &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   344
            valid_parameters[parameter] != '\0')
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   345
            ++parameter;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   346
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   347
         /* If the parameter digit is out of range it will just get printed. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   348
         if (parameter < PNG_WARNING_PARAMETER_COUNT)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   349
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   350
            /* Append this parameter */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   351
            png_const_charp parm = p[parameter];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   352
            png_const_charp pend = p[parameter] + (sizeof p[parameter]);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   353
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   354
            /* No need to copy the trailing '\0' here, but there is no guarantee
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   355
             * that parm[] has been initialized, so there is no guarantee of a
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   356
             * trailing '\0':
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   357
             */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   358
            while (i<(sizeof msg)-1 && *parm != '\0' && parm < pend)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   359
               msg[i++] = *parm++;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   360
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   361
            /* Consume the parameter digit too: */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   362
            ++message;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   363
            continue;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   364
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   365
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   366
         /* else not a parameter and there is a character after the @ sign; just
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   367
          * copy that.  This is known not to be '\0' because of the test above.
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   368
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   369
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   370
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   371
      /* At this point *message can't be '\0', even in the bad parameter case
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   372
       * above where there is a lone '@' at the end of the message string.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   373
       */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   374
      msg[i++] = *message++;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   375
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   376
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   377
   /* i is always less than (sizeof msg), so: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   378
   msg[i] = '\0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   379
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   380
   /* And this is the formatted message. It may be larger than
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   381
    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   382
    * are not (currently) formatted.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   383
    */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   384
   png_warning(png_ptr, msg);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   385
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   386
#endif /* WARNINGS */
10576
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
#ifdef PNG_BENIGN_ERRORS_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   389
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   390
png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   391
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   392
   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   393
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   394
#     ifdef PNG_READ_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   395
         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   396
            png_ptr->chunk_name != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   397
            png_chunk_warning(png_ptr, error_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   398
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   399
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   400
      png_warning(png_ptr, error_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   401
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   402
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   403
   else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   404
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   405
#     ifdef PNG_READ_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   406
         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   407
            png_ptr->chunk_name != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   408
            png_chunk_error(png_ptr, error_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   409
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   410
#     endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   411
      png_error(png_ptr, error_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   412
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   413
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   414
#  ifndef PNG_ERROR_TEXT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   415
      PNG_UNUSED(error_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   416
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   417
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   418
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   419
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   420
png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   421
{
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   422
   if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   423
      png_warning(png_ptr, error_message);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   424
   else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   425
      png_error(png_ptr, error_message);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   426
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   427
#  ifndef PNG_ERROR_TEXT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   428
      PNG_UNUSED(error_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   429
#  endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   430
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   431
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   432
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   433
png_app_error(png_const_structrp png_ptr, png_const_charp error_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   434
{
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   435
   if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   436
      png_warning(png_ptr, error_message);
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   437
   else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   438
      png_error(png_ptr, error_message);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   439
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   440
#  ifndef PNG_ERROR_TEXT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   441
      PNG_UNUSED(error_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   442
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   443
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   444
#endif /* BENIGN_ERRORS */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   445
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   446
#define PNG_MAX_ERROR_TEXT 196 /* Currently limited by profile_error in png.c */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   447
#if defined(PNG_WARNINGS_SUPPORTED) || \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   448
   (defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED))
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   449
/* These utilities are used internally to build an error message that relates
90ce3da70b43 Initial load
duke
parents:
diff changeset
   450
 * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   451
 * which is used to prefix the message.  The message is limited in length
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   452
 * to 63 bytes. The name characters are output as hex digits wrapped in []
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   453
 * if the character is invalid.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   454
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   455
#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 48280
diff changeset
   456
static const char png_digit[16] = {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   457
   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
90ce3da70b43 Initial load
duke
parents:
diff changeset
   458
   'A', 'B', 'C', 'D', 'E', 'F'
90ce3da70b43 Initial load
duke
parents:
diff changeset
   459
};
90ce3da70b43 Initial load
duke
parents:
diff changeset
   460
90ce3da70b43 Initial load
duke
parents:
diff changeset
   461
static void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   462
png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   463
    error_message)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   464
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   465
   png_uint_32 chunk_name = png_ptr->chunk_name;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   466
   int iout = 0, ishift = 24;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   467
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   468
   while (ishift >= 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   469
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   470
      int c = (int)(chunk_name >> ishift) & 0xff;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   471
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   472
      ishift -= 8;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   473
      if (isnonalpha(c) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   474
      {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   475
         buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   476
         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
90ce3da70b43 Initial load
duke
parents:
diff changeset
   477
         buffer[iout++] = png_digit[c & 0x0f];
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   478
         buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   479
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   480
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   481
      else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   482
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   483
         buffer[iout++] = (char)c;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   484
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   485
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   486
90ce3da70b43 Initial load
duke
parents:
diff changeset
   487
   if (error_message == NULL)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   488
      buffer[iout] = '\0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   489
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   490
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   491
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   492
      int iin = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   493
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   494
      buffer[iout++] = ':';
90ce3da70b43 Initial load
duke
parents:
diff changeset
   495
      buffer[iout++] = ' ';
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   496
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   497
      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   498
         buffer[iout++] = error_message[iin++];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   499
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   500
      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   501
      buffer[iout] = '\0';
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   502
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   503
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   504
#endif /* WARNINGS || ERROR_TEXT */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   505
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   506
#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   507
PNG_FUNCTION(void,PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   508
png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   509
    PNG_NORETURN)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   510
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   511
   char msg[18+PNG_MAX_ERROR_TEXT];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   512
   if (png_ptr == NULL)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   513
      png_error(png_ptr, error_message);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   514
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   515
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   516
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   517
      png_format_buffer(png_ptr, msg, error_message);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   518
      png_error(png_ptr, msg);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   519
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   520
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   521
#endif /* READ && ERROR_TEXT */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   522
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   523
#ifdef PNG_WARNINGS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   524
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   525
png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   526
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   527
   char msg[18+PNG_MAX_ERROR_TEXT];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   528
   if (png_ptr == NULL)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   529
      png_warning(png_ptr, warning_message);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   530
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   531
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   532
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   533
      png_format_buffer(png_ptr, msg, warning_message);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   534
      png_warning(png_ptr, msg);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   535
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   536
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   537
#endif /* WARNINGS */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   538
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   539
#ifdef PNG_READ_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   540
#ifdef PNG_BENIGN_ERRORS_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   541
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   542
png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   543
    error_message)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   544
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   545
   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   546
      png_chunk_warning(png_ptr, error_message);
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
   else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   549
      png_chunk_error(png_ptr, error_message);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   550
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   551
#  ifndef PNG_ERROR_TEXT_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   552
      PNG_UNUSED(error_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   553
#  endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   554
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   555
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   556
#endif /* READ */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   557
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   558
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   559
png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   560
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   561
#  ifndef PNG_WARNINGS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   562
      PNG_UNUSED(message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   563
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   564
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   565
   /* This is always supported, but for just read or just write it
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   566
    * unconditionally does the right thing.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   567
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   568
#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   569
      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   570
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   571
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   572
#  ifdef PNG_READ_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   573
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   574
         if (error < PNG_CHUNK_ERROR)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   575
            png_chunk_warning(png_ptr, message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   576
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   577
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   578
            png_chunk_benign_error(png_ptr, message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   579
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   580
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   581
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   582
#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   583
      else if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   584
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   585
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   586
#  ifdef PNG_WRITE_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   587
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   588
         if (error < PNG_CHUNK_WRITE_ERROR)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   589
            png_app_warning(png_ptr, message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   590
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   591
         else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   592
            png_app_error(png_ptr, message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   593
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   594
#  endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   595
}
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   596
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   597
#ifdef PNG_ERROR_TEXT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   598
#ifdef PNG_FLOATING_POINT_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   599
PNG_FUNCTION(void,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   600
png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   601
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   602
#  define fixed_message "fixed point overflow in "
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   603
#  define fixed_message_ln ((sizeof fixed_message)-1)
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   604
   unsigned int  iin;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   605
   char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   606
   memcpy(msg, fixed_message, fixed_message_ln);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   607
   iin = 0;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   608
   if (name != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   609
      while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   610
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   611
         msg[fixed_message_ln + iin] = name[iin];
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   612
         ++iin;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   613
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   614
   msg[fixed_message_ln + iin] = 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   615
   png_error(png_ptr, msg);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   616
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   617
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   618
#endif
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   619
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   620
#ifdef PNG_SETJMP_SUPPORTED
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   621
/* This API only exists if ANSI-C style error handling is used,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   622
 * otherwise it is necessary for png_default_error to be overridden.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   623
 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   624
jmp_buf* PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   625
png_set_longjmp_fn(png_structrp png_ptr, png_longjmp_ptr longjmp_fn,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   626
    size_t jmp_buf_size)
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
   /* From libpng 1.6.0 the app gets one chance to set a 'jmpbuf_size' value
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   629
    * and it must not change after that.  Libpng doesn't care how big the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   630
    * buffer is, just that it doesn't change.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   631
    *
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   632
    * If the buffer size is no *larger* than the size of jmp_buf when libpng is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   633
    * compiled a built in jmp_buf is returned; this preserves the pre-1.6.0
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   634
    * semantics that this call will not fail.  If the size is larger, however,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   635
    * the buffer is allocated and this may fail, causing the function to return
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   636
    * NULL.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   637
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   638
   if (png_ptr == NULL)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   639
      return NULL;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   640
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   641
   if (png_ptr->jmp_buf_ptr == NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   642
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   643
      png_ptr->jmp_buf_size = 0; /* not allocated */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   644
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   645
      if (jmp_buf_size <= (sizeof png_ptr->jmp_buf_local))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   646
         png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   647
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   648
      else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   649
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   650
         png_ptr->jmp_buf_ptr = png_voidcast(jmp_buf *,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   651
             png_malloc_warn(png_ptr, jmp_buf_size));
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   652
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   653
         if (png_ptr->jmp_buf_ptr == NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   654
            return NULL; /* new NULL return on OOM */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   655
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   656
         png_ptr->jmp_buf_size = jmp_buf_size;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   657
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   658
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   659
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   660
   else /* Already allocated: check the size */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   661
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   662
      size_t size = png_ptr->jmp_buf_size;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   663
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   664
      if (size == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   665
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   666
         size = (sizeof png_ptr->jmp_buf_local);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   667
         if (png_ptr->jmp_buf_ptr != &png_ptr->jmp_buf_local)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   668
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   669
            /* This is an internal error in libpng: somehow we have been left
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   670
             * with a stack allocated jmp_buf when the application regained
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   671
             * control.  It's always possible to fix this up, but for the moment
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   672
             * this is a png_error because that makes it easy to detect.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   673
             */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   674
            png_error(png_ptr, "Libpng jmp_buf still allocated");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   675
            /* png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local; */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   676
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   677
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   678
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   679
      if (size != jmp_buf_size)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   680
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   681
         png_warning(png_ptr, "Application jmp_buf size changed");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   682
         return NULL; /* caller will probably crash: no choice here */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   683
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   684
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   685
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   686
   /* Finally fill in the function, now we have a satisfactory buffer. It is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   687
    * valid to change the function on every call.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   688
    */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   689
   png_ptr->longjmp_fn = longjmp_fn;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   690
   return png_ptr->jmp_buf_ptr;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   691
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   692
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   693
void /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   694
png_free_jmpbuf(png_structrp png_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   695
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   696
   if (png_ptr != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   697
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   698
      jmp_buf *jb = png_ptr->jmp_buf_ptr;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   699
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   700
      /* A size of 0 is used to indicate a local, stack, allocation of the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   701
       * pointer; used here and in png.c
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   702
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   703
      if (jb != NULL && png_ptr->jmp_buf_size > 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   704
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   705
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   706
         /* This stuff is so that a failure to free the error control structure
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   707
          * does not leave libpng in a state with no valid error handling: the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   708
          * free always succeeds, if there is an error it gets ignored.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   709
          */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   710
         if (jb != &png_ptr->jmp_buf_local)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   711
         {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   712
            /* Make an internal, libpng, jmp_buf to return here */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   713
            jmp_buf free_jmp_buf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   714
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   715
            if (!setjmp(free_jmp_buf))
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   716
            {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   717
               png_ptr->jmp_buf_ptr = &free_jmp_buf; /* come back here */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   718
               png_ptr->jmp_buf_size = 0; /* stack allocation */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   719
               png_ptr->longjmp_fn = longjmp;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   720
               png_free(png_ptr, jb); /* Return to setjmp on error */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   721
            }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   722
         }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   723
      }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   724
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   725
      /* *Always* cancel everything out: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   726
      png_ptr->jmp_buf_size = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   727
      png_ptr->jmp_buf_ptr = NULL;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   728
      png_ptr->longjmp_fn = 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   729
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   730
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   731
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   732
90ce3da70b43 Initial load
duke
parents:
diff changeset
   733
/* This is the default error handling function.  Note that replacements for
90ce3da70b43 Initial load
duke
parents:
diff changeset
   734
 * this function MUST NOT RETURN, or the program will likely crash.  This
90ce3da70b43 Initial load
duke
parents:
diff changeset
   735
 * function is used by default, or if the program supplies NULL for the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   736
 * error function pointer in png_set_error_fn().
90ce3da70b43 Initial load
duke
parents:
diff changeset
   737
 */
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   738
static PNG_FUNCTION(void /* PRIVATE */,
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   739
png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   740
    PNG_NORETURN)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   741
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   742
#ifdef PNG_CONSOLE_IO_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   743
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   744
   /* Check on NULL only added in 1.5.4 */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   745
   if (error_message != NULL && *error_message == PNG_LITERAL_SHARP)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   746
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   747
      /* Strip "#nnnn " from beginning of error message. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   748
      int offset;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   749
      char error_number[16];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   750
      for (offset = 0; offset<15; offset++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   751
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   752
         error_number[offset] = error_message[offset + 1];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   753
         if (error_message[offset] == ' ')
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   754
            break;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   755
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   756
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   757
      if ((offset > 1) && (offset < 15))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   758
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   759
         error_number[offset - 1] = '\0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   760
         fprintf(stderr, "libpng error no. %s: %s",
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   761
             error_number, error_message + offset + 1);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   762
         fprintf(stderr, PNG_STRING_NEWLINE);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   763
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   764
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   765
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   766
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   767
         fprintf(stderr, "libpng error: %s, offset=%d",
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   768
             error_message, offset);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   769
         fprintf(stderr, PNG_STRING_NEWLINE);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   770
      }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   771
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   772
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   773
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   774
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   775
      fprintf(stderr, "libpng error: %s", error_message ? error_message :
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   776
         "undefined");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   777
      fprintf(stderr, PNG_STRING_NEWLINE);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   778
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   779
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   780
   PNG_UNUSED(error_message) /* Make compiler happy */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   781
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   782
   png_longjmp(png_ptr, 1);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   783
}
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   784
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   785
PNG_FUNCTION(void,PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   786
png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   787
{
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   788
#ifdef PNG_SETJMP_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   789
   if (png_ptr != NULL && png_ptr->longjmp_fn != NULL &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   790
       png_ptr->jmp_buf_ptr != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   791
      png_ptr->longjmp_fn(*png_ptr->jmp_buf_ptr, val);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   792
#else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   793
   PNG_UNUSED(png_ptr)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   794
   PNG_UNUSED(val)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   795
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   796
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   797
   /* If control reaches this point, png_longjmp() must not return. The only
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   798
    * choice is to terminate the whole process (or maybe the thread); to do
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   799
    * this the ANSI-C abort() function is used unless a different method is
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   800
    * implemented by overriding the default configuration setting for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   801
    * PNG_ABORT().
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   802
    */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   803
   PNG_ABORT();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   804
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   805
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   806
#ifdef PNG_WARNINGS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   807
/* This function is called when there is a warning, but the library thinks
90ce3da70b43 Initial load
duke
parents:
diff changeset
   808
 * it can continue anyway.  Replacement functions don't have to do anything
90ce3da70b43 Initial load
duke
parents:
diff changeset
   809
 * here if you don't want them to.  In the default configuration, png_ptr is
90ce3da70b43 Initial load
duke
parents:
diff changeset
   810
 * not used, but it is passed in case it may be useful.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   811
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   812
static void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   813
png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   814
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   815
#ifdef PNG_CONSOLE_IO_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   816
#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   817
   if (*warning_message == PNG_LITERAL_SHARP)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   818
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   819
      int offset;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   820
      char warning_number[16];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   821
      for (offset = 0; offset < 15; offset++)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   822
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   823
         warning_number[offset] = warning_message[offset + 1];
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   824
         if (warning_message[offset] == ' ')
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   825
            break;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   826
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   827
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   828
      if ((offset > 1) && (offset < 15))
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   829
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   830
         warning_number[offset + 1] = '\0';
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   831
         fprintf(stderr, "libpng warning no. %s: %s",
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   832
             warning_number, warning_message + offset);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   833
         fprintf(stderr, PNG_STRING_NEWLINE);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   834
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   835
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   836
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   837
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   838
         fprintf(stderr, "libpng warning: %s",
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   839
             warning_message);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   840
         fprintf(stderr, PNG_STRING_NEWLINE);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   841
      }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   842
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   843
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   844
#  endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   845
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   846
   {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   847
      fprintf(stderr, "libpng warning: %s", warning_message);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   848
      fprintf(stderr, PNG_STRING_NEWLINE);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   849
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   850
#else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   851
   PNG_UNUSED(warning_message) /* Make compiler happy */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   852
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   853
   PNG_UNUSED(png_ptr) /* Make compiler happy */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   854
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   855
#endif /* WARNINGS */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   856
90ce3da70b43 Initial load
duke
parents:
diff changeset
   857
/* This function is called when the application wants to use another method
90ce3da70b43 Initial load
duke
parents:
diff changeset
   858
 * of handling errors and warnings.  Note that the error function MUST NOT
90ce3da70b43 Initial load
duke
parents:
diff changeset
   859
 * return to the calling routine or serious problems will occur.  The return
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   860
 * method used in the default routine calls longjmp(png_ptr->jmp_buf_ptr, 1)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   861
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   862
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   863
png_set_error_fn(png_structrp png_ptr, png_voidp error_ptr,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   864
    png_error_ptr error_fn, png_error_ptr warning_fn)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   865
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   866
   if (png_ptr == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   867
      return;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   868
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   869
   png_ptr->error_ptr = error_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   870
   png_ptr->error_fn = error_fn;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   871
#ifdef PNG_WARNINGS_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   872
   png_ptr->warning_fn = warning_fn;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   873
#else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   874
   PNG_UNUSED(warning_fn)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   875
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   876
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   877
90ce3da70b43 Initial load
duke
parents:
diff changeset
   878
90ce3da70b43 Initial load
duke
parents:
diff changeset
   879
/* This function returns a pointer to the error_ptr associated with the user
90ce3da70b43 Initial load
duke
parents:
diff changeset
   880
 * functions.  The application should free any memory associated with this
90ce3da70b43 Initial load
duke
parents:
diff changeset
   881
 * pointer before png_write_destroy and png_read_destroy are called.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   882
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   883
png_voidp PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   884
png_get_error_ptr(png_const_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   885
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   886
   if (png_ptr == NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   887
      return NULL;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   888
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   889
   return ((png_voidp)png_ptr->error_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   890
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   891
90ce3da70b43 Initial load
duke
parents:
diff changeset
   892
90ce3da70b43 Initial load
duke
parents:
diff changeset
   893
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
   894
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   895
png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   896
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   897
   if (png_ptr != NULL)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   898
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   899
      png_ptr->flags &=
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   900
         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   901
         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   902
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   903
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   904
#endif
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   905
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   906
#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   907
   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   908
   /* Currently the above both depend on SETJMP_SUPPORTED, however it would be
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   909
    * possible to implement without setjmp support just so long as there is some
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   910
    * way to handle the error return here:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   911
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   912
PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   913
png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   914
    PNG_NORETURN)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   915
{
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 48280
diff changeset
   916
   png_const_structrp png_ptr = png_nonconst_ptr;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   917
   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   918
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   919
   /* An error is always logged here, overwriting anything (typically a warning)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   920
    * that is already there:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   921
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   922
   if (image != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   923
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   924
      png_safecat(image->message, (sizeof image->message), 0, error_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   925
      image->warning_or_error |= PNG_IMAGE_ERROR;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   926
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   927
      /* Retrieve the jmp_buf from within the png_control, making this work for
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   928
       * C++ compilation too is pretty tricky: C++ wants a pointer to the first
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   929
       * element of a jmp_buf, but C doesn't tell us the type of that.
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   930
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   931
      if (image->opaque != NULL && image->opaque->error_buf != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   932
         longjmp(png_control_jmp_buf(image->opaque), 1);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   933
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   934
      /* Missing longjmp buffer, the following is to help debugging: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   935
      {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   936
         size_t pos = png_safecat(image->message, (sizeof image->message), 0,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   937
             "bad longjmp: ");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   938
         png_safecat(image->message, (sizeof image->message), pos,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   939
             error_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   940
      }
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
   /* Here on an internal programming error. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   944
   abort();
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   945
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   946
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   947
#ifdef PNG_WARNINGS_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   948
void /* PRIVATE */ PNGCBAPI
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   949
png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   950
{
57618
53154e45385a 8217676: Upgrade libpng to 1.6.37
serb
parents: 48280
diff changeset
   951
   png_const_structrp png_ptr = png_nonconst_ptr;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   952
   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   953
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   954
   /* A warning is only logged if there is no prior warning or error. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   955
   if (image->warning_or_error == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   956
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   957
      png_safecat(image->message, (sizeof image->message), 0, warning_message);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   958
      image->warning_or_error |= PNG_IMAGE_WARNING;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   959
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   960
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   961
#endif
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   962
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   963
int /* PRIVATE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   964
png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   965
{
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   966
   volatile png_imagep image = image_in;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   967
   volatile int result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   968
   volatile png_voidp saved_error_buf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   969
   jmp_buf safe_jmpbuf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   970
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   971
   /* Safely execute function(arg) with png_error returning to this function. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   972
   saved_error_buf = image->opaque->error_buf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   973
   result = setjmp(safe_jmpbuf) == 0;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   974
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   975
   if (result != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   976
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   977
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   978
      image->opaque->error_buf = safe_jmpbuf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   979
      result = function(arg);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   980
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   981
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   982
   image->opaque->error_buf = saved_error_buf;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   983
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   984
   /* And do the cleanup prior to any failure return. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   985
   if (result == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   986
      png_image_free(image);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   987
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   988
   return result;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   989
}
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   990
#endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   991
#endif /* READ || WRITE */