third_party/libpng/pngset.c - Issue 23494067: Revert "libpng 1.6.3"

Unified Diff: third_party/libpng/pngset.c

Issue 23494067: Revert "libpng 1.6.3" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: third_party/libpng/pngset.c

diff --git a/third_party/libpng/pngset.c b/third_party/libpng/pngset.c

index 7e355d1f4beb2388986bb52693d55d5f61dc6fe6..717757fc40c72939a371d9deb4bdd315ba2b141d 100644

--- a/third_party/libpng/pngset.c

+++ b/third_party/libpng/pngset.c

@@ -1,8 +1,8 @@

/* pngset.c - storage of image information into info struct

- * Last changed in libpng 1.6.3 [July 18, 2013]

+ * Last changed in libpng 1.2.43 [February 25, 2010]

@@ -16,151 +16,170 @@

* info struct and allows us to change the structure in the future.

-#include "pngpriv.h"

+#define PNG_INTERNAL

+#define PNG_NO_PEDANTIC_WARNINGS

+#include "png.h"

#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)

#ifdef PNG_bKGD_SUPPORTED

void PNGAPI

-png_set_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_color_16p background)

+png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)

{

png_debug1(1, "in %s storage function", "bKGD");

- if (png_ptr == NULL || info_ptr == NULL || background == NULL)

+ if (png_ptr == NULL || info_ptr == NULL)

return;

- info_ptr->background = *background;

+ png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));

info_ptr->valid |= PNG_INFO_bKGD;

}

#endif

#ifdef PNG_cHRM_SUPPORTED

-void PNGFAPI

-png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,

- png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,

- png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,

- png_fixed_point blue_x, png_fixed_point blue_y)

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+void PNGAPI

+png_set_cHRM(png_structp png_ptr, png_infop info_ptr,

+ double white_x, double white_y, double red_x, double red_y,

+ double green_x, double green_y, double blue_x, double blue_y)

{

- png_xy xy;

- png_debug1(1, "in %s storage function", "cHRM fixed");

+ png_debug1(1, "in %s storage function", "cHRM");

if (png_ptr == NULL || info_ptr == NULL)

return;

- xy.redx = red_x;

- xy.redy = red_y;

- xy.greenx = green_x;

- xy.greeny = green_y;

- xy.bluex = blue_x;

- xy.bluey = blue_y;

- xy.whitex = white_x;

- xy.whitey = white_y;

- if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,

- 2/* override with app values*/))

- info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;

- png_colorspace_sync_info(png_ptr, info_ptr);

+ info_ptr->x_white = (float)white_x;

+ info_ptr->y_white = (float)white_y;

+ info_ptr->x_red = (float)red_x;

+ info_ptr->y_red = (float)red_y;

+ info_ptr->x_green = (float)green_x;

+ info_ptr->y_green = (float)green_y;

+ info_ptr->x_blue = (float)blue_x;

+ info_ptr->y_blue = (float)blue_y;

+#ifdef PNG_FIXED_POINT_SUPPORTED

+ info_ptr->int_x_white = (png_fixed_point)(white_x*100000.+0.5);

+ info_ptr->int_y_white = (png_fixed_point)(white_y*100000.+0.5);

+ info_ptr->int_x_red = (png_fixed_point)( red_x*100000.+0.5);

+ info_ptr->int_y_red = (png_fixed_point)( red_y*100000.+0.5);

+ info_ptr->int_x_green = (png_fixed_point)(green_x*100000.+0.5);

+ info_ptr->int_y_green = (png_fixed_point)(green_y*100000.+0.5);

+ info_ptr->int_x_blue = (png_fixed_point)( blue_x*100000.+0.5);

+ info_ptr->int_y_blue = (png_fixed_point)( blue_y*100000.+0.5);

+#endif

+ info_ptr->valid |= PNG_INFO_cHRM;

}

+#endif /* PNG_FLOATING_POINT_SUPPORTED */

-void PNGFAPI

-png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,

- png_fixed_point int_red_X, png_fixed_point int_red_Y,

- png_fixed_point int_red_Z, png_fixed_point int_green_X,

- png_fixed_point int_green_Y, png_fixed_point int_green_Z,

- png_fixed_point int_blue_X, png_fixed_point int_blue_Y,

- png_fixed_point int_blue_Z)

+#ifdef PNG_FIXED_POINT_SUPPORTED

+void PNGAPI

+png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,

+ png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,

+ png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,

+ png_fixed_point blue_x, png_fixed_point blue_y)

{

- png_XYZ XYZ;

- png_debug1(1, "in %s storage function", "cHRM XYZ fixed");

+ png_debug1(1, "in %s storage function", "cHRM fixed");

if (png_ptr == NULL || info_ptr == NULL)

return;

- XYZ.red_X = int_red_X;

- XYZ.red_Y = int_red_Y;

- XYZ.red_Z = int_red_Z;

- XYZ.green_X = int_green_X;

- XYZ.green_Y = int_green_Y;

- XYZ.green_Z = int_green_Z;

- XYZ.blue_X = int_blue_X;

- XYZ.blue_Y = int_blue_Y;

- XYZ.blue_Z = int_blue_Z;

- if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace, &XYZ, 2))

- info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;

- png_colorspace_sync_info(png_ptr, info_ptr);

-# ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,

- double white_x, double white_y, double red_x, double red_y,

- double green_x, double green_y, double blue_x, double blue_y)

- png_set_cHRM_fixed(png_ptr, info_ptr,

- png_fixed(png_ptr, white_x, "cHRM White X"),

- png_fixed(png_ptr, white_y, "cHRM White Y"),

- png_fixed(png_ptr, red_x, "cHRM Red X"),

- png_fixed(png_ptr, red_y, "cHRM Red Y"),

- png_fixed(png_ptr, green_x, "cHRM Green X"),

- png_fixed(png_ptr, green_y, "cHRM Green Y"),

- png_fixed(png_ptr, blue_x, "cHRM Blue X"),

- png_fixed(png_ptr, blue_y, "cHRM Blue Y"));

-void PNGAPI

-png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,

- double red_Y, double red_Z, double green_X, double green_Y, double green_Z,

- double blue_X, double blue_Y, double blue_Z)

- png_set_cHRM_XYZ_fixed(png_ptr, info_ptr,

- png_fixed(png_ptr, red_X, "cHRM Red X"),

- png_fixed(png_ptr, red_Y, "cHRM Red Y"),

- png_fixed(png_ptr, red_Z, "cHRM Red Z"),

- png_fixed(png_ptr, green_X, "cHRM Red X"),

- png_fixed(png_ptr, green_Y, "cHRM Red Y"),

- png_fixed(png_ptr, green_Z, "cHRM Red Z"),

- png_fixed(png_ptr, blue_X, "cHRM Red X"),

- png_fixed(png_ptr, blue_Y, "cHRM Red Y"),

- png_fixed(png_ptr, blue_Z, "cHRM Red Z"));

+#ifdef PNG_CHECK_cHRM_SUPPORTED

+ if (png_check_cHRM_fixed(png_ptr,

+ white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))

+#endif

+ {

+ info_ptr->int_x_white = white_x;

+ info_ptr->int_y_white = white_y;

+ info_ptr->int_x_red = red_x;

+ info_ptr->int_y_red = red_y;

+ info_ptr->int_x_green = green_x;

+ info_ptr->int_y_green = green_y;

+ info_ptr->int_x_blue = blue_x;

+ info_ptr->int_y_blue = blue_y;

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+ info_ptr->x_white = (float)(white_x/100000.);

+ info_ptr->y_white = (float)(white_y/100000.);

+ info_ptr->x_red = (float)( red_x/100000.);

+ info_ptr->y_red = (float)( red_y/100000.);

+ info_ptr->x_green = (float)(green_x/100000.);

+ info_ptr->y_green = (float)(green_y/100000.);

+ info_ptr->x_blue = (float)( blue_x/100000.);

+ info_ptr->y_blue = (float)( blue_y/100000.);

+#endif

+ info_ptr->valid |= PNG_INFO_cHRM;

+ }

}

-# endif /* PNG_FLOATING_POINT_SUPPORTED */

+#endif /* PNG_FIXED_POINT_SUPPORTED */

#endif /* PNG_cHRM_SUPPORTED */

#ifdef PNG_gAMA_SUPPORTED

-void PNGFAPI

-png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,

- png_fixed_point file_gamma)

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+void PNGAPI

+png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)

{

+ double png_gamma;

png_debug1(1, "in %s storage function", "gAMA");

if (png_ptr == NULL || info_ptr == NULL)

return;

- png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);

- png_colorspace_sync_info(png_ptr, info_ptr);

