WebSVN – Kolibri OS – Diff – /programs/develop/libraries/libpng/pngset.c

 /* pngset.c - storage of image information into info struct
+ *
- * Last changed in libpng 1.5.1 [February 3, 2011]
+ * Last changed in libpng 1.6.3 [July 18, 2013]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 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
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 #ifdef PNG_bKGD_SUPPORTED
 void PNGAPI
-png_set_bKGD(png_structp png_ptr, png_infop info_ptr,
+png_set_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
     png_const_color_16p background)
+{
    png_debug1(1, "in %s storage function", "bKGD");
-   if (png_ptr == NULL || info_ptr == NULL)
+   if (png_ptr == NULL || info_ptr == NULL || background == NULL)
       return;
-   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
+   info_ptr->background = *background;
    info_ptr->valid |= PNG_INFO_bKGD;
+}
 #endif
 #ifdef PNG_cHRM_SUPPORTED
 void PNGFAPI
-png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+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 white_x, png_fixed_point white_y, png_fixed_point red_x,
+    png_fixed_point blue_x, png_fixed_point blue_y)
     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_xy xy;
-{
-   png_debug1(1, "in %s storage function", "cHRM fixed");
-   if (png_ptr == NULL || info_ptr == NULL)
+   png_debug1(1, "in %s storage function", "cHRM fixed");
-      return;
-#  ifdef PNG_CHECK_cHRM_SUPPORTED
+   if (png_ptr == NULL || info_ptr == NULL)
-   if (png_check_cHRM_fixed(png_ptr,
+      return;
-       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
-#  endif
+   xy.redx = red_x;
-   {
+   xy.redy = red_y;
+   xy.greenx = green_x;
-      info_ptr->x_white = white_x;
+   xy.greeny = green_y;
-      info_ptr->y_white = white_y;
+   xy.bluex = blue_x;
-      info_ptr->x_red   = red_x;
+   xy.bluey = blue_y;
+   xy.whitex = white_x;
+   xy.whitey = white_y;
       info_ptr->y_red   = red_y;
+   if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,
+/* override with app values*/))
+      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
+   png_colorspace_sync_info(png_ptr, info_ptr);
+}
+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)
+{
+   png_XYZ XYZ;
+   png_debug1(1, "in %s storage function", "cHRM XYZ 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;
-      info_ptr->x_green = green_x;
+   XYZ.blue_Z = int_blue_Z;
       info_ptr->y_green = green_y;
-      info_ptr->x_blue  = blue_x;
+   if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace, &XYZ, 2))
-      info_ptr->y_blue  = blue_y;
+      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
       info_ptr->valid |= PNG_INFO_cHRM;
    png_colorspace_sync_info(png_ptr, info_ptr);
+}
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
       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"));
+}
 #  endif /* PNG_FLOATING_POINT_SUPPORTED */
+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"));
+}
+#  endif /* PNG_FLOATING_POINT_SUPPORTED */
 #endif /* PNG_cHRM_SUPPORTED */
 #ifdef PNG_gAMA_SUPPORTED
 void PNGFAPI
-png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
+png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
-    file_gamma)
+    png_fixed_point file_gamma)
+{
    png_debug1(1, "in %s storage function", "gAMA");
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-   /* Previously these values were limited, however they must be
-    * wrong, therefore storing them (and setting PNG_INFO_gAMA)
-    * must be wrong too.
+   if (png_ptr == NULL || info_ptr == NULL)
-    */
-   if (file_gamma > (png_fixed_point)PNG_UINT_31_MAX)
-      png_warning(png_ptr, "Gamma too large, ignored");
+      return;
-   else if (file_gamma <= 0)
-      png_warning(png_ptr, "Negative or zero gamma ignored");
-   else
-   {
       info_ptr->gamma = file_gamma;
-      info_ptr->valid |= PNG_INFO_gAMA;
+   png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);
    png_colorspace_sync_info(png_ptr, info_ptr);
 }
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
+png_set_gAMA(png_const_structrp png_ptr, png_inforp info_ptr, double file_gamma)
+{
    png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,
        "png_set_gAMA"));
+}
 #  endif
+#endif
 #endif
 #ifdef PNG_hIST_SUPPORTED
-#ifdef PNG_hIST_SUPPORTED
+void PNGAPI
    /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
     * version 1.2.1
     */
-   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
+   info_ptr->hist = png_voidcast(png_uint_16p, png_malloc_warn(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16));
+       PNG_MAX_PALETTE_LENGTH * (sizeof (png_uint_16))));
-   if (png_ptr->hist == NULL)
+   if (info_ptr->hist == NULL)
+   {
       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++)
