libpng updated to 1.6.15

git-svn-id: http://svn.miranda-ng.org/main/trunk@11507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 90 insertions, 54 deletions

diff --git a/plugins/AdvaImg/src/LibPNG/pngget.c b/plugins/AdvaImg/src/LibPNG/pngget.c
index 80ab055dca..13418317be 100644
--- a/plugins/AdvaImg/src/LibPNG/pngget.c
+++ b/plugins/AdvaImg/src/LibPNG/pngget.c
@@ -1,8 +1,8 @@
 

 /* pngget.c - retrieval of values from info struct

  *

- * Last changed in libpng 1.6.1 [March 28, 2013]

- * Copyright (c) 1998-2013 Glenn Randers-Pehrson

+ * Last changed in libpng 1.6.15 [November 20, 2014]

+ * Copyright (c) 1998-2014 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.)

  *

@@ -116,7 +116,8 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
    info_ptr)

 {

 #ifdef PNG_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_pHYs) != 0)

       {

          png_debug1(1, "in %s retrieval function",

              "png_get_x_pixels_per_meter");

@@ -124,6 +125,9 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
          if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)

             return (info_ptr->x_pixels_per_unit);

       }

+#else

+   PNG_UNUSED(png_ptr)

+   PNG_UNUSED(info_ptr)

 #endif

 

    return (0);

@@ -134,7 +138,8 @@ png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
     info_ptr)

 {

 #ifdef PNG_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_pHYs) != 0)

    {

       png_debug1(1, "in %s retrieval function",

           "png_get_y_pixels_per_meter");

@@ -142,6 +147,9 @@ png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
       if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)

          return (info_ptr->y_pixels_per_unit);

    }

+#else

+   PNG_UNUSED(png_ptr)

+   PNG_UNUSED(info_ptr)

 #endif

 

    return (0);

@@ -151,7 +159,8 @@ png_uint_32 PNGAPI
 png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)

 {

 #ifdef PNG_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_pHYs) != 0)

    {

       png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");

 

@@ -159,6 +168,9 @@ png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
           info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)

          return (info_ptr->x_pixels_per_unit);

    }

+#else

+   PNG_UNUSED(png_ptr)

+   PNG_UNUSED(info_ptr)

 #endif

 

    return (0);

@@ -170,7 +182,8 @@ png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
    info_ptr)

 {

 #ifdef PNG_READ_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_pHYs) != 0)

    {

       png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");

 

@@ -193,10 +206,11 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
     png_const_inforp info_ptr)

 {

 #ifdef PNG_READ_pHYs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)

-       && info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0

-       && info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX

-       && info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_pHYs) != 0 &&

+       info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&

+       info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX &&

+       info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)

    {

       png_fixed_point res;

 

@@ -206,7 +220,7 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
        * range of 0..2^31-1; otherwise the cast might overflow.

        */

       if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,

-          (png_int_32)info_ptr->x_pixels_per_unit))

+          (png_int_32)info_ptr->x_pixels_per_unit) != 0)

          return res;

    }

 #else

@@ -222,13 +236,17 @@ png_int_32 PNGAPI
 png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)

 {

 #ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_oFFs) != 0)

    {

       png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");

 

       if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)

          return (info_ptr->x_offset);

    }

+#else

+   PNG_UNUSED(png_ptr)

+   PNG_UNUSED(info_ptr)

 #endif

 

    return (0);

@@ -238,13 +256,17 @@ png_int_32 PNGAPI
 png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)

 {

 #ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_oFFs) != 0)

    {

       png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");

 

       if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)

          return (info_ptr->y_offset);

    }

+#else

+   PNG_UNUSED(png_ptr)

+   PNG_UNUSED(info_ptr)

 #endif

 

    return (0);

@@ -254,13 +276,17 @@ png_int_32 PNGAPI
 png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)

 {

 #ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_oFFs) != 0)

    {

       png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");

 

       if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)

          return (info_ptr->x_offset);

    }

+#else

+   PNG_UNUSED(png_ptr)

+   PNG_UNUSED(info_ptr)

 #endif

 

    return (0);

@@ -270,13 +296,17 @@ png_int_32 PNGAPI
 png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)

 {

 #ifdef PNG_oFFs_SUPPORTED

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_oFFs) != 0)

    {

       png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");

 

       if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)

          return (info_ptr->y_offset);

    }

+#else

+   PNG_UNUSED(png_ptr)

+   PNG_UNUSED(info_ptr)

 #endif

 

    return (0);

@@ -307,7 +337,7 @@ ppi_from_ppm(png_uint_32 ppm)
     */

    png_fixed_point result;

    if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,

-       5000))

+       5000) != 0)

       return result;

 

    /* Overflow. */

@@ -393,7 +423,8 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {

    png_uint_32 retval = 0;

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_pHYs) != 0)

    {

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

 

@@ -424,12 +455,12 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
 

    return (retval);

 }

-#endif /* PNG_pHYs_SUPPORTED */

-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */

+#endif /* pHYs */

+#endif  /* INCH_CONVERSIONS */

 

 /* png_get_channels really belongs in here, too, but it's been around longer */

 

-#endif  /* PNG_EASY_ACCESS_SUPPORTED */

+#endif  /* EASY_ACCESS */

 

 

 png_byte PNGAPI

@@ -457,8 +488,9 @@ png_uint_32 PNGAPI
 png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,

    png_color_16p *background)

 {

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)

-       && background != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_bKGD) != 0 &&

+       background != NULL)

    {

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

 

@@ -488,7 +520,7 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
     * consistent.

     */

    if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))