+ /* Check for overflow */

+ if (file_gamma > 21474.83)

+ {

+ png_warning(png_ptr, "Limiting gamma to 21474.83");

+ png_gamma=21474.83;

+ }

+ else

+ png_gamma = file_gamma;

+ info_ptr->gamma = (float)png_gamma;

+#ifdef PNG_FIXED_POINT_SUPPORTED

+ info_ptr->int_gamma = (int)(png_gamma*100000.+.5);

+#endif

+ info_ptr->valid |= PNG_INFO_gAMA;

+ if (png_gamma == 0.0)

+ png_warning(png_ptr, "Setting gamma=0");

}

-# ifdef PNG_FLOATING_POINT_SUPPORTED

+#endif

void PNGAPI

-png_set_gAMA(png_const_structrp png_ptr, png_inforp info_ptr, double file_gamma)

+png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point

+ int_gamma)

{

- png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,

- "png_set_gAMA"));

+ png_fixed_point png_gamma;

+ png_debug1(1, "in %s storage function", "gAMA");

+ if (png_ptr == NULL || info_ptr == NULL)

+ return;

+ if (int_gamma > (png_fixed_point)PNG_UINT_31_MAX)

+ {

+ png_warning(png_ptr, "Limiting gamma to 21474.83");

+ png_gamma=PNG_UINT_31_MAX;

+ }

+ else

+ {

+ if (int_gamma < 0)

+ {

+ png_warning(png_ptr, "Setting negative gamma to zero");

+ png_gamma = 0;

+ }

+ else

+ png_gamma = int_gamma;

+ }

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+ info_ptr->gamma = (float)(png_gamma/100000.);

+#endif

+#ifdef PNG_FIXED_POINT_SUPPORTED

+ info_ptr->int_gamma = png_gamma;

+#endif

+ info_ptr->valid |= PNG_INFO_gAMA;

+ if (png_gamma == 0)

+ png_warning(png_ptr, "Setting gamma=0");

}

-# endif

#endif

#ifdef PNG_hIST_SUPPORTED

void PNGAPI

-png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_uint_16p hist)

+png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)

{

int i;

@@ -173,39 +192,42 @@ png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,

> PNG_MAX_PALETTE_LENGTH)

{

png_warning(png_ptr,

- "Invalid palette size, hIST allocation skipped");

+ "Invalid palette size, hIST allocation skipped.");

return;

}

+#ifdef PNG_FREE_ME_SUPPORTED

png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);

+#endif

/* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in

* version 1.2.1

- info_ptr->hist = png_voidcast(png_uint_16p, png_malloc_warn(png_ptr,

- PNG_MAX_PALETTE_LENGTH * (sizeof (png_uint_16))));

- if (info_ptr->hist == NULL)

+ png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,

+ (png_uint_32)(PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16)));

+ if (png_ptr->hist == NULL)

{

- png_warning(png_ptr, "Insufficient memory for hIST chunk data");

+ png_warning(png_ptr, "Insufficient memory for hIST chunk data.");

return;

}

- info_ptr->free_me |= PNG_FREE_HIST;

for (i = 0; i < info_ptr->num_palette; i++)

- info_ptr->hist[i] = hist[i];

+ png_ptr->hist[i] = hist[i];

+ info_ptr->hist = png_ptr->hist;

info_ptr->valid |= PNG_INFO_hIST;

+#ifdef PNG_FREE_ME_SUPPORTED

+ info_ptr->free_me |= PNG_FREE_HIST;

+#else

+ png_ptr->flags |= PNG_FLAG_FREE_HIST;

+#endif

}

#endif

void PNGAPI

-png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,

- png_uint_32 width, png_uint_32 height, int bit_depth,

- int color_type, int interlace_type, int compression_type,

- int filter_type)

+png_set_IHDR(png_structp png_ptr, png_infop info_ptr,

+ png_uint_32 width, png_uint_32 height, int bit_depth,

+ int color_type, int interlace_type, int compression_type,

+ int filter_type)

{

png_debug1(1, "in %s storage function", "IHDR");

@@ -226,25 +248,30 @@ png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,

if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

info_ptr->channels = 1;

else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)

info_ptr->channels = 3;

else

info_ptr->channels = 1;

if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)

info_ptr->channels++;

info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);

- info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);

+ /* Check for potential overflow */

+ if (width > (PNG_UINT_32_MAX

+ >> 3) /* 8-byte RGBA pixels */

+ - 64 /* bigrowbuf hack */

+ - 1 /* filter byte */

+ - 7*8 /* rounding of width to multiple of 8 pixels */

+ - 8) /* extra max_pixel_depth pad */

+ info_ptr->rowbytes = (png_size_t)0;

+ else

+ info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);

}

#ifdef PNG_oFFs_SUPPORTED

void PNGAPI

-png_set_oFFs(png_const_structrp png_ptr, png_inforp info_ptr,

- png_int_32 offset_x, png_int_32 offset_y, int unit_type)

+png_set_oFFs(png_structp png_ptr, png_infop info_ptr,

+ png_int_32 offset_x, png_int_32 offset_y, int unit_type)

{

png_debug1(1, "in %s storage function", "oFFs");

@@ -260,48 +287,28 @@ png_set_oFFs(png_const_structrp png_ptr, png_inforp info_ptr,

#ifdef PNG_pCAL_SUPPORTED

void PNGAPI

-png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,

- int nparams, png_const_charp units, png_charpp params)

+png_set_pCAL(png_structp png_ptr, png_infop info_ptr,

+ png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,

+ png_charp units, png_charpp params)

{

- png_size_t length;

+ png_uint_32 length;

int i;

png_debug1(1, "in %s storage function", "pCAL");

- if (png_ptr == NULL || info_ptr == NULL || purpose == NULL || units == NULL

- || (nparams > 0 && params == NULL))

+ if (png_ptr == NULL || info_ptr == NULL)

return;

- length = strlen(purpose) + 1;

+ length = png_strlen(purpose) + 1;

png_debug1(3, "allocating purpose for info (%lu bytes)",

- (unsigned long)length);

- /* TODO: validate format of calibration name and unit name */

- /* Check that the type matches the specification. */

- if (type < 0 || type > 3)

- png_error(png_ptr, "Invalid pCAL equation type");

- if (nparams < 0 || nparams > 255)

- png_error(png_ptr, "Invalid pCAL parameter count");

- /* Validate params[nparams] */

- for (i=0; i<nparams; ++i)

- if (params[i] == NULL ||

- !png_check_fp_string(params[i], strlen(params[i])))

- png_error(png_ptr, "Invalid format for pCAL parameter");

- info_ptr->pcal_purpose = png_voidcast(png_charp,

- png_malloc_warn(png_ptr, length));

+ (unsigned long)length);

+ info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);

if (info_ptr->pcal_purpose == NULL)

{

- png_warning(png_ptr, "Insufficient memory for pCAL purpose");

+ png_warning(png_ptr, "Insufficient memory for pCAL purpose.");

return;

}

- memcpy(info_ptr->pcal_purpose, purpose, length);

+ png_memcpy(info_ptr->pcal_purpose, purpose, (png_size_t)length);

png_debug(3, "storing X0, X1, type, and nparams in info");

info_ptr->pcal_X0 = X0;

@@ -309,182 +316,118 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,

info_ptr->pcal_type = (png_byte)type;

info_ptr->pcal_nparams = (png_byte)nparams;

- length = strlen(units) + 1;

+ length = png_strlen(units) + 1;

png_debug1(3, "allocating units for info (%lu bytes)",

(unsigned long)length);

- info_ptr->pcal_units = png_voidcast(png_charp,

- png_malloc_warn(png_ptr, length));

+ info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);

if (info_ptr->pcal_units == NULL)

{

- png_warning(png_ptr, "Insufficient memory for pCAL units");

+ png_warning(png_ptr, "Insufficient memory for pCAL units.");

return;

}

+ png_memcpy(info_ptr->pcal_units, units, (png_size_t)length);

- memcpy(info_ptr->pcal_units, units, length);

- info_ptr->pcal_params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,

- (png_size_t)((nparams + 1) * (sizeof (png_charp)))));

+ info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,

+ (png_uint_32)((nparams + 1) * png_sizeof(png_charp)));

if (info_ptr->pcal_params == NULL)

{

- png_warning(png_ptr, "Insufficient memory for pCAL params");

+ png_warning(png_ptr, "Insufficient memory for pCAL params.");

return;

}

- memset(info_ptr->pcal_params, 0, (nparams + 1) * (sizeof (png_charp)));

+ png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));

for (i = 0; i < nparams; i++)