-      png_ptr->hist[i] = hist[i];
+   for (i = 0; i < info_ptr->num_palette; i++)
-   info_ptr->hist = png_ptr->hist;
+      info_ptr->hist[i] = hist[i];
    info_ptr->valid |= PNG_INFO_hIST;
-   info_ptr->free_me |= PNG_FREE_HIST;
+   info_ptr->valid |= PNG_INFO_hIST;
 }
 #endif
 void PNGAPI
-png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
+png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,
     png_uint_32 width, png_uint_32 height, int bit_depth,
       info_ptr->channels++;
    info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
-   /* Check for potential overflow */
-   if (width >
-       (PNG_UINT_32_MAX >> 3)      /* 8-byte RRGGBBAA pixels */
-       - 48       /* bigrowbuf hack */
-       - 1        /* filter byte */
-       - 7*8      /* rounding of width to multiple of 8 pixels */
-       - 8)       /* extra max_pixel_depth pad */
-      info_ptr->rowbytes = 0;
    else
-      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
+   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
+}
 #ifdef PNG_oFFs_SUPPORTED
 void PNGAPI
-png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
+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)
+{
 #endif
 #ifdef PNG_pCAL_SUPPORTED
 void PNGAPI
-png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
+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_size_t length;
    int i;
    png_debug1(1, "in %s storage function", "pCAL");
    if (png_ptr == NULL || info_ptr == NULL || purpose == NULL || units == NULL
-   if (png_ptr == NULL || info_ptr == NULL)
+      || (nparams > 0 && params == NULL))
       return;
-   length = png_strlen(purpose) + 1;
+   length = 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. */
-   /* TODO: validate format of calibration name and unit name */
+   if (type < 0 || type > 3)
       png_error(png_ptr, "Invalid pCAL equation type");
-   /* Check that the type matches the specification. */
+   if (nparams < 0 || nparams > 255)
-   if (type < 0 || type > 3)
+      png_error(png_ptr, "Invalid pCAL parameter count");
-      png_error(png_ptr, "Invalid pCAL equation type");
+   /* Validate params[nparams] */
    for (i=0; i
-   /* Validate params[nparams] */
+      if (params[i] == NULL ||
-   for (i=0; i
+         !png_check_fp_string(params[i], strlen(params[i])))
-      if (!png_check_fp_string(params[i], png_strlen(params[i])))
+         png_error(png_ptr, "Invalid format for pCAL parameter");
          png_error(png_ptr, "Invalid format for pCAL parameter");
+   info_ptr->pcal_purpose = png_voidcast(png_charp,
-   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
+      png_malloc_warn(png_ptr, length));
    if (info_ptr->pcal_purpose == NULL)
+   {
       png_warning(png_ptr, "Insufficient memory for pCAL purpose");
       return;
+   }
-   png_memcpy(info_ptr->pcal_purpose, purpose, length);
+   memcpy(info_ptr->pcal_purpose, purpose, length);
    png_debug(3, "storing X0, X1, type, and nparams in info");
-   png_debug(3, "storing X0, X1, type, and nparams in info");
+   info_ptr->pcal_X0 = X0;
-   info_ptr->pcal_X0 = X0;
+   info_ptr->pcal_X1 = X1;
-   info_ptr->pcal_X1 = X1;
+   info_ptr->pcal_type = (png_byte)type;
-   info_ptr->pcal_type = (png_byte)type;
+   info_ptr->pcal_nparams = (png_byte)nparams;
-   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)",
-   png_debug1(3, "allocating units for info (%lu bytes)",
+     (unsigned long)length);
      (unsigned long)length);
    info_ptr->pcal_units = png_voidcast(png_charp,
-   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
+      png_malloc_warn(png_ptr, length));
    if (info_ptr->pcal_units == NULL)
+   {
       png_warning(png_ptr, "Insufficient memory for pCAL units");
       return;
+   }
-   png_memcpy(info_ptr->pcal_units, units, length);
+   memcpy(info_ptr->pcal_units, units, length);
          png_warning(png_ptr, "Insufficient memory for pCAL parameter");
          return;
+      }
-      png_memcpy(info_ptr->pcal_params[i], params[i], length);
+      memcpy(info_ptr->pcal_params[i], params[i], length);
+   }
    info_ptr->valid |= PNG_INFO_pCAL;
    info_ptr->free_me |= PNG_FREE_PCAL;
+}
 #endif
 #ifdef PNG_sCAL_SUPPORTED
 void PNGAPI
-png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,
     int unit, png_const_charp swidth, png_const_charp sheight)
