src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
author prr
Sat, 09 Dec 2017 11:40:40 -0800
changeset 48280 791d551bcdb8
parent 47216 71c04702a3d5
child 51304 66d9993dd4ad
permissions -rw-r--r--
8183960: Upgrade to libpng 1.6.34 Reviewed-by: serb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
90ce3da70b43 Initial load
duke
parents:
diff changeset
     2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     6
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     7
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     8
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     9
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    20
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    21
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    22
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    23
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
/* pngpread.c - read a png file in push mode
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
 *
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    32
 * Last changed in libpng 1.6.32 [August 24, 2017]
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
    33
 * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    36
 *
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    37
 * This code is released under the libpng license.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    38
 * For conditions of distribution and use, see the disclaimer
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    39
 * and license in png.h
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    42
#include "pngpriv.h"
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    46
/* Push model modes */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
#define PNG_READ_SIG_MODE   0
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
#define PNG_READ_CHUNK_MODE 1
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
#define PNG_READ_IDAT_MODE  2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
#define PNG_READ_tEXt_MODE  4
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
#define PNG_READ_zTXt_MODE  5
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
#define PNG_READ_DONE_MODE  6
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
#define PNG_READ_iTXt_MODE  7
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
#define PNG_ERROR_MODE      8
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    56
#define PNG_PUSH_SAVE_BUFFER_IF_FULL \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    57
if (png_ptr->push_length + 4 > png_ptr->buffer_size) \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    58
   { png_push_save_buffer(png_ptr); return; }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    59