{

- length = strlen(params[i]) + 1;

+ length = png_strlen(params[i]) + 1;

png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,

- (unsigned long)length);

+ (unsigned long)length);

info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);

if (info_ptr->pcal_params[i] == NULL)

{

- png_warning(png_ptr, "Insufficient memory for pCAL parameter");

+ png_warning(png_ptr, "Insufficient memory for pCAL parameter.");

return;

}

- memcpy(info_ptr->pcal_params[i], params[i], length);

+ png_memcpy(info_ptr->pcal_params[i], params[i], (png_size_t)length);

}

info_ptr->valid |= PNG_INFO_pCAL;

+#ifdef PNG_FREE_ME_SUPPORTED

info_ptr->free_me |= PNG_FREE_PCAL;

+#endif

}

#endif

-#ifdef PNG_sCAL_SUPPORTED

+#if defined(PNG_READ_sCAL_SUPPORTED) || defined(PNG_WRITE_sCAL_SUPPORTED)

+#ifdef PNG_FLOATING_POINT_SUPPORTED

void PNGAPI

-png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,

- int unit, png_const_charp swidth, png_const_charp sheight)

+png_set_sCAL(png_structp png_ptr, png_infop info_ptr,

+ int unit, double width, double height)

{

- png_size_t lengthw = 0, lengthh = 0;

png_debug1(1, "in %s storage function", "sCAL");

if (png_ptr == NULL || info_ptr == NULL)

return;

- /* Double check the unit (should never get here with an invalid

- * unit unless this is an API call.)

- */

- if (unit != 1 && unit != 2)

- png_error(png_ptr, "Invalid sCAL unit");

- if (swidth == NULL || (lengthw = strlen(swidth)) == 0 ||

- swidth[0] == 45 /* '-' */ || !png_check_fp_string(swidth, lengthw))

- png_error(png_ptr, "Invalid sCAL width");

- if (sheight == NULL || (lengthh = strlen(sheight)) == 0 ||

- sheight[0] == 45 /* '-' */ || !png_check_fp_string(sheight, lengthh))

- png_error(png_ptr, "Invalid sCAL height");

info_ptr->scal_unit = (png_byte)unit;

+ info_ptr->scal_pixel_width = width;

+ info_ptr->scal_pixel_height = height;

+ info_ptr->valid |= PNG_INFO_sCAL;

+#else

+#ifdef PNG_FIXED_POINT_SUPPORTED

+void PNGAPI

+png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,

+ int unit, png_charp swidth, png_charp sheight)

+ png_uint_32 length;

- ++lengthw;

+ png_debug1(1, "in %s storage function", "sCAL");

- png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);

+ if (png_ptr == NULL || info_ptr == NULL)

+ return;

- info_ptr->scal_s_width = png_voidcast(png_charp,

- png_malloc_warn(png_ptr, lengthw));

+ info_ptr->scal_unit = (png_byte)unit;

+ length = png_strlen(swidth) + 1;

+ png_debug1(3, "allocating unit for info (%u bytes)",

+ (unsigned int)length);

+ info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, length);

if (info_ptr->scal_s_width == NULL)

{

- png_warning(png_ptr, "Memory allocation failed while processing sCAL");

+ png_warning(png_ptr,

+ "Memory allocation failed while processing sCAL.");

return;

}

+ png_memcpy(info_ptr->scal_s_width, swidth, (png_size_t)length);

- memcpy(info_ptr->scal_s_width, swidth, lengthw);

- ++lengthh;

- png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);

- info_ptr->scal_s_height = png_voidcast(png_charp,

- png_malloc_warn(png_ptr, lengthh));

+ length = png_strlen(sheight) + 1;

+ png_debug1(3, "allocating unit for info (%u bytes)",

+ (unsigned int)length);

+ info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, length);

if (info_ptr->scal_s_height == NULL)

{

png_free (png_ptr, info_ptr->scal_s_width);

info_ptr->scal_s_width = NULL;

- png_warning(png_ptr, "Memory allocation failed while processing sCAL");

+ png_warning(png_ptr,

+ "Memory allocation failed while processing sCAL.");

return;

}

- memcpy(info_ptr->scal_s_height, sheight, lengthh);

+ png_memcpy(info_ptr->scal_s_height, sheight, (png_size_t)length);

info_ptr->valid |= PNG_INFO_sCAL;

+#ifdef PNG_FREE_ME_SUPPORTED

info_ptr->free_me |= PNG_FREE_SCAL;

+#endif

}

-# ifdef PNG_FLOATING_POINT_SUPPORTED

-void PNGAPI

-png_set_sCAL(png_const_structrp png_ptr, png_inforp info_ptr, int unit,

- double width, double height)

- png_debug1(1, "in %s storage function", "sCAL");

- /* Check the arguments. */

- if (width <= 0)

- png_warning(png_ptr, "Invalid sCAL width ignored");

- else if (height <= 0)

- png_warning(png_ptr, "Invalid sCAL height ignored");

- else

- {

- /* Convert 'width' and 'height' to ASCII. */

- char swidth[PNG_sCAL_MAX_DIGITS+1];

- char sheight[PNG_sCAL_MAX_DIGITS+1];

- png_ascii_from_fp(png_ptr, swidth, (sizeof swidth), width,

- PNG_sCAL_PRECISION);

- png_ascii_from_fp(png_ptr, sheight, (sizeof sheight), height,

- PNG_sCAL_PRECISION);

- png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);

- }

-# endif

-# ifdef PNG_FIXED_POINT_SUPPORTED

-void PNGAPI

-png_set_sCAL_fixed(png_const_structrp png_ptr, png_inforp info_ptr, int unit,

- png_fixed_point width, png_fixed_point height)

- png_debug1(1, "in %s storage function", "sCAL");

- /* Check the arguments. */

- if (width <= 0)

- png_warning(png_ptr, "Invalid sCAL width ignored");

- else if (height <= 0)

- png_warning(png_ptr, "Invalid sCAL height ignored");

- else

- {

- /* Convert 'width' and 'height' to ASCII. */

- char swidth[PNG_sCAL_MAX_DIGITS+1];

- char sheight[PNG_sCAL_MAX_DIGITS+1];

- png_ascii_from_fixed(png_ptr, swidth, (sizeof swidth), width);

- png_ascii_from_fixed(png_ptr, sheight, (sizeof sheight), height);

- png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);

- }

-# endif

+#endif

#endif

#ifdef PNG_pHYs_SUPPORTED

void PNGAPI

-png_set_pHYs(png_const_structrp png_ptr, png_inforp info_ptr,

- png_uint_32 res_x, png_uint_32 res_y, int unit_type)

+png_set_pHYs(png_structp png_ptr, png_infop info_ptr,

+ png_uint_32 res_x, png_uint_32 res_y, int unit_type)