+{
     */
    if (unit != 1 && unit != 2)
       png_error(png_ptr, "Invalid sCAL unit");
-   if (swidth == NULL || (lengthw = png_strlen(swidth)) <= 0 ||
+   if (swidth == NULL || (lengthw = strlen(swidth)) == 0 ||
-       swidth[0] == 45 /*'-'*/ || !png_check_fp_string(swidth, lengthw))
+       swidth[0] == 45 /* '-' */ || !png_check_fp_string(swidth, lengthw))
       png_error(png_ptr, "Invalid sCAL width");
-   if (sheight == NULL || (lengthh = png_strlen(sheight)) <= 0 ||
+   if (sheight == NULL || (lengthh = strlen(sheight)) == 0 ||
-       sheight[0] == 45 /*'-'*/ || !png_check_fp_string(sheight, lengthh))
+       sheight[0] == 45 /* '-' */ || !png_check_fp_string(sheight, lengthh))
       png_error(png_ptr, "Invalid sCAL height");
    info_ptr->scal_unit = (png_byte)unit;
+   ++lengthw;
    ++lengthw;
    png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
    png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
    info_ptr->scal_s_width = png_voidcast(png_charp,
-   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, lengthw);
+      png_malloc_warn(png_ptr, lengthw));
    if (info_ptr->scal_s_width == NULL)
+   {
       png_warning(png_ptr, "Memory allocation failed while processing sCAL");
+      return;
       return;
    memcpy(info_ptr->scal_s_width, swidth, lengthw);
    png_memcpy(info_ptr->scal_s_width, swidth, lengthw);
    ++lengthh;
    ++lengthh;
    png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
    info_ptr->scal_s_height = png_voidcast(png_charp,
-   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, lengthh);
+      png_malloc_warn(png_ptr, lengthh));
    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");
       return;
+   }
       /* 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_ascii_from_fp(png_ptr, swidth, (sizeof swidth), width,
          PNG_sCAL_PRECISION);
-      png_ascii_from_fp(png_ptr, sheight, sizeof sheight, height,
+      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_structp png_ptr, png_infop info_ptr, int unit,
+png_set_sCAL_fixed(png_const_structrp png_ptr, png_inforp info_ptr, int unit,
     png_fixed_point width, png_fixed_point height)
+{
       /* 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, swidth, (sizeof swidth), width);
-      png_ascii_from_fixed(png_ptr, sheight, sizeof sheight, height);
+      png_ascii_from_fixed(png_ptr, sheight, (sizeof sheight), height);
       png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
+   }
+}
 #  endif
 #endif
 #ifdef PNG_pHYs_SUPPORTED
 void PNGAPI
-png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
+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)
+{
+}
 #endif
 void PNGAPI
-png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
+png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
     png_const_colorp palette, int num_palette)
+{
          return;
+      }
+   }
+   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.
     */
    png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
    /* 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_colorp)png_calloc(png_ptr,
+   png_ptr->palette = png_voidcast(png_colorp, png_calloc(png_ptr,
+       PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
    if (num_palette > 0)
-   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));
+      memcpy(png_ptr->palette, palette, num_palette * (sizeof (png_color)));
    info_ptr->palette = png_ptr->palette;
    info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
    info_ptr->free_me |= PNG_FREE_PLTE;
    info_ptr->valid |= PNG_INFO_PLTE;
+}
 #ifdef PNG_sBIT_SUPPORTED
 void PNGAPI
-png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
+png_set_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
     png_const_color_8p sig_bit)
+{
    png_debug1(1, "in %s storage function", "sBIT");
-   if (png_ptr == NULL || info_ptr == NULL)
+   if (png_ptr == NULL || info_ptr == NULL || sig_bit == NULL)
       return;
-   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));
+   info_ptr->sig_bit = *sig_bit;
    info_ptr->valid |= PNG_INFO_sBIT;
+}
 #endif
 #ifdef PNG_sRGB_SUPPORTED
 void PNGAPI
-png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int srgb_intent)
+png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)
 {
    png_debug1(1, "in %s storage function", "sRGB");
    if (png_ptr == NULL || info_ptr == NULL)
       return;
-   info_ptr->srgb_intent = (png_byte)srgb_intent;
+   (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);
-   info_ptr->valid |= PNG_INFO_sRGB;
+   png_colorspace_sync_info(png_ptr, info_ptr);
+}
-}
+void PNGAPI
-void PNGAPI
+png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
-png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
     int srgb_intent)
-{
-   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-   png_set_sRGB(png_ptr, info_ptr, srgb_intent);
+{
-#  ifdef PNG_gAMA_SUPPORTED
+   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
    png_set_gAMA_fixed(png_ptr, info_ptr, 45455L);
-#  endif
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
 #  ifdef PNG_cHRM_SUPPORTED
-   png_set_cHRM_fixed(png_ptr, info_ptr,
+   if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent))
       /* color      x       y */
