jdk-sandbox: comparison src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c

equal deleted inserted replaced

-:5f3b05a36d61
+:53154e45385a
 * This file is available under and governed by the GNU General Public
 * License version 2 only, as published by the Free Software Foundation.
 * However, the following notice accompanied the original version of this
 * file and, per its terms, should not be removed:
 *
-* Last changed in libpng 1.6.35 [July 15, 2018]
+* Copyright (c) 2018 Cosmin Truta
 * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+* Copyright (c) 1996-1997 Andreas Dilger
-* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 if (size == 0)
 {
 /* We have the ICC profile header; do the basic header checks.
 */
-const png_uint_32 profile_length =
+png_uint_32 profile_length = png_get_uint_32(profile_header);
-png_get_uint_32(profile_header);
 if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
 keyword, profile_length) != 0)
 {
 /* The length is apparently ok, so we can check the 132
 /* Now read the tag table; a variable size buffer is
 * needed at this point, allocate one for the whole
 * profile.  The header check has already validated
 * that none of this stuff will overflow.
 */
-const png_uint_32 tag_count = png_get_uint_32(
+png_uint_32 tag_count =
-profile_header+128);
+png_get_uint_32(profile_header + 128);
 png_bytep profile = png_read_buffer(png_ptr,
 profile_length, 2/*silent*/);
 if (profile != NULL)
 {
 *
 * ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
 */
 void /* PRIVATE */
-png_check_chunk_name(png_const_structrp png_ptr, const png_uint_32 chunk_name)
+png_check_chunk_name(png_const_structrp png_ptr, png_uint_32 chunk_name)
 {
 int i;
 png_uint_32 cn=chunk_name;
 png_debug(1, "in png_check_chunk_name");
 cn >>= 8;
 }
 }
 void /* PRIVATE */
-png_check_chunk_length(png_const_structrp png_ptr, const png_uint_32 length)
+png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length)
 {
 png_alloc_size_t limit = PNG_UINT_31_MAX;
 # ifdef PNG_SET_USER_LIMITS_SUPPORTED
 if (png_ptr->user_chunk_malloc_max > 0 &&
 #        define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))
 /* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and
 * then pass:
 */
-static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
+static const png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
 {
 /* Little-endian byte masks for PACKSWAP */
 { S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) },
 /* Normal (big-endian byte) masks - PNG format */
 { S_MASKS(1,1), S_MASKS(2,1), S_MASKS(4,1) }
 };
 /* display_mask has only three entries for the odd passes, so index by
 * pass>>1.
 */
-static PNG_CONST png_uint_32 display_mask[2][3][3] =
+static const png_uint_32 display_mask[2][3][3] =
 {
 /* Little-endian byte masks for PACKSWAP */
 { B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) },
 /* Normal (big-endian byte) masks - PNG format */
 { B_MASKS(1,1), B_MASKS(2,1), B_MASKS(4,1) }
 png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
 png_uint_32 transformations /* Because these may affect the byte layout */)
 {
 /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 /* Offset to next interlace block */
-static PNG_CONST unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+static const unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
 png_debug(1, "in png_do_read_interlace");
 if (row != NULL && row_info != NULL)
 {
 png_uint_32 final_width;
 png_read_finish_row(png_structrp png_ptr)
 {
 /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 /* Start of interlace block */
-static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
 /* Offset to next interlace block */
-static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
 /* Start of interlace block in the y direction */
-static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
 /* Offset to next interlace block in the y direction */
-static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
 png_debug(1, "in png_read_finish_row");
 png_ptr->row_number++;
 if (png_ptr->row_number < png_ptr->num_rows)
 return;
 png_read_start_row(png_structrp png_ptr)
 {
 /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 /* Start of interlace block */
-static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
 /* Offset to next interlace block */
-static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
 /* Start of interlace block in the y direction */
-static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
 /* Offset to next interlace block in the y direction */
-static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
 unsigned int max_pixel_depth;
 size_t row_bytes;
 png_debug(1, "in png_read_start_row");

changeset 57618	53154e45385a
parent 51304	66d9993dd4ad