{

png_debug1(1, "in %s storage function", "pHYs");

@@ -499,8 +442,8 @@ png_set_pHYs(png_const_structrp png_ptr, png_inforp info_ptr,

#endif

void PNGAPI

-png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,

- png_const_colorp palette, int num_palette)

+png_set_PLTE(png_structp png_ptr, png_infop info_ptr,

+ png_colorp palette, int num_palette)

{

png_debug1(1, "in %s storage function", "PLTE");

@@ -512,7 +455,6 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,

{

if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)

png_error(png_ptr, "Invalid palette length");

else

{

png_warning(png_ptr, "Invalid palette length");

@@ -520,255 +462,255 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,

}

- if ((num_palette > 0 && palette == NULL) ||

- (num_palette == 0

-# ifdef PNG_MNG_FEATURES_SUPPORTED

- && (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0

-# endif

- ))

- {

- png_chunk_report(png_ptr, "Invalid palette", PNG_CHUNK_ERROR);

- return;

- }

/* It may not actually be necessary to set png_ptr->palette here;

* we do it for backward compatibility with the way the png_handle_tRNS

* function used to do the allocation.

- *

- * 1.6.0: the above statement appears to be incorrect; something has to set

- * the palette inside png_struct on read.

+#ifdef PNG_FREE_ME_SUPPORTED

png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);

+#endif

/* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead

* of num_palette entries, in case of an invalid PNG file that has

* too-large sample values.

- png_ptr->palette = png_voidcast(png_colorp, png_calloc(png_ptr,

- PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));

- if (num_palette > 0)

- memcpy(png_ptr->palette, palette, num_palette * (sizeof (png_color)));

+ png_ptr->palette = (png_colorp)png_calloc(png_ptr,

+ PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));

+ png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));

info_ptr->palette = png_ptr->palette;

info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;

+#ifdef PNG_FREE_ME_SUPPORTED

info_ptr->free_me |= PNG_FREE_PLTE;

+#else

+ png_ptr->flags |= PNG_FLAG_FREE_PLTE;

+#endif

info_ptr->valid |= PNG_INFO_PLTE;

}

#ifdef PNG_sBIT_SUPPORTED

void PNGAPI

-png_set_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_color_8p sig_bit)

+png_set_sBIT(png_structp png_ptr, png_infop info_ptr,

+ png_color_8p sig_bit)

{

png_debug1(1, "in %s storage function", "sBIT");

- if (png_ptr == NULL || info_ptr == NULL || sig_bit == NULL)

+ if (png_ptr == NULL || info_ptr == NULL)

return;

- info_ptr->sig_bit = *sig_bit;

+ png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));

info_ptr->valid |= PNG_INFO_sBIT;

}

#endif

#ifdef PNG_sRGB_SUPPORTED

void PNGAPI

-png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)

+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)

{

png_debug1(1, "in %s storage function", "sRGB");

if (png_ptr == NULL || info_ptr == NULL)

return;

- (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);

- png_colorspace_sync_info(png_ptr, info_ptr);

+ info_ptr->srgb_intent = (png_byte)intent;

+ info_ptr->valid |= PNG_INFO_sRGB;

}

void PNGAPI

-png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,

- int srgb_intent)

+png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,

+ int intent)

{

+#ifdef PNG_gAMA_SUPPORTED

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+ float file_gamma;

+#endif

+#ifdef PNG_FIXED_POINT_SUPPORTED

+ png_fixed_point int_file_gamma;

+#endif

+#ifdef PNG_cHRM_SUPPORTED

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+ float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;

+#endif

+ png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,

+ int_green_y, int_blue_x, int_blue_y;

+#endif

png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");

if (png_ptr == NULL || info_ptr == NULL)

return;

- if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent))

- {

- /* This causes the gAMA and cHRM to be written too */

- info_ptr->colorspace.flags |=

- PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;

- }

+ png_set_sRGB(png_ptr, info_ptr, intent);

+#ifdef PNG_gAMA_SUPPORTED

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+ file_gamma = (float).45455;

+ png_set_gAMA(png_ptr, info_ptr, file_gamma);

+#endif

+#ifdef PNG_FIXED_POINT_SUPPORTED

+ int_file_gamma = 45455L;

+ png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);

+#endif

+#ifdef PNG_cHRM_SUPPORTED

+ int_white_x = 31270L;

+ int_white_y = 32900L;

+ int_red_x = 64000L;

+ int_red_y = 33000L;

+ int_green_x = 30000L;

+ int_green_y = 60000L;

+ int_blue_x = 15000L;

+ int_blue_y = 6000L;

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+ white_x = (float).3127;

+ white_y = (float).3290;

+ red_x = (float).64;

+ red_y = (float).33;

+ green_x = (float).30;

+ green_y = (float).60;

+ blue_x = (float).15;

+ blue_y = (float).06;

+#endif

- png_colorspace_sync_info(png_ptr, info_ptr);

+#ifdef PNG_FIXED_POINT_SUPPORTED

+ png_set_cHRM_fixed(png_ptr, info_ptr,

+ int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,

+ int_green_y, int_blue_x, int_blue_y);

+#endif

+#ifdef PNG_FLOATING_POINT_SUPPORTED

+ png_set_cHRM(png_ptr, info_ptr,

+ white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);

+#endif

+#endif /* cHRM */

}

#endif /* sRGB */

#ifdef PNG_iCCP_SUPPORTED

void PNGAPI

-png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_charp name, int compression_type,

- png_const_bytep profile, png_uint_32 proflen)

+png_set_iCCP(png_structp png_ptr, png_infop info_ptr,

+ png_charp name, int compression_type,

+ png_charp profile, png_uint_32 proflen)

{

png_charp new_iccp_name;

- png_bytep new_iccp_profile;

- png_size_t length;

+ png_charp new_iccp_profile;

+ png_uint_32 length;

png_debug1(1, "in %s storage function", "iCCP");

if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)

return;

- if (compression_type != PNG_COMPRESSION_TYPE_BASE)

- png_app_error(png_ptr, "Invalid iCCP compression method");

- /* Set the colorspace first because this validates the profile; do not

- * override previously set app cHRM or gAMA here (because likely as not the

- * application knows better than libpng what the correct values are.) Pass

- * the info_ptr color_type field to png_colorspace_set_ICC because in the

- * write case it has not yet been stored in png_ptr.

- */

- {

- int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,

- proflen, profile, info_ptr->color_type);

- png_colorspace_sync_info(png_ptr, info_ptr);

- /* Don't do any of the copying if the profile was bad, or inconsistent. */

- if (!result)

- return;

- /* But do write the gAMA and cHRM chunks from the profile. */

- info_ptr->colorspace.flags |=

- PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;

- }

- length = strlen(name)+1;

- new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));

+ length = png_strlen(name)+1;

+ new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);

if (new_iccp_name == NULL)

{

- png_benign_error(png_ptr, "Insufficient memory to process iCCP chunk");

+ png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");

return;

}

- memcpy(new_iccp_name, name, length);

- new_iccp_profile = png_voidcast(png_bytep,

- png_malloc_warn(png_ptr, proflen));

+ png_memcpy(new_iccp_name, name, length);

+ new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);

if (new_iccp_profile == NULL)

{

- png_free(png_ptr, new_iccp_name);

- png_benign_error(png_ptr,

- "Insufficient memory to process iCCP profile");

+ png_free (png_ptr, new_iccp_name);

+ png_warning(png_ptr,

+ "Insufficient memory to process iCCP profile.");

return;

}

- memcpy(new_iccp_profile, profile, proflen);

+ png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);

png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);

info_ptr->iccp_proflen = proflen;

info_ptr->iccp_name = new_iccp_name;

info_ptr->iccp_profile = new_iccp_profile;

+ /* Compression is always zero but is here so the API and info structure

+ * does not have to change if we introduce multiple compression types

+ */

+ info_ptr->iccp_compression = (png_byte)compression_type;

+#ifdef PNG_FREE_ME_SUPPORTED

info_ptr->free_me |= PNG_FREE_ICCP;

+#endif

info_ptr->valid |= PNG_INFO_iCCP;

}

#endif

#ifdef PNG_TEXT_SUPPORTED

void PNGAPI

-png_set_text(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_textp text_ptr, int num_text)

+png_set_text(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,

+ int num_text)

{

int ret;

ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);

if (ret)

png_error(png_ptr, "Insufficient memory to store text");

}

int /* PRIVATE */

-png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_textp text_ptr, int num_text)

+png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,

+ int num_text)

{

int i;

- png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" :

- (unsigned long)png_ptr->chunk_name);

+ png_debug1(1, "in %s storage function", ((png_ptr == NULL ||

+ png_ptr->chunk_name[0] == '\0') ?

+ "text" : (png_const_charp)png_ptr->chunk_name));

- if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)

+ if (png_ptr == NULL || info_ptr == NULL || num_text == 0)

return(0);

/* Make sure we have enough space in the "text" array in info_struct

- * to hold all of the incoming text_ptr objects. This compare can't overflow

- * because max_text >= num_text (anyway, subtract of two positive integers

- * can't overflow in any case.)

+ * to hold all of the incoming text_ptr objects.

- if (num_text > info_ptr->max_text - info_ptr->num_text)

+ if (info_ptr->num_text + num_text > info_ptr->max_text)

{

- int old_num_text = info_ptr->num_text;

- int max_text;

- png_textp new_text = NULL;

- /* Calculate an appropriate max_text, checking for overflow. */

- max_text = old_num_text;

- if (num_text <= INT_MAX - max_text)

+ if (info_ptr->text != NULL)

{

- max_text += num_text;

- /* Round up to a multiple of 8 */

- if (max_text < INT_MAX-8)

- max_text = (max_text + 8) & ~0x7;

- else

- max_text = INT_MAX;

- /* Now allocate a new array and copy the old members in, this does all

- * the overflow checks.

- */

- new_text = png_voidcast(png_textp,png_realloc_array(png_ptr,

- info_ptr->text, old_num_text, max_text-old_num_text,

- sizeof *new_text));

+ png_textp old_text;

+ int old_max;

+ old_max = info_ptr->max_text;

+ info_ptr->max_text = info_ptr->num_text + num_text + 8;

+ old_text = info_ptr->text;

+ info_ptr->text = (png_textp)png_malloc_warn(png_ptr,

+ (png_uint_32)(info_ptr->max_text * png_sizeof(png_text)));

+ if (info_ptr->text == NULL)

+ {

+ png_free(png_ptr, old_text);

+ return(1);

+ }

+ png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *

+ png_sizeof(png_text)));