-      /* white */ 31270L, 32900L,
+      /* This causes the gAMA and cHRM to be written too */
-      /* red   */ 64000L, 33000L,
+      info_ptr->colorspace.flags |=
-      /* green */ 30000L, 60000L,
+         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
       /* blue  */ 15000L,  6000L
    );
-#  endif /* cHRM */
+   png_colorspace_sync_info(png_ptr, info_ptr);
+}
+#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_charp new_iccp_name;
+   png_bytep new_iccp_profile;
+   png_size_t 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
-#endif /* sRGB */
+    * 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.
     */
-#ifdef PNG_iCCP_SUPPORTED
+   {
-void PNGAPI
+      int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,
-png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
+         proflen, profile, info_ptr->color_type);
-    png_const_charp name, int compression_type,
+      png_colorspace_sync_info(png_ptr, info_ptr);
-    png_const_bytep profile, png_uint_32 proflen)
       /* Don't do any of the copying if the profile was bad, or inconsistent. */
-   png_charp new_iccp_name;
+      if (!result)
-   png_bytep new_iccp_profile;
+         return;
-   png_uint_32 length;
       /* But do write the gAMA and cHRM chunks from the profile. */
-   png_debug1(1, "in %s storage function", "iCCP");
+      info_ptr->colorspace.flags |=
          PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
+   }
       return;
    length = strlen(name)+1;
-   length = png_strlen(name)+1;
+   new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));
    new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