+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

    {

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

 

@@ -529,7 +561,7 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
    double *blue_Z)

 {

    if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))

+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

    {

       png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");

 

@@ -577,7 +609,7 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_blue_Z)

 {

    if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))

+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

    {

       png_debug1(1, "in %s retrieval function", "cHRM_XYZ");

 

@@ -614,7 +646,7 @@ png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "cHRM");

 

    if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))

+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)

    {

       if (white_x != NULL)

          *white_x = info_ptr->colorspace.end_points_xy.whitex;

@@ -649,7 +681,7 @@ png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "gAMA");

 

    if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) &&

+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&

       file_gamma != NULL)

    {

       *file_gamma = info_ptr->colorspace.gamma;

@@ -668,7 +700,7 @@ png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "gAMA(float)");

 

    if (png_ptr != NULL && info_ptr != NULL &&

-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) &&

+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&

       file_gamma != NULL)

    {

       *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,

@@ -688,8 +720,8 @@ png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {

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

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)

-       && file_srgb_intent != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+      (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)

    {

       *file_srgb_intent = info_ptr->colorspace.rendering_intent;

       return (PNG_INFO_sRGB);

@@ -707,9 +739,10 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
 {

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

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)

-       && name != NULL && compression_type != NULL && profile != NULL &&

-		 proflen != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_iCCP) != 0 &&

+       name != NULL && compression_type != NULL && profile != NULL &&

+           proflen != NULL)

    {

       *name = info_ptr->iccp_name;

       *profile = info_ptr->iccp_profile;

@@ -747,8 +780,8 @@ png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
 {

    png_debug1(1, "in %s retrieval function", "hIST");

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)

-       && hist != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)

    {

       *hist = info_ptr->hist;

       return (PNG_INFO_hIST);

@@ -803,8 +836,9 @@ png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {

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

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)

-       && offset_x != NULL && offset_y != NULL && unit_type != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_oFFs) != 0 &&

+       offset_x != NULL && offset_y != NULL && unit_type != NULL)

    {

       *offset_x = info_ptr->x_offset;

       *offset_y = info_ptr->y_offset;

@@ -824,8 +858,9 @@ png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
 {

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

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)

-       && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_pCAL) != 0 &&

+       purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&

        nparams != NULL && units != NULL && params != NULL)

    {

       *purpose = info_ptr->pcal_purpose;

@@ -851,7 +886,7 @@ png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_fixed_point *width, png_fixed_point *height)

 {

    if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_sCAL))

+       (info_ptr->valid & PNG_INFO_sCAL) != 0)

    {

       *unit = info_ptr->scal_unit;

       /*TODO: make this work without FP support; the API is currently eliminated

@@ -874,7 +909,7 @@ png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, double *width, double *height)

 {

    if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_sCAL))

+       (info_ptr->valid & PNG_INFO_sCAL) != 0)

    {

       *unit = info_ptr->scal_unit;

       *width = atof(info_ptr->scal_s_width);

@@ -890,7 +925,7 @@ png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_charpp width, png_charpp height)

 {

    if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_sCAL))

+       (info_ptr->valid & PNG_INFO_sCAL) != 0)

    {

       *unit = info_ptr->scal_unit;

       *width = info_ptr->scal_s_width;

@@ -912,7 +947,7 @@ png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "pHYs");

 

    if (png_ptr != NULL && info_ptr != NULL &&

-       (info_ptr->valid & PNG_INFO_pHYs))

+       (info_ptr->valid & PNG_INFO_pHYs) != 0)

    {

       if (res_x != NULL)

       {

@@ -943,8 +978,8 @@ png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,
 {

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

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)

-       && palette != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_PLTE) != 0 && palette != NULL)

    {

       *palette = info_ptr->palette;

       *num_palette = info_ptr->num_palette;

@@ -962,8 +997,8 @@ png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
 {

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

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)

-       && sig_bit != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)

    {

       *sig_bit = &(info_ptr->sig_bit);

       return (PNG_INFO_sBIT);

@@ -1006,8 +1041,8 @@ png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
 {

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

 

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)

-       && mod_time != NULL)

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)

    {

       *mod_time = &(info_ptr->mod_time);

       return (PNG_INFO_tIME);

@@ -1023,7 +1058,8 @@ png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
     png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)

 {

    png_uint_32 retval = 0;

-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))

+   if (png_ptr != NULL && info_ptr != NULL &&

+       (info_ptr->valid & PNG_INFO_tRNS) != 0)

    {

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

 

@@ -1100,7 +1136,7 @@ png_get_compression_buffer_size(png_const_structrp png_ptr)
       return 0;

 

 #  ifdef PNG_WRITE_SUPPORTED

-      if (png_ptr->mode & PNG_IS_READ_STRUCT)

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

 #  endif

    {

 #     ifdef PNG_SEQUENTIAL_READ_SUPPORTED

@@ -1144,7 +1180,7 @@ png_get_chunk_malloc_max (png_const_structrp png_ptr)
 {

    return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);

 }

-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */

+#endif /* SET_USER_LIMITS */

 

 /* These functions were added to libpng 1.4.0 */

 #ifdef PNG_IO_STATE_SUPPORTED

@@ -1159,7 +1195,7 @@ png_get_io_chunk_type (png_const_structrp png_ptr)
 {

    return png_ptr->chunk_name;

 }

-#endif /* ?PNG_IO_STATE_SUPPORTED */

+#endif /* IO_STATE */

 

 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

 #  ifdef PNG_GET_PALETTE_MAX_SUPPORTED

@@ -1174,4 +1210,4 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
 #  endif

 #endif

 

-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

+#endif /* READ || WRITE */