+ png_free(png_ptr, old_text);

}

- if (new_text == NULL)

+ else

{

- png_chunk_report(png_ptr, "too many text chunks",

- PNG_CHUNK_WRITE_ERROR);

- return 1;

+ info_ptr->max_text = num_text + 8;

+ info_ptr->num_text = 0;

+ info_ptr->text = (png_textp)png_malloc_warn(png_ptr,

+ (png_uint_32)(info_ptr->max_text * png_sizeof(png_text)));

+ if (info_ptr->text == NULL)

+ return(1);

+#ifdef PNG_FREE_ME_SUPPORTED

+ info_ptr->free_me |= PNG_FREE_TEXT;

+#endif

}

- png_free(png_ptr, info_ptr->text);

- info_ptr->text = new_text;

- info_ptr->free_me |= PNG_FREE_TEXT;

- info_ptr->max_text = max_text;

- /* num_text is adjusted below as the entries are copied in */

- png_debug1(3, "allocated %d entries for info_ptr->text", max_text);

+ png_debug1(3, "allocated %d entries for info_ptr->text",

+ info_ptr->max_text);

}

for (i = 0; i < num_text; i++)

{

- size_t text_length, key_len;

- size_t lang_len, lang_key_len;

+ png_size_t text_length, key_len;

+ png_size_t lang_len, lang_key_len;

png_textp textp = &(info_ptr->text[info_ptr->num_text]);

if (text_ptr[i].key == NULL)

continue;

- if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||

- text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)

- {

- png_chunk_report(png_ptr, "text compression mode is out of range",

- PNG_CHUNK_WRITE_ERROR);

- continue;

- }

- key_len = strlen(text_ptr[i].key);

+ key_len = png_strlen(text_ptr[i].key);

if (text_ptr[i].compression <= 0)

{

@@ -777,652 +719,403 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,

}

else

-# ifdef PNG_iTXt_SUPPORTED

+#ifdef PNG_iTXt_SUPPORTED

{

/* Set iTXt data */

if (text_ptr[i].lang != NULL)

- lang_len = strlen(text_ptr[i].lang);

+ lang_len = png_strlen(text_ptr[i].lang);

else

lang_len = 0;

if (text_ptr[i].lang_key != NULL)

- lang_key_len = strlen(text_ptr[i].lang_key);

+ lang_key_len = png_strlen(text_ptr[i].lang_key);

else

lang_key_len = 0;

}

-# else /* PNG_iTXt_SUPPORTED */

+#else /* PNG_iTXt_SUPPORTED */

{

- png_chunk_report(png_ptr, "iTXt chunk not supported",

- PNG_CHUNK_WRITE_ERROR);

+ png_warning(png_ptr, "iTXt chunk not supported.");

continue;

}

-# endif

+#endif

if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')

{

text_length = 0;

-# ifdef PNG_iTXt_SUPPORTED

+#ifdef PNG_iTXt_SUPPORTED

if (text_ptr[i].compression > 0)

textp->compression = PNG_ITXT_COMPRESSION_NONE;

else

-# endif

+#endif

textp->compression = PNG_TEXT_COMPRESSION_NONE;

}

else

{

- text_length = strlen(text_ptr[i].text);

+ text_length = png_strlen(text_ptr[i].text);

textp->compression = text_ptr[i].compression;

}

- textp->key = png_voidcast(png_charp,png_malloc_base(png_ptr,

- key_len + text_length + lang_len + lang_key_len + 4));

+ textp->key = (png_charp)png_malloc_warn(png_ptr,

+ (png_uint_32)

+ (key_len + text_length + lang_len + lang_key_len + 4));

if (textp->key == NULL)

- {

- png_chunk_report(png_ptr, "text chunk: out of memory",

- PNG_CHUNK_WRITE_ERROR);

- return 1;

- }

- png_debug2(2, "Allocated %lu bytes at %p in png_set_text",

- (unsigned long)(png_uint_32)

- (key_len + lang_len + lang_key_len + text_length + 4),

- textp->key);

+ return(1);

+ png_debug2(2, "Allocated %lu bytes at %x in png_set_text",

+ (png_uint_32)

+ (key_len + lang_len + lang_key_len + text_length + 4),

+ (int)textp->key);

- memcpy(textp->key, text_ptr[i].key, key_len);

+ png_memcpy(textp->key, text_ptr[i].key,(png_size_t)(key_len));

*(textp->key + key_len) = '\0';

+#ifdef PNG_iTXt_SUPPORTED

if (text_ptr[i].compression > 0)

{

textp->lang = textp->key + key_len + 1;

- memcpy(textp->lang, text_ptr[i].lang, lang_len);

+ png_memcpy(textp->lang, text_ptr[i].lang, lang_len);

*(textp->lang + lang_len) = '\0';

textp->lang_key = textp->lang + lang_len + 1;

- memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);

+ png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);

*(textp->lang_key + lang_key_len) = '\0';

textp->text = textp->lang_key + lang_key_len + 1;

}

else

+#endif

{

+#ifdef PNG_iTXt_SUPPORTED

textp->lang=NULL;

textp->lang_key=NULL;

+#endif

textp->text = textp->key + key_len + 1;

}

if (text_length)

- memcpy(textp->text, text_ptr[i].text, text_length);

+ png_memcpy(textp->text, text_ptr[i].text,

+ (png_size_t)(text_length));

*(textp->text + text_length) = '\0';

-# ifdef PNG_iTXt_SUPPORTED

+#ifdef PNG_iTXt_SUPPORTED

if (textp->compression > 0)

{

textp->text_length = 0;

textp->itxt_length = text_length;

}

else

-# endif

+#endif

{

textp->text_length = text_length;

+#ifdef PNG_iTXt_SUPPORTED

textp->itxt_length = 0;

+#endif

}

info_ptr->num_text++;

png_debug1(3, "transferred text chunk %d", info_ptr->num_text);

}

return(0);

}

#endif

#ifdef PNG_tIME_SUPPORTED

void PNGAPI

-png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr,

- png_const_timep mod_time)

+png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)

{

png_debug1(1, "in %s storage function", "tIME");

- if (png_ptr == NULL || info_ptr == NULL || mod_time == NULL ||

+ if (png_ptr == NULL || info_ptr == NULL ||

(png_ptr->mode & PNG_WROTE_tIME))

return;

- if (mod_time->month == 0 || mod_time->month > 12 ||

- mod_time->day == 0 || mod_time->day > 31 ||

- mod_time->hour > 23 || mod_time->minute > 59 ||

- mod_time->second > 60)

- {

- png_warning(png_ptr, "Ignoring invalid time value");

- return;

- }

- info_ptr->mod_time = *mod_time;

+ png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));

info_ptr->valid |= PNG_INFO_tIME;

}

#endif

#ifdef PNG_tRNS_SUPPORTED

void PNGAPI

-png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,

- png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)

+png_set_tRNS(png_structp png_ptr, png_infop info_ptr,

+ png_bytep trans, int num_trans, png_color_16p trans_values)

{

png_debug1(1, "in %s storage function", "tRNS");

if (png_ptr == NULL || info_ptr == NULL)

return;

- if (trans_alpha != NULL)

+ if (trans != NULL)

{

- /* It may not actually be necessary to set png_ptr->trans_alpha here;

+ /* It may not actually be necessary to set png_ptr->trans here;

* we do it for backward compatibility with the way the png_handle_tRNS

* function used to do the allocation.

- *

- * 1.6.0: The above statement is incorrect; png_handle_tRNS effectively

- * relies on png_set_tRNS storing the information in png_struct

- * (otherwise it won't be there for the code in pngrtran.c).

+#ifdef PNG_FREE_ME_SUPPORTED

png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);

+#endif

/* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */

- png_ptr->trans_alpha = info_ptr->trans_alpha = png_voidcast(png_bytep,

- png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));

+ png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,

+ (png_uint_32)PNG_MAX_PALETTE_LENGTH);

if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)

- memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);

+ png_memcpy(info_ptr->trans, trans, (png_size_t)num_trans);

}

- if (trans_color != NULL)

+ if (trans_values != NULL)

{

int sample_max = (1 << info_ptr->bit_depth);

if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&

- trans_color->gray > sample_max) ||

+ (int)trans_values->gray > sample_max) ||

(info_ptr->color_type == PNG_COLOR_TYPE_RGB &&

- (trans_color->red > sample_max ||

- trans_color->green > sample_max ||

- trans_color->blue > sample_max)))

+ ((int)trans_values->red > sample_max ||

+ (int)trans_values->green > sample_max ||

+ (int)trans_values->blue > sample_max)))