-   if (new_iccp_name == NULL)
-   {
-        png_warning(png_ptr, "Insufficient memory to process iCCP chunk");
-      return;
+   if (new_iccp_name == NULL)
+   {
       png_benign_error(png_ptr, "Insufficient memory to process iCCP chunk");
-   png_memcpy(new_iccp_name, name, length);
+      return;
    new_iccp_profile = (png_bytep)png_malloc_warn(png_ptr, proflen);
-   if (new_iccp_profile == NULL)
+   memcpy(new_iccp_name, name, length);
-   {
+   new_iccp_profile = png_voidcast(png_bytep,
-      png_free (png_ptr, new_iccp_name);
+      png_malloc_warn(png_ptr, proflen));
       png_warning(png_ptr,
-          "Insufficient memory to process iCCP profile");
+   if (new_iccp_profile == NULL)
       return;
       png_free(png_ptr, new_iccp_name);
       png_benign_error(png_ptr,
-   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
+          "Insufficient memory to process iCCP profile");
+      return;
    png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
-   info_ptr->iccp_proflen = proflen;
+   memcpy(new_iccp_profile, profile, 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
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
-    * does not have to change if we introduce multiple compression types
-    */
+   info_ptr->iccp_proflen = proflen;
-   info_ptr->iccp_compression = (png_byte)compression_type;
+   info_ptr->iccp_name = new_iccp_name;
-   info_ptr->free_me |= PNG_FREE_ICCP;
+   info_ptr->iccp_profile = new_iccp_profile;
+   info_ptr->free_me |= PNG_FREE_ICCP;
+   info_ptr->valid |= PNG_INFO_iCCP;
    info_ptr->valid |= PNG_INFO_iCCP;
-}
+#endif
 #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)
+{
+   int ret;
+   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
 #ifdef PNG_TEXT_SUPPORTED
-void PNGAPI
+   if (ret)
-png_set_text(png_structp png_ptr, png_infop info_ptr, png_const_textp text_ptr,
-    int num_text)
+      png_error(png_ptr, "Insufficient memory to store 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,
-int /* PRIVATE */
-png_set_text_2(png_structp png_ptr, png_infop info_ptr,
+    png_const_textp text_ptr, int num_text)
-    png_const_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);
    int i;
+   if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)
-   png_debug1(1, "in %s storage function", ((png_ptr == NULL ||
+      return(0);
-       png_ptr->chunk_name[0] == '\0') ?
-       "text" : (png_const_charp)png_ptr->chunk_name));
-   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
-   /* Make sure we have enough space in the "text" array in info_struct
-    * to hold all of the incoming text_ptr objects.
+    * because max_text >= num_text (anyway, subtract of two positive integers
-    */
+    * can't overflow in any case.)
+    */
-   if (info_ptr->num_text + num_text > info_ptr->max_text)
+   if (num_text > info_ptr->max_text - info_ptr->num_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 (info_ptr->text != NULL)
+      if (num_text <= INT_MAX - max_text)
+      {
-         png_textp old_text;
+         max_text += num_text;
-         int old_max;
          /* Round up to a multiple of 8 */
-         old_max = info_ptr->max_text;
+         if (max_text < INT_MAX-8)
-         info_ptr->max_text = info_ptr->num_text + num_text + 8;
+            max_text = (max_text + 8) & ~0x7;
          old_text = info_ptr->text;
-         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+         else
-            (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
+            max_text = INT_MAX;
+         /* Now allocate a new array and copy the old members in, this does all
-         if (info_ptr->text == NULL)
+          * the overflow checks.
           */
-            png_free(png_ptr, old_text);
+         new_text = png_voidcast(png_textp,png_realloc_array(png_ptr,
-            return(1);
+            info_ptr->text, old_num_text, max_text-old_num_text,
             sizeof *new_text));
+      }
          png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
+      {
          /* Set iTXt data */
          if (text_ptr[i].lang != NULL)
-            lang_len = png_strlen(text_ptr[i].lang);
+            lang_len = strlen(text_ptr[i].lang);
          else
             lang_len = 0;
          if (text_ptr[i].lang_key != NULL)
-            lang_key_len = png_strlen(text_ptr[i].lang_key);
+            lang_key_len = 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_warning(png_ptr, "iTXt chunk not supported");
+            PNG_CHUNK_WRITE_ERROR);
          continue;
+      }
       else
+      {
-         text_length = png_strlen(text_ptr[i].text);
+         text_length = strlen(text_ptr[i].text);
          textp->compression = text_ptr[i].compression;
+      }
-      textp->key = (png_charp)png_malloc_warn(png_ptr,
-          (png_size_t)
+      textp->key = png_voidcast(png_charp,png_malloc_base(png_ptr,
-          (key_len + text_length + lang_len + lang_key_len + 4));
+          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);
-      if (textp->key == NULL)
+         return 1;
          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);
-      png_memcpy(textp->key, text_ptr[i].key,(png_size_t)(key_len));
+      memcpy(textp->key, text_ptr[i].key, key_len);
       *(textp->key + key_len) = '\0';
       if (text_ptr[i].compression > 0)
       {
          textp->lang = textp->key + key_len + 1;
-         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
+         memcpy(textp->lang, text_ptr[i].lang, lang_len);
          *(textp->lang + lang_len) = '\0';
          textp->lang_key = textp->lang + lang_len + 1;
          textp->text = textp->key + key_len + 1;
+      }
       if (text_length)
-         png_memcpy(textp->text, text_ptr[i].text,
+         memcpy(textp->text, text_ptr[i].text, text_length);
-             (png_size_t)(text_length));
       *(textp->text + text_length) = '\0';
       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_set_tIME(png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time)
+    png_const_timep mod_time)
+{
    png_debug1(1, "in %s storage function", "tIME");
-   if (png_ptr == NULL || info_ptr == NULL ||
+   if (png_ptr == NULL || info_ptr == NULL || mod_time == 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");
-       (png_ptr->mode & PNG_WROTE_tIME))
+      return;
       return;
-   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));
+   info_ptr->mod_time = *mod_time;
    info_ptr->valid |= PNG_INFO_tIME;
+}
 #endif
 #ifdef PNG_tRNS_SUPPORTED
 void PNGAPI
-png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
+png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
+   {
        /* It may not actually be necessary to set png_ptr->trans_alpha 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).
+        */
        png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
        /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
-       png_ptr->trans_alpha = info_ptr->trans_alpha =
+       png_ptr->trans_alpha = info_ptr->trans_alpha = png_voidcast(png_bytep,
-           (png_bytep)png_malloc(png_ptr, (png_size_t)PNG_MAX_PALETTE_LENGTH);
+         png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
        if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
-          png_memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
+          memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
+   }
    if (trans_color != NULL)
    {
       int sample_max = (1 << info_ptr->bit_depth);
       if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
-          (int)trans_color->gray > sample_max) ||
+          trans_color->gray > sample_max) ||
           (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-          ((int)trans_color->red > sample_max ||
+          (trans_color->red > sample_max ||
-          (int)trans_color->green > sample_max ||
+          trans_color->green > sample_max ||
-          (int)trans_color->blue > sample_max)))
-         png_warning(png_ptr,
+          trans_color->blue > sample_max)))
-            "tRNS chunk has out-of-range samples for bit_depth");
+         png_warning(png_ptr,
             "tRNS chunk has out-of-range samples for bit_depth");
 #endif
 #ifdef PNG_sPLT_SUPPORTED
 void PNGAPI
-png_set_sPLT(png_structp png_ptr,
+png_set_sPLT(png_const_structrp png_ptr,
-    png_infop info_ptr, png_const_sPLT_tp entries, int nentries)
+    png_inforp info_ptr, png_const_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)
+   if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)
+      return;
+   /* Use the internal realloc function, which checks for all the possible
-      return;
+    * overflows.  Notice that the parameters are (int) and (size_t)
+    */
-   np = (png_sPLT_tp)png_malloc_warn(png_ptr,
+   np = png_voidcast(png_sPLT_tp,png_realloc_array(png_ptr,
-       (info_ptr->splt_palettes_num + nentries) *
+      info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,
-       (png_size_t)png_sizeof(png_sPLT_t));
+      sizeof *np));
+   if (np == NULL)
    if (np == NULL)
       /* Out of memory or too many chunks */