#define PNG_PUSH_SAVE_BUFFER_IF_LT(N) \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    60
if (png_ptr->buffer_size < N) \
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    61
   { png_push_save_buffer(png_ptr); return; }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    62
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    64
png_process_data(png_structrp png_ptr, png_inforp info_ptr,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    65
    png_bytep buffer, png_size_t buffer_size)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    67
   if (png_ptr == NULL || info_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    68
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    69
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
   png_push_restore_buffer(png_ptr, buffer, buffer_size);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
   while (png_ptr->buffer_size)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
      png_process_some_data(png_ptr, info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    75
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    78
png_size_t PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    79
png_process_data_pause(png_structrp png_ptr, int save)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    80
{
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    81
   if (png_ptr != NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    82
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    83
      /* It's easiest for the caller if we do the save; then the caller doesn't
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    84
       * have to supply the same data again:
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    85
       */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
    86
      if (save != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    87
         png_push_save_buffer(png_ptr);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    88
      else
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    89
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    90
         /* This includes any pending saved bytes: */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    91
         png_size_t remaining = png_ptr->buffer_size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    92
         png_ptr->buffer_size = 0;
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
         /* So subtract the saved buffer size, unless all the data
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    95
          * is actually 'saved', in which case we just return 0
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    96
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    97
         if (png_ptr->save_buffer_size < remaining)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    98
            return remaining - png_ptr->save_buffer_size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
    99
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   100
   }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   101
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   102
   return 0;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   103
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   104
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   105
png_uint_32 PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   106
png_process_data_skip(png_structrp png_ptr)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   107
{
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   108
/* TODO: Deprecate and remove this API.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   109
 * Somewhere the implementation of this seems to have been lost,
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   110
 * or abandoned.  It was only to support some internal back-door access
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   111
 * to png_struct) in libpng-1.4.x.
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   112
 */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   113
   png_app_warning(png_ptr,
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   114
"png_process_data_skip is not implemented in any current version of libpng");
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   115
   return 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   116
}
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   117
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
/* What we do with the incoming data depends on what we were previously
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
 * doing before we ran out of data...
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   122
png_process_some_data(png_structrp png_ptr, png_inforp info_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   124
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   125
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   126
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
   switch (png_ptr->process_mode)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
      case PNG_READ_SIG_MODE:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
         png_push_read_sig(png_ptr, info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
         break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   133
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   134
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   135
      case PNG_READ_CHUNK_MODE:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   136
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   137
         png_push_read_chunk(png_ptr, info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
         break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   139
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   140
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
      case PNG_READ_IDAT_MODE:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   142
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
         png_push_read_IDAT(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   144
         break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   145
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   146
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
      default:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   148
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   149
         png_ptr->buffer_size = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
         break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   153
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
/* Read any remaining signature bytes from the stream and compare them with
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
 * the correct PNG signature.  It is possible that this routine is called
90ce3da70b43 Initial load
duke
parents:
diff changeset
   157
 * with bytes already read from the signature, either because they have been
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
 * checked by the calling application, or because of multiple calls to this
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
 * routine.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   160
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   162
png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   163
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   164
   png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   165
       num_to_check = 8 - num_checked;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   166
90ce3da70b43 Initial load
duke
parents:
diff changeset
   167
   if (png_ptr->buffer_size < num_to_check)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   168
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
      num_to_check = png_ptr->buffer_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   173
       num_to_check);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   174
   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   177
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   178
      if (num_checked < 4 &&
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
         png_error(png_ptr, "Not a PNG file");
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   181
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
      else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   184
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   185
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   186
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
      if (png_ptr->sig_bytes >= 8)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   195
png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   197
   png_uint_32 chunk_name;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   198
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   199
   int keep; /* unknown handling method */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   201
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   202
   /* First we make sure we have enough data for the 4-byte chunk name
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   203
    * and the 4-byte chunk length before proceeding with decoding the
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   204
    * chunk data.  To fully decode each of these chunks, we also make
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   205
    * sure we have enough data in the buffer for the 4-byte CRC at the
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   206
    * end of every chunk (except IDAT, which is handled separately).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   207
    */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   208
   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   209
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
      png_byte chunk_length[4];
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   211
      png_byte chunk_tag[4];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   212
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   213
      PNG_PUSH_SAVE_BUFFER_IF_LT(8)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
      png_push_fill_buffer(png_ptr, chunk_length, 4);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   215
      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
      png_reset_crc(png_ptr);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   217
      png_crc_read(png_ptr, chunk_tag, 4);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   218
      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   219
      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
48280
791d551bcdb8 8183960: Upgrade to libpng 1.6.34
prr
parents: 47216
diff changeset
   220
      png_check_chunk_length(png_ptr, png_ptr->push_length);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   224
   chunk_name = png_ptr->chunk_name;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   225
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   226
   if (chunk_name == png_IDAT)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   227
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   228
      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   229
         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   230
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   231
      /* If we reach an IDAT chunk, this means we have read all of the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   232
       * header chunks, and we can start reading the image (or if this
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   233
       * is called after the image has been read - we have an error).
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   234
       */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   235
      if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   236
         png_error(png_ptr, "Missing IHDR before IDAT");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   237
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   238
      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   239
          (png_ptr->mode & PNG_HAVE_PLTE) == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   240
         png_error(png_ptr, "Missing PLTE before IDAT");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   241
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   242
      png_ptr->process_mode = PNG_READ_IDAT_MODE;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   243
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   244
      if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   245
         if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   246
            if (png_ptr->push_length == 0)
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   247
               return;
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   248
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   249
      png_ptr->mode |= PNG_HAVE_IDAT;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   250
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   251
      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   252
         png_benign_error(png_ptr, "Too many IDATs found");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   253
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   254
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   255
   if (chunk_name == png_IHDR)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   256
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   257
      if (png_ptr->push_length != 13)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   258
         png_error(png_ptr, "Invalid IHDR length");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   259
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   260
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   261
      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   262
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   263
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   264
   else if (chunk_name == png_IEND)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   265
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   266
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   267
      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   268
90ce3da70b43 Initial load
duke
parents:
diff changeset
   269
      png_ptr->process_mode = PNG_READ_DONE_MODE;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   270
      png_push_have_end(png_ptr, info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   271
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   272
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   273
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   274
   else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   275
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   276
      PNG_PUSH_SAVE_BUFFER_IF_FULL
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   277
      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length, keep);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   278
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   279
      if (chunk_name == png_PLTE)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   280
         png_ptr->mode |= PNG_HAVE_PLTE;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   281
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   282
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   283
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   284
   else if (chunk_name == png_PLTE)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   285
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   286
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   287
      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   288
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   289
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   290
   else if (chunk_name == png_IDAT)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   291
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   292
      png_ptr->idat_size = png_ptr->push_length;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   293
      png_ptr->process_mode = PNG_READ_IDAT_MODE;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   294
      png_push_have_info(png_ptr, info_ptr);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   295
      png_ptr->zstream.avail_out =
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   296
          (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   297
          png_ptr->iwidth) + 1;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   298
      png_ptr->zstream.next_out = png_ptr->row_buf;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   299
      return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   300
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   301
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   302
#ifdef PNG_READ_gAMA_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   303
   else if (png_ptr->chunk_name == png_gAMA)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   304
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   305
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   306
      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   307
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   308
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   309
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   310
#ifdef PNG_READ_sBIT_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   311
   else if (png_ptr->chunk_name == png_sBIT)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   312
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   313
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   314
      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   315
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   316
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   317
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   318
#ifdef PNG_READ_cHRM_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   319
   else if (png_ptr->chunk_name == png_cHRM)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   320
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   321
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   322
      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   323
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   324
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   325
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   326
#ifdef PNG_READ_sRGB_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   327
   else if (chunk_name == png_sRGB)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   328
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   329
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   330
      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   331
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   332
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   333
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   334
#ifdef PNG_READ_iCCP_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   335
   else if (png_ptr->chunk_name == png_iCCP)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   336
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   337
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   338
      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   339
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   340
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   341
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   342
#ifdef PNG_READ_sPLT_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   343
   else if (chunk_name == png_sPLT)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   344
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   345
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   346
      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   347
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   348
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   349
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   350
#ifdef PNG_READ_tRNS_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   351
   else if (chunk_name == png_tRNS)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   352
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   353
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   354
      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   355
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   356
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   357
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   358
#ifdef PNG_READ_bKGD_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   359
   else if (chunk_name == png_bKGD)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   360
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   361
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   362
      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   363
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   364
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   365
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   366
#ifdef PNG_READ_hIST_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   367
   else if (chunk_name == png_hIST)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   368
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   369
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   370
      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   371
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   372
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   373
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   374
#ifdef PNG_READ_pHYs_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   375
   else if (chunk_name == png_pHYs)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   376
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   377
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   378
      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   379
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   380
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   381
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   382
#ifdef PNG_READ_oFFs_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   383
   else if (chunk_name == png_oFFs)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   384
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   385
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   386
      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   387
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   388
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   389
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   390
#ifdef PNG_READ_pCAL_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   391
   else if (chunk_name == png_pCAL)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   392
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   393
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   394
      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   395
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   396
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   397
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   398
#ifdef PNG_READ_sCAL_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   399
   else if (chunk_name == png_sCAL)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   400
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   401
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   402
      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   403
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   404
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   405
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   406
#ifdef PNG_READ_tIME_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   407
   else if (chunk_name == png_tIME)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   408
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   409
      PNG_PUSH_SAVE_BUFFER_IF_FULL
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   410
      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   411
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   412
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   413
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   414
#ifdef PNG_READ_tEXt_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   415
   else if (chunk_name == png_tEXt)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   416
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   417
      PNG_PUSH_SAVE_BUFFER_IF_FULL
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   418
      png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   419
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   420
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   421
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   422
#ifdef PNG_READ_zTXt_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   423
   else if (chunk_name == png_zTXt)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   424
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   425
      PNG_PUSH_SAVE_BUFFER_IF_FULL
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   426
      png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   427
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   428
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   429
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   430
#ifdef PNG_READ_iTXt_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   431
   else if (chunk_name == png_iTXt)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   432
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   433
      PNG_PUSH_SAVE_BUFFER_IF_FULL
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   434
      png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   435
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   436
#endif
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   437
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   438
   else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   439
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   440
      PNG_PUSH_SAVE_BUFFER_IF_FULL
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   441
      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   442
          PNG_HANDLE_CHUNK_AS_DEFAULT);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   443
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   444
90ce3da70b43 Initial load
duke
parents:
diff changeset
   445
   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   446
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   447
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   448
void PNGCBAPI
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   449
png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   450
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   451
   png_bytep ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   452
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   453
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   454
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   455
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   456
   ptr = buffer;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   457
   if (png_ptr->save_buffer_size != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   458
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   459
      png_size_t save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   460
90ce3da70b43 Initial load
duke
parents:
diff changeset
   461
      if (length < png_ptr->save_buffer_size)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   462
         save_size = length;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   463
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   464
      else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   465
         save_size = png_ptr->save_buffer_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   466
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   467
      memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   468
      length -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   469
      ptr += save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   470
      png_ptr->buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   471
      png_ptr->save_buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   472
      png_ptr->save_buffer_ptr += save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   473
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   474
   if (length != 0 && png_ptr->current_buffer_size != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   475
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   476
      png_size_t save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   477
90ce3da70b43 Initial load
duke
parents:
diff changeset
   478
      if (length < png_ptr->current_buffer_size)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   479
         save_size = length;
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
         save_size = png_ptr->current_buffer_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   483
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   484
      memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   485
      png_ptr->buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   486
      png_ptr->current_buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   487
      png_ptr->current_buffer_ptr += save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   488
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   489
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   490
90ce3da70b43 Initial load
duke
parents:
diff changeset
   491
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   492
png_push_save_buffer(png_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   493
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   494
   if (png_ptr->save_buffer_size != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   495
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   496
      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   497
      {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   498
         png_size_t i, istop;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   499
         png_bytep sp;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   500
         png_bytep dp;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   501
90ce3da70b43 Initial load
duke
parents:
diff changeset
   502
         istop = png_ptr->save_buffer_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   503
         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   504
             i < istop; i++, sp++, dp++)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   505
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   506
            *dp = *sp;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   507
         }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   508
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   509
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   510
   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   511
       png_ptr->save_buffer_max)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   512
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   513
      png_size_t new_max;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   514
      png_bytep old_buffer;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   515
90ce3da70b43 Initial load
duke
parents:
diff changeset
   516
      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   517
          (png_ptr->current_buffer_size + 256))
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   518
      {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   519
         png_error(png_ptr, "Potential overflow of save_buffer");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   520
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   521
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   522
      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   523
      old_buffer = png_ptr->save_buffer;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   524
      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   525
          (png_size_t)new_max);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   526
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   527
      if (png_ptr->save_buffer == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   528
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   529
         png_free(png_ptr, old_buffer);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   530
         png_error(png_ptr, "Insufficient memory for save_buffer");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   531
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   532
40436
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   533
      if (old_buffer)
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   534
         memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   535
      else if (png_ptr->save_buffer_size)
94ae0ede53a5 8155690: Update libPNG library to the latest up-to-date
azvegint
parents: 35296
diff changeset
   536
         png_error(png_ptr, "save_buffer error");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   537
      png_free(png_ptr, old_buffer);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   538
      png_ptr->save_buffer_max = new_max;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   539
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   540
   if (png_ptr->current_buffer_size)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   541
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   542
      memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   543
         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   544
      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   545
      png_ptr->current_buffer_size = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   546
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   547
   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   548
   png_ptr->buffer_size = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   549
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   550
90ce3da70b43 Initial load
duke
parents:
diff changeset
   551
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   552
png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   553
    png_size_t buffer_length)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   554
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
   555
   png_ptr->current_buffer = buffer;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   556
   png_ptr->current_buffer_size = buffer_length;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   557
   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   558
   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   559
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   560
90ce3da70b43 Initial load
duke
parents:
diff changeset
   561
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   562
png_push_read_IDAT(png_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   563
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   564
   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   565
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   566
      png_byte chunk_length[4];
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   567
      png_byte chunk_tag[4];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   568
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   569
      /* TODO: this code can be commoned up with the same code in push_read */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   570
      PNG_PUSH_SAVE_BUFFER_IF_LT(8)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   571
      png_push_fill_buffer(png_ptr, chunk_length, 4);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   572
      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   573
      png_reset_crc(png_ptr);
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   574
      png_crc_read(png_ptr, chunk_tag, 4);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   575
      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   576
      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   577
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   578
      if (png_ptr->chunk_name != png_IDAT)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   579
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   580
         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   581
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   582
         if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   583
            png_error(png_ptr, "Not enough compressed data");
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   584
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   585
         return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   586
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   587
90ce3da70b43 Initial load
duke
parents:
diff changeset
   588
      png_ptr->idat_size = png_ptr->push_length;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   589
   }
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   590
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   591
   if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   592
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   593
      png_size_t save_size = png_ptr->save_buffer_size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   594
      png_uint_32 idat_size = png_ptr->idat_size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   595
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   596
      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   597
       * are of different types and we don't know which variable has the fewest
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   598
       * bits.  Carefully select the smaller and cast it to the type of the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   599
       * larger - this cannot overflow.  Do not cast in the following test - it
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   600
       * will break on either 16-bit or 64-bit platforms.
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
      if (idat_size < save_size)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   603
         save_size = (png_size_t)idat_size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   604
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   605
      else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   606
         idat_size = (png_uint_32)save_size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   607
90ce3da70b43 Initial load
duke
parents:
diff changeset
   608
      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   609
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   610
      png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   611
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   612
      png_ptr->idat_size -= idat_size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   613
      png_ptr->buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   614
      png_ptr->save_buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   615
      png_ptr->save_buffer_ptr += save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   616
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   617
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   618
   if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   619
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   620
      png_size_t save_size = png_ptr->current_buffer_size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   621
      png_uint_32 idat_size = png_ptr->idat_size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   622
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   623
      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   624
       * are of different types and we don't know which variable has the fewest
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   625
       * bits.  Carefully select the smaller and cast it to the type of the
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   626
       * larger - this cannot overflow.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   627
       */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   628
      if (idat_size < save_size)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   629
         save_size = (png_size_t)idat_size;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   630
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   631
      else
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   632
         idat_size = (png_uint_32)save_size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   633
90ce3da70b43 Initial load
duke
parents:
diff changeset
   634
      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   635
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   636
      png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   637
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   638
      png_ptr->idat_size -= idat_size;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   639
      png_ptr->buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   640
      png_ptr->current_buffer_size -= save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   641
      png_ptr->current_buffer_ptr += save_size;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   642
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   643
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   644
   if (png_ptr->idat_size == 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   645
   {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   646
      PNG_PUSH_SAVE_BUFFER_IF_LT(4)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   647
      png_crc_finish(png_ptr, 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   648
      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   649
      png_ptr->mode |= PNG_AFTER_IDAT;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   650
      png_ptr->zowner = 0;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   651
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   652
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   653
90ce3da70b43 Initial load
duke
parents:
diff changeset
   654
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   655
png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   656
    png_size_t buffer_length)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   657
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   658
   /* The caller checks for a non-zero buffer length. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   659
   if (!(buffer_length > 0) || buffer == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   660
      png_error(png_ptr, "No IDAT data (internal error)");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   661
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   662
   /* This routine must process all the data it has been given
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   663
    * before returning, calling the row callback as required to
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   664
    * handle the uncompressed results.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   665
    */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   666
   png_ptr->zstream.next_in = buffer;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   667
   /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   668
   png_ptr->zstream.avail_in = (uInt)buffer_length;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   669
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   670
   /* Keep going until the decompressed data is all processed
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   671
    * or the stream marked as finished.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   672
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   673
   while (png_ptr->zstream.avail_in > 0 &&
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   674
      (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   675
   {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   676
      int ret;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   677
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   678
      /* We have data for zlib, but we must check that zlib
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   679
       * has someplace to put the results.  It doesn't matter
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   680
       * if we don't expect any results -- it may be the input
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   681
       * data is just the LZ end code.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   682
       */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   683
      if (!(png_ptr->zstream.avail_out > 0))
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   684
      {
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   685
         /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   686
         png_ptr->zstream.avail_out = (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   687
             png_ptr->iwidth) + 1);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   688
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   689
         png_ptr->zstream.next_out = png_ptr->row_buf;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   690
      }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   691
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   692
      /* Using Z_SYNC_FLUSH here means that an unterminated
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   693
       * LZ stream (a stream with a missing end code) can still
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   694
       * be handled, otherwise (Z_NO_FLUSH) a future zlib
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   695
       * implementation might defer output and therefore
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   696
       * change the current behavior (see comments in inflate.c
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   697
       * for why this doesn't happen at present with zlib 1.2.5).
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   698
       */
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   699
      ret = PNG_INFLATE(png_ptr, Z_SYNC_FLUSH);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   700
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   701
      /* Check for any failure before proceeding. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   702
      if (ret != Z_OK && ret != Z_STREAM_END)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   703
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   704
         /* Terminate the decompression. */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   705
         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   706
         png_ptr->zowner = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   707
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   708
         /* This may be a truncated stream (missing or
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   709
          * damaged end code).  Treat that as a warning.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   710
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   711
         if (png_ptr->row_number >= png_ptr->num_rows ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   712
             png_ptr->pass > 6)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   713
            png_warning(png_ptr, "Truncated compressed data in IDAT");
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   714
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   715
         else
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   716
         {
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   717
            if (ret == Z_DATA_ERROR)
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   718
               png_benign_error(png_ptr, "IDAT: ADLER32 checksum mismatch");
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   719
            else
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   720
               png_error(png_ptr, "Decompression error in IDAT");
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   721
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   722
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   723
         /* Skip the check on unprocessed input */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   724
         return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   725
      }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   726
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   727
      /* Did inflate output any data? */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   728
      if (png_ptr->zstream.next_out != png_ptr->row_buf)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   729
      {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   730
         /* Is this unexpected data after the last row?
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   731
          * If it is, artificially terminate the LZ output
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   732
          * here.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   733
          */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   734
         if (png_ptr->row_number >= png_ptr->num_rows ||
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   735
             png_ptr->pass > 6)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   736
         {
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   737
            /* Extra data. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   738
            png_warning(png_ptr, "Extra compressed data in IDAT");
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   739
            png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   740
            png_ptr->zowner = 0;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   741
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   742
            /* Do no more processing; skip the unprocessed
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   743
             * input check below.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   744
             */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   745
            return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   746
         }
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   747
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   748
         /* Do we have a complete row? */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   749
         if (png_ptr->zstream.avail_out == 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   750
            png_push_process_row(png_ptr);
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
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   753
      /* And check for the end of the stream. */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   754
      if (ret == Z_STREAM_END)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   755
         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   756
   }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   757
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   758
   /* All the data should have been processed, if anything
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   759
    * is left at this point we have bytes of IDAT data
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   760
    * after the zlib end code.
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   761
    */
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   762
   if (png_ptr->zstream.avail_in > 0)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   763
      png_warning(png_ptr, "Extra compression data in IDAT");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   764
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   765
90ce3da70b43 Initial load
duke
parents:
diff changeset
   766
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   767
png_push_process_row(png_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   768
{
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   769
   /* 1.5.6: row_info moved out of png_struct to a local here. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   770
   png_row_info row_info;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   771
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   772
   row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   773
   row_info.color_type = png_ptr->color_type;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   774
   row_info.bit_depth = png_ptr->bit_depth;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   775
   row_info.channels = png_ptr->channels;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   776
   row_info.pixel_depth = png_ptr->pixel_depth;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   777
   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   778
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   779
   if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   780
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   781
      if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   782
         png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   783
            png_ptr->prev_row + 1, png_ptr->row_buf[0]);
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   784
      else
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   785
         png_error(png_ptr, "bad adaptive filter value");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   786
   }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   787
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   788
   /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   789
    * 1.5.6, while the buffer really is this big in current versions of libpng
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   790
    * it may not be in the future, so this was changed just to copy the
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   791
    * interlaced row count:
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   792
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   793
   memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   794
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   795
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   796
   if (png_ptr->transformations != 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   797
      png_do_read_transformations(png_ptr, &row_info);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   798
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   799
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   800
   /* The transformed pixel depth should match the depth now in row_info. */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   801
   if (png_ptr->transformed_pixel_depth == 0)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   802
   {
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   803
      png_ptr->transformed_pixel_depth = row_info.pixel_depth;
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   804
      if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   805
         png_error(png_ptr, "progressive row overflow");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   806
   }
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   807
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   808
   else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   809
      png_error(png_ptr, "internal progressive row size calculation error");
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   810
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   811
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   812
#ifdef PNG_READ_INTERLACING_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   813
   /* Expand interlaced rows to full size */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   814
   if (png_ptr->interlaced != 0 &&
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   815
       (png_ptr->transformations & PNG_INTERLACE) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   816
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   817
      if (png_ptr->pass < 6)
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   818
         png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
   819
             png_ptr->transformations);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   820
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   821
      switch (png_ptr->pass)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   822
      {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   823
         case 0:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   824
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   825
            int i;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   826
            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   827
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   828
               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   829
               png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   830
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   831
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   832
            if (png_ptr->pass == 2) /* Pass 1 might be empty */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   833
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   834
               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   835
               {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   836
                  png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   837
                  png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   838
               }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   839
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   840
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   841
            if (png_ptr->pass == 4 && png_ptr->height <= 4)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   842
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   843
               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   844
               {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   845
                  png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   846
                  png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   847
               }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   848
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   849
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   850
            if (png_ptr->pass == 6 && png_ptr->height <= 4)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   851
            {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   852
                png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   853
                png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   854
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   855
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   856
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   857
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   858
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   859
         case 1:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   860
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   861
            int i;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   862
            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   863
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   864
               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   865
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   866
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   867
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   868
            if (png_ptr->pass == 2) /* Skip top 4 generated rows */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   869
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   870
               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   871
               {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   872
                  png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   873
                  png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   874
               }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   875
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   876
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   877
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   878
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   879
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   880
         case 2:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   881
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   882
            int i;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   883
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   884
            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   885
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   886
               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   887
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   888
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   889
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   890
            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   891
            {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   892
               png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   893
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   894
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   895
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   896
            if (png_ptr->pass == 4) /* Pass 3 might be empty */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   897
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   898
               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   899
               {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   900
                  png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   901
                  png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   902
               }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   903
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   904
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   905
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   906
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   907
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   908
         case 3:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   909
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   910
            int i;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   911
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   912
            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   913
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   914
               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   915
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   916
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   917
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   918
            if (png_ptr->pass == 4) /* Skip top two generated rows */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   919
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   920
               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   921
               {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   922
                  png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   923
                  png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   924
               }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   925
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   926
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   927
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   928
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   929
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   930
         case 4:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   931
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   932
            int i;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   933
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   934
            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   935
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   936
               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   937
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   938
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   939
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   940
            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   941
            {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   942
               png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   943
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   944
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   945
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   946
            if (png_ptr->pass == 6) /* Pass 5 might be empty */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   947
            {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   948
               png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   949
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   950
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   951
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   952
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   953
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   954
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   955
         case 5:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   956
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   957
            int i;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   958
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   959
            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   960
            {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   961
               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   962
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   963
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   964
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   965
            if (png_ptr->pass == 6) /* Skip top generated row */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   966
            {
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   967
               png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   968
               png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   969
            }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   970
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   971
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   972
         }
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   973
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   974
         default:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   975
         case 6:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   976
         {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   977
            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   978
            png_read_push_finish_row(png_ptr);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   979
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   980
            if (png_ptr->pass != 6)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   981
               break;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   982
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
   983
            png_push_have_row(png_ptr, NULL);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   984
            png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   985
         }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   986
      }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   987
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   988
   else
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   989
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   990
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   991
      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   992
      png_read_push_finish_row(png_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   993
   }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   994
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   995
90ce3da70b43 Initial load
duke
parents:
diff changeset
   996
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
   997
png_read_push_finish_row(png_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   998
{
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
   999
#ifdef PNG_READ_INTERLACING_SUPPORTED
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1000
   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1001
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1002
   /* Start of interlace block */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1003
   static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1004
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1005
   /* Offset to next interlace block */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1006
   static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1007
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1008
   /* Start of interlace block in the y direction */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1009
   static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1010
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1011
   /* Offset to next interlace block in the y direction */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1012
   static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1013
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1014
   /* Height of interlace block.  This is not currently used - if you need
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1015
    * it, uncomment it here and in png.h
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1016
   static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1017
   */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1018
#endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1019
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1020
   png_ptr->row_number++;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1021
   if (png_ptr->row_number < png_ptr->num_rows)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1022
      return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1023
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1024
#ifdef PNG_READ_INTERLACING_SUPPORTED
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1025
   if (png_ptr->interlaced != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1026
   {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1027
      png_ptr->row_number = 0;
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1028
      memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1029
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1030
      do
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1031
      {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1032
         png_ptr->pass++;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1033
         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1034
             (png_ptr->pass == 3 && png_ptr->width < 3) ||
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1035
             (png_ptr->pass == 5 && png_ptr->width < 2))
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1036
            png_ptr->pass++;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1037
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1038
         if (png_ptr->pass > 7)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1039
            png_ptr->pass--;
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1040
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1041
         if (png_ptr->pass >= 7)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1042
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1043
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1044
         png_ptr->iwidth = (png_ptr->width +
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1045
             png_pass_inc[png_ptr->pass] - 1 -
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1046
             png_pass_start[png_ptr->pass]) /
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1047
             png_pass_inc[png_ptr->pass];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1048
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1049
         if ((png_ptr->transformations & PNG_INTERLACE) != 0)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1050
            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1051
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1052
         png_ptr->num_rows = (png_ptr->height +
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1053
             png_pass_yinc[png_ptr->pass] - 1 -
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1054
             png_pass_ystart[png_ptr->pass]) /
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1055
             png_pass_yinc[png_ptr->pass];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1056
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1057
      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1058
   }
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1059
#endif /* READ_INTERLACING */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1060
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1061
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1062
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1063
png_push_have_info(png_structrp png_ptr, png_inforp info_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1064
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1065
   if (png_ptr->info_fn != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1066
      (*(png_ptr->info_fn))(png_ptr, info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1067
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1068
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1069
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1070
png_push_have_end(png_structrp png_ptr, png_inforp info_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1071
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1072
   if (png_ptr->end_fn != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1073
      (*(png_ptr->end_fn))(png_ptr, info_ptr);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1074
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1075
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1076
void /* PRIVATE */
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1077
png_push_have_row(png_structrp png_ptr, png_bytep row)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1078
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1079
   if (png_ptr->row_fn != NULL)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1080
      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
43321
2b8d397c03a4 8167228: Update to libpng 1.6.28
prr
parents: 40436
diff changeset
  1081
          (int)png_ptr->pass);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1082
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1083
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1084
#ifdef PNG_READ_INTERLACING_SUPPORTED
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1085
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1086
png_progressive_combine_row(png_const_structrp png_ptr, png_bytep old_row,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1087
    png_const_bytep new_row)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1088
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1089
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1090
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1091
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1092
   /* new_row is a flag here - if it is NULL then the app callback was called
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1093
    * from an empty row (see the calls to png_struct::row_fn below), otherwise
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1094
    * it must be png_ptr->row_buf+1
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1095
    */
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1096
   if (new_row != NULL)
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1097
      png_combine_row(png_ptr, old_row, 1/*blocky display*/);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1098
}
35296
659e92aaf7f4 8143941: Update splashscreen displays
azvegint
parents: 29913
diff changeset
  1099
#endif /* READ_INTERLACING */
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1100
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1101
void PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1102
png_set_progressive_read_fn(png_structrp png_ptr, png_voidp progressive_ptr,
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1103
    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1104
    png_progressive_end_ptr end_fn)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1105
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1106
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1107
      return;
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1108
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1109
   png_ptr->info_fn = info_fn;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1110
   png_ptr->row_fn = row_fn;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1111
   png_ptr->end_fn = end_fn;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1112
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1113
   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1114
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1115
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1116
png_voidp PNGAPI
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1117
png_get_progressive_ptr(png_const_structrp png_ptr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1118
{
10576
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1119
   if (png_ptr == NULL)
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1120
      return (NULL);
db3409425573 7088287: libpng need to be updated.
bae
parents: 5506
diff changeset
  1121
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1122
   return png_ptr->io_ptr;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1123
}
29913
95258013e132 8069198: Upgrade image library
azvegint
parents: 25859
diff changeset
  1124
#endif /* PROGRESSIVE_READ */