png_warning(png_ptr,

"tRNS chunk has out-of-range samples for bit_depth");

- info_ptr->trans_color = *trans_color;

+ png_memcpy(&(info_ptr->trans_values), trans_values,

+ png_sizeof(png_color_16));

if (num_trans == 0)

num_trans = 1;

}

info_ptr->num_trans = (png_uint_16)num_trans;

if (num_trans != 0)

{

info_ptr->valid |= PNG_INFO_tRNS;

+#ifdef PNG_FREE_ME_SUPPORTED

info_ptr->free_me |= PNG_FREE_TRNS;

+#else

+ png_ptr->flags |= PNG_FLAG_FREE_TRNS;

+#endif

}

#endif

#ifdef PNG_sPLT_SUPPORTED

void PNGAPI

-png_set_sPLT(png_const_structrp png_ptr,

- png_inforp info_ptr, png_const_sPLT_tp entries, int nentries)

+png_set_sPLT(png_structp png_ptr,

+ png_infop info_ptr, png_sPLT_tp entries, int nentries)

* entries - array of png_sPLT_t structures

* to be added to the list of palettes

* in the info structure.

- *

* nentries - number of palette structures to be

* added.

{

png_sPLT_tp np;

+ int i;

- if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)

+ if (png_ptr == NULL || info_ptr == NULL)

return;

- /* Use the internal realloc function, which checks for all the possible

- * overflows. Notice that the parameters are (int) and (size_t)

- */

- np = png_voidcast(png_sPLT_tp,png_realloc_array(png_ptr,

- info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,

- sizeof *np));

+ np = (png_sPLT_tp)png_malloc_warn(png_ptr,

+ (info_ptr->splt_palettes_num + nentries) *

+ (png_uint_32)png_sizeof(png_sPLT_t));

if (np == NULL)

{

- /* Out of memory or too many chunks */

- png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR);

+ png_warning(png_ptr, "No memory for sPLT palettes.");

return;

}

+ png_memcpy(np, info_ptr->splt_palettes,

+ info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));

png_free(png_ptr, info_ptr->splt_palettes);

- info_ptr->splt_palettes = np;

- info_ptr->free_me |= PNG_FREE_SPLT;

- np += info_ptr->splt_palettes_num;

+ info_ptr->splt_palettes=NULL;

- do

+ for (i = 0; i < nentries; i++)

{

- png_size_t length;

+ png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;

+ png_sPLT_tp from = entries + i;

+ png_uint_32 length;

- /* Skip invalid input entries */

- if (entries->name == NULL || entries->entries == NULL)

+ length = png_strlen(from->name) + 1;

+ to->name = (png_charp)png_malloc_warn(png_ptr, length);

+ if (to->name == NULL)

{

- /* png_handle_sPLT doesn't do this, so this is an app error */

- png_app_error(png_ptr, "png_set_sPLT: invalid sPLT");

- /* Just skip the invalid entry */

+ png_warning(png_ptr,

+ "Out of memory while processing sPLT chunk");

continue;

}

- np->depth = entries->depth;

- /* In the even of out-of-memory just return - there's no point keeping on

- * trying to add sPLT chunks.

- */

- length = strlen(entries->name) + 1;

- np->name = png_voidcast(png_charp, png_malloc_base(png_ptr, length));

- if (np->name == NULL)

- break;

- memcpy(np->name, entries->name, length);

- /* IMPORTANT: we have memory now that won't get freed if something else

- * goes wrong, this code must free it. png_malloc_array produces no

- * warnings, use a png_chunk_report (below) if there is an error.

- */

- np->entries = png_voidcast(png_sPLT_entryp, png_malloc_array(png_ptr,

- entries->nentries, sizeof (png_sPLT_entry)));

- if (np->entries == NULL)

+ png_memcpy(to->name, from->name, length);

+ to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,

+ (png_uint_32)(from->nentries * png_sizeof(png_sPLT_entry)));

+ if (to->entries == NULL)

{

- png_free(png_ptr, np->name);

- break;

+ png_warning(png_ptr,

+ "Out of memory while processing sPLT chunk");

+ png_free(png_ptr, to->name);

+ to->name = NULL;

+ continue;

}

- np->nentries = entries->nentries;

- /* This multiply can't overflow because png_malloc_array has already

- * checked it when doing the allocation.

- */

- memcpy(np->entries, entries->entries,

- entries->nentries * sizeof (png_sPLT_entry));

- /* Note that 'continue' skips the advance of the out pointer and out

- * count, so an invalid entry is not added.

- */

- info_ptr->valid |= PNG_INFO_sPLT;

- ++(info_ptr->splt_palettes_num);

- ++np;

+ png_memcpy(to->entries, from->entries,

+ from->nentries * png_sizeof(png_sPLT_entry));

+ to->nentries = from->nentries;

+ to->depth = from->depth;

}

- while (++entries, --nentries);

- if (nentries > 0)

- png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);

+ info_ptr->splt_palettes = np;

+ info_ptr->splt_palettes_num += nentries;

+ info_ptr->valid |= PNG_INFO_sPLT;

+#ifdef PNG_FREE_ME_SUPPORTED

+ info_ptr->free_me |= PNG_FREE_SPLT;

+#endif

}

#endif /* PNG_sPLT_SUPPORTED */

-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

-static png_byte

-check_location(png_const_structrp png_ptr, int location)

- location &= (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT);

- /* New in 1.6.0; copy the location and check it. This is an API

- * change, previously the app had to use the

- * png_set_unknown_chunk_location API below for each chunk.

- */

- if (location == 0 && !(png_ptr->mode & PNG_IS_READ_STRUCT))

- {

- /* Write struct, so unknown chunks come from the app */

- png_app_warning(png_ptr,

- "png_set_unknown_chunks now expects a valid location");

- /* Use the old behavior */

- location = (png_byte)(png_ptr->mode &

- (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));

- }

- /* This need not be an internal error - if the app calls

- * png_set_unknown_chunks on a read pointer it must get the location right.

- */

- if (location == 0)

- png_error(png_ptr, "invalid location in png_set_unknown_chunks");

- /* Now reduce the location to the top-most set bit by removing each least

- * significant bit in turn.

- */

- while (location != (location & -location))

- location &= ~(location & -location);

- /* The cast is safe because 'location' is a bit mask and only the low four

- * bits are significant.

- */

- return (png_byte)location;

+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED

void PNGAPI

-png_set_unknown_chunks(png_const_structrp png_ptr,

- png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)

+png_set_unknown_chunks(png_structp png_ptr,

+ png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)

{

png_unknown_chunkp np;

+ int i;

- if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 ||

- unknowns == NULL)

+ if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)

return;

- /* Check for the failure cases where support has been disabled at compile

- * time. This code is hardly ever compiled - it's here because

- * STORE_UNKNOWN_CHUNKS is set by both read and write code (compiling in this

- * code) but may be meaningless if the read or write handling of unknown

- * chunks is not compiled in.

- */

-# if !defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) && \

- defined(PNG_READ_SUPPORTED)

- if (png_ptr->mode & PNG_IS_READ_STRUCT)

- {

- png_app_error(png_ptr, "no unknown chunk support on read");

- return;

- }

-# endif

-# if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \

- defined(PNG_WRITE_SUPPORTED)

- if (!(png_ptr->mode & PNG_IS_READ_STRUCT))

- {

- png_app_error(png_ptr, "no unknown chunk support on write");

- return;

- }

-# endif

- /* Prior to 1.6.0 this code used png_malloc_warn; however, this meant that

- * unknown critical chunks could be lost with just a warning resulting in

- * undefined behavior. Now png_chunk_report is used to provide behavior

- * appropriate to read or write.

- */

- np = png_voidcast(png_unknown_chunkp, png_realloc_array(png_ptr,

- info_ptr->unknown_chunks, info_ptr->unknown_chunks_num, num_unknowns,

- sizeof *np));

+ np = (png_unknown_chunkp)png_malloc_warn(png_ptr,

+ (png_uint_32)((info_ptr->unknown_chunks_num + num_unknowns) *

+ png_sizeof(png_unknown_chunk)));

if (np == NULL)

{

- png_chunk_report(png_ptr, "too many unknown chunks",

- PNG_CHUNK_WRITE_ERROR);

+ png_warning(png_ptr,

+ "Out of memory while processing unknown chunk.");

return;

}

+ png_memcpy(np, info_ptr->unknown_chunks,

+ info_ptr->unknown_chunks_num * png_sizeof(png_unknown_chunk));

png_free(png_ptr, info_ptr->unknown_chunks);

- info_ptr->unknown_chunks = np; /* safe because it is initialized */