-      png_warning(png_ptr, "No memory for sPLT palettes");
-      return;
-   }
       png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR);
-   png_memcpy(np, info_ptr->splt_palettes,
+      return;
+   }
-       info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
-   png_free(png_ptr, info_ptr->splt_palettes);
-   info_ptr->splt_palettes=NULL;
+   png_free(png_ptr, info_ptr->splt_palettes);
+   info_ptr->splt_palettes = np;
-   for (i = 0; i < nentries; i++)
+   info_ptr->free_me |= PNG_FREE_SPLT;
-   {
-      png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
+   np += info_ptr->splt_palettes_num;
       png_const_sPLT_tp from = entries + i;
+   do
-      png_uint_32 length;
+   {
+      png_size_t length;
       length = png_strlen(from->name) + 1;
-      to->name = (png_charp)png_malloc_warn(png_ptr, (png_size_t)length);
+      /* Skip invalid input entries */
+      if (entries->name == NULL || entries->entries == 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 */
+         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)
-      if (to->name == NULL)
+         break;
-      {
-         png_warning(png_ptr,
+      memcpy(np->name, entries->name, length);
              "Out of memory while processing sPLT chunk");
-         continue;
-      }
+      /* IMPORTANT: we have memory now that won't get freed if something else
-      png_memcpy(to->name, from->name, length);
-      to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
+       * goes wrong, this code must free it.  png_malloc_array produces no
-          (png_size_t)(from->nentries * png_sizeof(png_sPLT_entry)));
+       * 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)
-      if (to->entries == NULL)
+      {
+         png_free(png_ptr, np->name);
-      {
+         break;
+      }
-         png_warning(png_ptr,
+      np->nentries = entries->nentries;
+      /* This multiply can't overflow because png_malloc_array has already
-             "Out of memory while processing sPLT chunk");
+       * checked it when doing the allocation.
+       */
-         png_free(png_ptr, to->name);
+      memcpy(np->entries, entries->entries,
-         to->name = NULL;
-         continue;
-      }
+         entries->nentries * sizeof (png_sPLT_entry));
-      png_memcpy(to->entries, from->entries,
+      /* Note that 'continue' skips the advance of the out pointer and out
-          from->nentries * png_sizeof(png_sPLT_entry));
+       * count, so an invalid entry is not added.
+       */
+      info_ptr->valid |= PNG_INFO_sPLT;
+      ++(info_ptr->splt_palettes_num);
+      ++np;
+   }
+   while (++entries, --nentries);
+   if (nentries > 0)
+      png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);
+}
+#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");
-      to->nentries = from->nentries;
+   /* Now reduce the location to the top-most set bit by removing each least
-      to->depth = from->depth;
+    * significant bit in turn.
     */
    while (location != (location & -location))
-   info_ptr->splt_palettes = np;
-   info_ptr->splt_palettes_num += nentries;
+      location &= ~(location & -location);
-   info_ptr->valid |= PNG_INFO_sPLT;
+   /* The cast is safe because 'location' is a bit mask and only the low four
+    * bits are significant.
+    */
+   return (png_byte)location;
+}
+void PNGAPI
+png_set_unknown_chunks(png_const_structrp png_ptr,
+   png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
+{
+   png_unknown_chunkp np;
+   if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 ||
+      unknowns == NULL)
+      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;
+      }
-   info_ptr->free_me |= PNG_FREE_SPLT;
+#  endif
-}
+#  if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \
-#endif /* PNG_sPLT_SUPPORTED */
+      defined(PNG_WRITE_SUPPORTED)
       if (!(png_ptr->mode & PNG_IS_READ_STRUCT))
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-void PNGAPI
+         png_app_error(png_ptr, "no unknown chunk support on write");
-png_set_unknown_chunks(png_structp png_ptr,
+         return;
    png_infop info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
 #  endif
-   png_unknown_chunkp np;
-   int i;
-   if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
       return;
-   np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
-       (png_size_t)(info_ptr->unknown_chunks_num + num_unknowns) *
-       png_sizeof(png_unknown_chunk));
+   /* Prior to 1.6.0 this code used png_malloc_warn; however, this meant that
-   if (np == NULL)
+    * unknown critical chunks could be lost with just a warning resulting in
-   {
-      png_warning(png_ptr,
-          "Out of memory while processing unknown chunk");
+    * undefined behavior.  Now png_chunk_report is used to provide behavior
-      return;
+    * 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));
+   if (np == NULL)
-   }
+   {
+      png_chunk_report(png_ptr, "too many unknown chunks",
+         PNG_CHUNK_WRITE_ERROR);
-   png_memcpy(np, info_ptr->unknown_chunks,
+      return;
+   }
-       (png_size_t)info_ptr->unknown_chunks_num *
+   png_free(png_ptr, info_ptr->unknown_chunks);
-       png_sizeof(png_unknown_chunk));
+   info_ptr->unknown_chunks = np; /* safe because it is initialized */
+   info_ptr->free_me |= PNG_FREE_UNKN;
-   png_free(png_ptr, info_ptr->unknown_chunks);
-   info_ptr->unknown_chunks = NULL;
+   np += info_ptr->unknown_chunks_num;
+   /* Increment unknown_chunks_num each time round the loop to protect the
-   for (i = 0; i < num_unknowns; i++)
+    * just-allocated chunk data.
-   {
+    */
-      png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
+   for (; num_unknowns > 0; --num_unknowns, ++unknowns)
       png_const_unknown_chunkp from = unknowns + i;