- info_ptr->free_me |= PNG_FREE_UNKN;

- np += info_ptr->unknown_chunks_num;

+ info_ptr->unknown_chunks = NULL;

- /* Increment unknown_chunks_num each time round the loop to protect the

- * just-allocated chunk data.

- */

- for (; num_unknowns > 0; --num_unknowns, ++unknowns)

+ for (i = 0; i < num_unknowns; i++)

{

- memcpy(np->name, unknowns->name, (sizeof np->name));

- np->name[(sizeof np->name)-1] = '\0';

- np->location = check_location(png_ptr, unknowns->location);

- if (unknowns->size == 0)

- {

- np->data = NULL;

- np->size = 0;

- }

+ png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;

+ png_unknown_chunkp from = unknowns + i;

+ png_memcpy((png_charp)to->name, (png_charp)from->name,

+ png_sizeof(from->name));

+ to->name[png_sizeof(to->name)-1] = '\0';

+ to->size = from->size;

+ /* Note our location in the read or write sequence */

+ to->location = (png_byte)(png_ptr->mode & 0xff);

+ if (from->size == 0)

+ to->data=NULL;

else

{

- np->data = png_voidcast(png_bytep,

- png_malloc_base(png_ptr, unknowns->size));

- if (np->data == NULL)

+ to->data = (png_bytep)png_malloc_warn(png_ptr,

+ (png_uint_32)from->size);

+ if (to->data == NULL)

{

- png_chunk_report(png_ptr, "unknown chunk: out of memory",

- PNG_CHUNK_WRITE_ERROR);

- /* But just skip storing the unknown chunk */

- continue;

+ png_warning(png_ptr,

+ "Out of memory while processing unknown chunk.");

+ to->size = 0;

}

- memcpy(np->data, unknowns->data, unknowns->size);

- np->size = unknowns->size;

+ else

+ png_memcpy(to->data, from->data, from->size);

}

- /* These increments are skipped on out-of-memory for the data - the

- * unknown chunk entry gets overwritten if the png_chunk_report returns.

- * This is correct in the read case (the chunk is just dropped.)

- */

- ++np;

- ++(info_ptr->unknown_chunks_num);

}

+ info_ptr->unknown_chunks = np;

+ info_ptr->unknown_chunks_num += num_unknowns;

+#ifdef PNG_FREE_ME_SUPPORTED

+ info_ptr->free_me |= PNG_FREE_UNKN;

+#endif

}

+void PNGAPI

+png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,

+ int chunk, int location)

+ if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <

+ (int)info_ptr->unknown_chunks_num)

+ info_ptr->unknown_chunks[chunk].location = (png_byte)location;

+#endif

+#if defined(PNG_1_0_X) || defined(PNG_1_2_X)

+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \

+ defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)

void PNGAPI

-png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,

- int chunk, int location)

+png_permit_empty_plte (png_structp png_ptr, int empty_plte_permitted)

{

- /* This API is pretty pointless in 1.6.0 because the location can be set

- * before the call to png_set_unknown_chunks.

- *

- * TODO: add a png_app_warning in 1.7

- */

- if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 &&

- chunk < info_ptr->unknown_chunks_num)

- {

- if ((location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)

- {

- png_app_error(png_ptr, "invalid unknown chunk location");

- /* Fake out the pre 1.6.0 behavior: */

- if ((location & PNG_HAVE_IDAT)) /* undocumented! */

- location = PNG_AFTER_IDAT;

+ /* This function is deprecated in favor of png_permit_mng_features()

+ and will be removed from libpng-1.3.0 */

- else

- location = PNG_HAVE_IHDR; /* also undocumented */

- }

+ png_debug(1, "in png_permit_empty_plte, DEPRECATED.");

- info_ptr->unknown_chunks[chunk].location =

- check_location(png_ptr, location);

- }

+ if (png_ptr == NULL)

+ return;

+ png_ptr->mng_features_permitted = (png_byte)

+ ((png_ptr->mng_features_permitted & (~PNG_FLAG_MNG_EMPTY_PLTE)) |

+ ((empty_plte_permitted & PNG_FLAG_MNG_EMPTY_PLTE)));

}

#endif

+#endif

#ifdef PNG_MNG_FEATURES_SUPPORTED

png_uint_32 PNGAPI

-png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)

+png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)

{

png_debug(1, "in png_permit_mng_features");

if (png_ptr == NULL)

- return 0;

- png_ptr->mng_features_permitted = mng_features & PNG_ALL_MNG_FEATURES;

- return png_ptr->mng_features_permitted;

+ return (png_uint_32)0;

+ png_ptr->mng_features_permitted =

+ (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);

+ return (png_uint_32)png_ptr->mng_features_permitted;

}

#endif

#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED

-static unsigned int

-add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep)

- unsigned int i;

- /* Utility function: update the 'keep' state of a chunk if it is already in

- * the list, otherwise add it to the list.

- */

- for (i=0; i<count; ++i, list += 5) if (memcmp(list, add, 4) == 0)

- {

- list[4] = (png_byte)keep;

- return count;

- }

- if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT)

- {

- ++count;

- memcpy(list, add, 4);

- list[4] = (png_byte)keep;

- }

- return count;

void PNGAPI

-png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,

- png_const_bytep chunk_list, int num_chunks_in)

+png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep

+ chunk_list, int num_chunks)

{

- png_bytep new_list;

- unsigned int num_chunks, old_num_chunks;

+ png_bytep new_list, p;

+ int i, old_num_chunks;

if (png_ptr == NULL)

return;

- if (keep < 0 || keep >= PNG_HANDLE_CHUNK_LAST)

- {

- png_app_error(png_ptr, "png_set_keep_unknown_chunks: invalid keep");

- return;

- }

- if (num_chunks_in <= 0)

- {

- png_ptr->unknown_default = keep;

- /* '0' means just set the flags, so stop here */

- if (num_chunks_in == 0)

- return;

- }

- if (num_chunks_in < 0)

- {

- /* Ignore all unknown chunks and all chunks recognized by

- * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND

- */

- static PNG_CONST png_byte chunks_to_ignore[] = {

- 98, 75, 71, 68, '\0', /* bKGD */

- 99, 72, 82, 77, '\0', /* cHRM */

- 103, 65, 77, 65, '\0', /* gAMA */

- 104, 73, 83, 84, '\0', /* hIST */

- 105, 67, 67, 80, '\0', /* iCCP */

- 105, 84, 88, 116, '\0', /* iTXt */

- 111, 70, 70, 115, '\0', /* oFFs */

- 112, 67, 65, 76, '\0', /* pCAL */

- 112, 72, 89, 115, '\0', /* pHYs */

- 115, 66, 73, 84, '\0', /* sBIT */

- 115, 67, 65, 76, '\0', /* sCAL */

- 115, 80, 76, 84, '\0', /* sPLT */

- 115, 84, 69, 82, '\0', /* sTER */

- 115, 82, 71, 66, '\0', /* sRGB */

- 116, 69, 88, 116, '\0', /* tEXt */

- 116, 73, 77, 69, '\0', /* tIME */

- 122, 84, 88, 116, '\0' /* zTXt */

- };

- chunk_list = chunks_to_ignore;

- num_chunks = (sizeof chunks_to_ignore)/5;

- }

- else /* num_chunks_in > 0 */

+ if (num_chunks == 0)

{

- if (chunk_list == NULL)

- {

- /* Prior to 1.6.0 this was silently ignored, now it is an app_error

- * which can be switched off.

- */

- png_app_error(png_ptr, "png_set_keep_unknown_chunks: no chunk list");

- return;

- }

- num_chunks = num_chunks_in;

- }

- old_num_chunks = png_ptr->num_chunk_list;

- if (png_ptr->chunk_list == NULL)

- old_num_chunks = 0;

+ if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)

+ png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;

+ else

+ png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;

- /* Since num_chunks is always restricted to UINT_MAX/5 this can't overflow.

- */

- if (num_chunks + old_num_chunks > UINT_MAX/5)

- {

- png_app_error(png_ptr, "png_set_keep_unknown_chunks: too many chunks");

+ if (keep == PNG_HANDLE_CHUNK_ALWAYS)

+ png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;

+ else

+ png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;

return;

}

- /* If these chunks are being reset to the default then no more memory is

- * required because add_one_chunk above doesn't extend the list if the 'keep'

- * parameter is the default.

- */

- if (keep)

- {

- new_list = png_voidcast(png_bytep, png_malloc(png_ptr,

- 5 * (num_chunks + old_num_chunks)));

- if (old_num_chunks > 0)

- memcpy(new_list, png_ptr->chunk_list, 5*old_num_chunks);

- }