-      png_memcpy(to->name, from->name, png_sizeof(from->name));
+      memcpy(np->name, unknowns->name, (sizeof np->name));
-      to->name[png_sizeof(to->name)-1] = '\0';
+      np->name[(sizeof np->name)-1] = '\0';
-      to->size = from->size;
+      np->location = check_location(png_ptr, unknowns->location);
-      /* Note our location in the read or write sequence */
+      if (unknowns->size == 0)
+      {
+         np->data = NULL;
+         np->size = 0;
-      to->location = (png_byte)(png_ptr->mode & 0xff);
+      }
       else
       if (from->size == 0)
-         to->data=NULL;
+         np->data = png_voidcast(png_bytep,
             png_malloc_base(png_ptr, unknowns->size));
       else
+         if (np->data == NULL)
+         {
+            png_chunk_report(png_ptr, "unknown chunk: out of memory",
+               PNG_CHUNK_WRITE_ERROR);
+            /* But just skip storing the unknown chunk */
-      {
+            continue;
-         to->data = (png_bytep)png_malloc_warn(png_ptr,
+         }
+         memcpy(np->data, unknowns->data, unknowns->size);
+         np->size = unknowns->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);
+   }
-             (png_size_t)from->size);
+}
+void PNGAPI
 png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
-         if (to->data == NULL)
+    int chunk, int location)
+{
-            png_warning(png_ptr,
+   /* This API is pretty pointless in 1.6.0 because the location can be set
-                "Out of memory while processing unknown chunk");
+    * before the call to png_set_unknown_chunks.
             to->size = 0;
     * TODO: add a png_app_warning in 1.7
     */
-         else
+   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 &&
-            png_memcpy(to->data, from->data, from->size);
-      }
+      chunk < info_ptr->unknown_chunks_num)
-   }
+   {
       if ((location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)
    info_ptr->unknown_chunks = np;
-   info_ptr->unknown_chunks_num += num_unknowns;
+         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;
+         else
+            location = PNG_HAVE_IHDR; /* also undocumented */
+      }
+      info_ptr->unknown_chunks[chunk].location =
+         check_location(png_ptr, location);
+   }
+}
+#endif
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+png_uint_32 PNGAPI
+png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
+{
+   png_debug(1, "in png_permit_mng_features");
+   if (png_ptr == NULL)
+      return 0;
-   info_ptr->free_me |= PNG_FREE_UNKN;
+   png_ptr->mng_features_permitted = mng_features & PNG_ALL_MNG_FEATURES;
-}
+   return png_ptr->mng_features_permitted;
 void PNGAPI