- else if (old_num_chunks > 0)

- new_list = png_ptr->chunk_list;

- else

- new_list = NULL;

- /* Add the new chunks together with each one's handling code. If the chunk

- * already exists the code is updated, otherwise the chunk is added to the

- * end. (In libpng 1.6.0 order no longer matters because this code enforces

- * the earlier convention that the last setting is the one that is used.)

- */

- if (new_list != NULL)

- {

- png_const_bytep inlist;

- png_bytep outlist;

- unsigned int i;

- for (i=0; i<num_chunks; ++i)

- old_num_chunks = add_one_chunk(new_list, old_num_chunks,

- chunk_list+5*i, keep);

- /* Now remove any spurious 'default' entries. */

- num_chunks = 0;

- for (i=0, inlist=outlist=new_list; i<old_num_chunks; ++i, inlist += 5)

- if (inlist[4])

- {

- if (outlist != inlist)

- memcpy(outlist, inlist, 5);

- outlist += 5;

- ++num_chunks;

- }

- /* This means the application has removed all the specialized handling. */

- if (num_chunks == 0)

- {

- if (png_ptr->chunk_list != new_list)

- png_free(png_ptr, new_list);

- new_list = NULL;

- }

- else

- num_chunks = 0;

- png_ptr->num_chunk_list = num_chunks;

- if (png_ptr->chunk_list != new_list)

+ if (chunk_list == NULL)

+ return;

+ old_num_chunks = png_ptr->num_chunk_list;

+ new_list=(png_bytep)png_malloc(png_ptr,

+ (png_uint_32)

+ (5*(num_chunks + old_num_chunks)));

+ if (png_ptr->chunk_list != NULL)

{

- if (png_ptr->chunk_list != NULL)

- png_free(png_ptr, png_ptr->chunk_list);

- png_ptr->chunk_list = new_list;

+ png_memcpy(new_list, png_ptr->chunk_list,

+ (png_size_t)(5*old_num_chunks));

+ png_free(png_ptr, png_ptr->chunk_list);

+ png_ptr->chunk_list=NULL;

}

+ png_memcpy(new_list + 5*old_num_chunks, chunk_list,

+ (png_size_t)(5*num_chunks));

+ for (p = new_list + 5*old_num_chunks + 4, i = 0; i<num_chunks; i++, p += 5)

+ *p=(png_byte)keep;

+ png_ptr->num_chunk_list = old_num_chunks + num_chunks;

+ png_ptr->chunk_list = new_list;

+#ifdef PNG_FREE_ME_SUPPORTED

+ png_ptr->free_me |= PNG_FREE_LIST;

+#endif

}

#endif

#ifdef PNG_READ_USER_CHUNKS_SUPPORTED

void PNGAPI

-png_set_read_user_chunk_fn(png_structrp png_ptr, png_voidp user_chunk_ptr,

- png_user_chunk_ptr read_user_chunk_fn)

+png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,

+ png_user_chunk_ptr read_user_chunk_fn)

{

png_debug(1, "in png_set_read_user_chunk_fn");

@@ -1436,8 +1129,7 @@ png_set_read_user_chunk_fn(png_structrp png_ptr, png_voidp user_chunk_ptr,

#ifdef PNG_INFO_IMAGE_SUPPORTED

void PNGAPI

-png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,

- png_bytepp row_pointers)

+png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)

{

png_debug1(1, "in %s storage function", "rows");

@@ -1446,79 +1138,64 @@ png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,

if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))

png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);

info_ptr->row_pointers = row_pointers;

if (row_pointers)

info_ptr->valid |= PNG_INFO_IDAT;

}

#endif

void PNGAPI

-png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)

+png_set_compression_buffer_size(png_structp png_ptr,

+ png_uint_32 size)

{

if (png_ptr == NULL)

return;

- if (size == 0 || size > PNG_UINT_31_MAX)

- png_error(png_ptr, "invalid compression buffer size");

-# ifdef PNG_SEQUENTIAL_READ_SUPPORTED

- if (png_ptr->mode & PNG_IS_READ_STRUCT)

- {

- png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */

- return;

- }

-# endif

-# ifdef PNG_WRITE_SUPPORTED

- if (!(png_ptr->mode & PNG_IS_READ_STRUCT))

- {

- if (png_ptr->zowner != 0)

- {

- png_warning(png_ptr,

- "Compression buffer size cannot be changed because it is in use");

- return;

- }

- if (size > ZLIB_IO_MAX)

- {

- png_warning(png_ptr,

- "Compression buffer size limited to system maximum");

- size = ZLIB_IO_MAX; /* must fit */

- }

- else if (size < 6)

- {

- /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH

- * if this is permitted.

- */

- png_warning(png_ptr,

- "Compression buffer size cannot be reduced below 6");

- return;

- }

- if (png_ptr->zbuffer_size != size)

- {

- png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);

- png_ptr->zbuffer_size = (uInt)size;

- }

-# endif

+ png_free(png_ptr, png_ptr->zbuf);

+ png_ptr->zbuf_size = (png_size_t)size;

+ png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);

+ png_ptr->zstream.next_out = png_ptr->zbuf;

+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;

}

void PNGAPI

-png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)

+png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)

{

if (png_ptr && info_ptr)

info_ptr->valid &= ~mask;

}

+#ifndef PNG_1_0_X

+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED

+/* Function was added to libpng 1.2.0 and should always exist by default */

+void PNGAPI

+png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags)

+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */

+ if (png_ptr != NULL)

+ png_ptr->asm_flags = 0;

+ asm_flags = asm_flags; /* Quiet the compiler */

+/* This function was added to libpng 1.2.0 */

+void PNGAPI

+png_set_mmx_thresholds (png_structp png_ptr,

+ png_byte mmx_bitdepth_threshold,

+ png_uint_32 mmx_rowbytes_threshold)

+/* Obsolete as of libpng-1.2.20 and will be removed from libpng-1.4.0 */

+ if (png_ptr == NULL)

+ return;

+ /* Quiet the compiler */

+ mmx_bitdepth_threshold = mmx_bitdepth_threshold;

+ mmx_rowbytes_threshold = mmx_rowbytes_threshold;

+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */

#ifdef PNG_SET_USER_LIMITS_SUPPORTED

/* This function was added to libpng 1.2.6 */

void PNGAPI

-png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,

+png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,

png_uint_32 user_height_max)

{

/* Images with dimensions larger than these limits will be

@@ -1527,71 +1204,23 @@ png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,

if (png_ptr == NULL)

return;

png_ptr->user_width_max = user_width_max;

png_ptr->user_height_max = user_height_max;

}

-/* This function was added to libpng 1.4.0 */

-void PNGAPI

-png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)

- if (png_ptr)

- png_ptr->user_chunk_cache_max = user_chunk_cache_max;

-/* This function was added to libpng 1.4.1 */

-void PNGAPI

-png_set_chunk_malloc_max (png_structrp png_ptr,

- png_alloc_size_t user_chunk_malloc_max)

- if (png_ptr)

- png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;

#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */

#ifdef PNG_BENIGN_ERRORS_SUPPORTED

void PNGAPI

-png_set_benign_errors(png_structrp png_ptr, int allowed)

+png_set_benign_errors(png_structp png_ptr, int allowed)

{

png_debug(1, "in png_set_benign_errors");

- /* If allowed is 1, png_benign_error() is treated as a warning.

- *

- * If allowed is 0, png_benign_error() is treated as an error (which

- * is the default behavior if png_set_benign_errors() is not called).

- */

if (allowed)

- png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN |

- PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN;

+ png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;

else

- png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN |

- PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN);

+ png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;

}

#endif /* PNG_BENIGN_ERRORS_SUPPORTED */

-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

- /* Whether to report invalid palette index; added at libng-1.5.10.

- * It is possible for an indexed (color-type==3) PNG file to contain

- * pixels with invalid (out-of-range) indexes if the PLTE chunk has

- * fewer entries than the image's bit-depth would allow. We recover

- * from this gracefully by filling any incomplete palette with zeroes

- * (opaque black). By default, when this occurs libpng will issue

- * a benign error. This API can be used to override that behavior.

- */

-void PNGAPI

-png_set_check_for_invalid_index(png_structrp png_ptr, int allowed)

- png_debug(1, "in png_set_check_for_invalid_index");

- if (allowed > 0)

- png_ptr->num_palette_max = 0;

- else

- png_ptr->num_palette_max = -1;

-#endif

+#endif /* ?PNG_1_0_X */

#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

« no previous file with comments | « third_party/libpng/pngrutil.c ('k') | third_party/libpng/pngstruct.h » ('j') | no next file with comments »