-png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
+#endif
-    int chunk, int location)
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 static unsigned int
-   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
+add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep)
-       info_ptr->unknown_chunks_num)
+{
-      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
+   unsigned int i;
-}
-#endif
+   /* 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
+   {
-#ifdef PNG_MNG_FEATURES_SUPPORTED
+      list[4] = (png_byte)keep;
-png_uint_32 PNGAPI
+      return count;
+   }
+   if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT)
+   {
+      ++count;
+      memcpy(list, add, 4);
-png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
+      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_bytep new_list;
+   unsigned int num_chunks, 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;
-   png_debug(1, "in png_permit_mng_features");
+   }
    if (num_chunks_in <= 0)
+   {
+      png_ptr->unknown_default = keep;
    if (png_ptr == NULL)
+      /* '0' means just set the flags, so stop here */
+      if (num_chunks_in == 0)
+        return;
+   }
-      return (png_uint_32)0;
+   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[] = {
-   png_ptr->mng_features_permitted =
+,  75,  71,  68, '\0',  /* bKGD */
-       (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
+,  72,  82,  77, '\0',  /* cHRM */
+,  65,  77,  65, '\0',  /* gAMA */
+,  73,  83,  84, '\0',  /* hIST */
+,  67,  67,  80, '\0',  /* iCCP */
-   return (png_uint_32)png_ptr->mng_features_permitted;
+,  84,  88, 116, '\0',  /* iTXt */
-}
-#endif
+,  70,  70, 115, '\0',  /* oFFs */
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+,  67,  65,  76, '\0',  /* pCAL */
-void PNGAPI
+,  72,  89, 115, '\0',  /* pHYs */
+,  66,  73,  84, '\0',  /* sBIT */
+,  67,  65,  76, '\0',  /* sCAL */
+,  80,  76,  84, '\0',  /* sPLT */
+,  84,  69,  82, '\0',  /* sTER */
+,  82,  71,  66, '\0',  /* sRGB */
+,  69,  88, 116, '\0',  /* tEXt */
-png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_const_bytep
+,  73,  77,  69, '\0',  /* tIME */
-    chunk_list, int num_chunks)
+,  84,  88, 116, '\0'   /* zTXt */
+      };
-{
+      chunk_list = chunks_to_ignore;
+      num_chunks = (sizeof chunks_to_ignore)/5;
+   }
+   else /* num_chunks_in > 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;
-   png_bytep new_list, p;
+   }
+   old_num_chunks = png_ptr->num_chunk_list;
+   if (png_ptr->chunk_list == NULL)
+      old_num_chunks = 0;
+   /* 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");
+      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,
+* (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.)
-   int i, old_num_chunks;
-   if (png_ptr == NULL)
+    */
-      return;
+   if (new_list != NULL)
+   {
-   if (num_chunks == 0)
+      png_const_bytep inlist;
       png_bytep outlist;
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
+      unsigned int i;
-         png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
       for (i=0; i
-      else
+         old_num_chunks = add_one_chunk(new_list, old_num_chunks,
-         png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+            chunk_list+5*i, keep);
 #endif
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 void PNGAPI
-png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
+png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_bytepp row_pointers)
+{
    png_debug1(1, "in %s storage function", "rows");
    if (png_ptr == NULL || info_ptr == NULL)
+}
 #endif
 void PNGAPI
-png_set_compression_buffer_size(png_structp png_ptr, png_size_t size)
+png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
+{
     if (png_ptr == NULL)
        return;
+    if (size == 0 || size > PNG_UINT_31_MAX)
+       png_error(png_ptr, "invalid compression buffer size");
-    png_free(png_ptr, png_ptr->zbuf);
 #  ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-    if (size > ZLIB_IO_MAX)
+      if (png_ptr->mode & PNG_IS_READ_STRUCT)
-    {
+      {
-       png_warning(png_ptr, "Attempt to set buffer size beyond max ignored");
-       png_ptr->zbuf_size = ZLIB_IO_MAX;
+         png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */
+         return;
+      }
+#  endif
-       size = ZLIB_IO_MAX; /* must fit */
-    }
+#  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");
-    else
+            size = ZLIB_IO_MAX; /* must fit */
-       png_ptr->zbuf_size = (uInt)size;
+         }
-    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
+         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;
-    /* The following ensures a relatively safe failure if this gets called while
+         }
+         if (png_ptr->zbuffer_size != size)
+         {
-     * the buffer is actually in use.
+            png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
-     */
+            png_ptr->zbuffer_size = (uInt)size;
-    png_ptr->zstream.next_out = png_ptr->zbuf;
+         }
     png_ptr->zstream.avail_out = 0;
-    png_ptr->zstream.avail_in = 0;
+#  endif
+}
-void PNGAPI
-png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
+void PNGAPI
 png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)
    if (png_ptr && info_ptr)
-      info_ptr->valid &= ~mask;
+   if (png_ptr && info_ptr)
       info_ptr->valid &= ~mask;
+}
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
+}
 /* This function was added to libpng 1.4.0 */
 void PNGAPI
-png_set_chunk_cache_max (png_structp png_ptr,
+png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
-   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_structp png_ptr,
+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_debug(1, "in png_set_benign_errors");
+   /* If allowed is 1, png_benign_error() is treated as a warning.
+    *
-png_set_benign_errors(png_structp png_ptr, int allowed)
+    * 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).
+    */
    png_debug(1, "in png_set_benign_errors");
+   if (allowed)
+      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN |
-   if (allowed)
+         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);
+}
+#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;

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libpng/pngset.c – Rev 1897 → 3928