# HG changeset patch
# User Glenn Randers-Pehrson <glennrp@simple...>
# Date 1343491548 18000
# Node ID d6e469d02cd260b6531e86a8a6c8a5a2b9ff51cb
# Parent  fe9e2eb655ce8b85abfd9b88d20a8a1648ad71e7
coders/png.c: Some typecasts were inconsistent with libpng-1.4 and later.

diff -r fe9e2eb655ce -r d6e469d02cd2 coders/png.c
--- GraphicsMagick-1.3.12.png/coders/png.c	2010-03-03 15:26:23.000000000 -0500
+++ GraphicsMagick-1.3.12/coders/png.c	2012-09-07 22:02:24.723493512 -0400
@@ -1370,7 +1370,11 @@
 }
 
 #ifdef PNG_USER_MEM_SUPPORTED
-static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size)
+#if PNG_LIBPNG_VER >= 14000
+static png_voidp png_IM_malloc(png_structp png_ptr,png_alloc_size_t size)
+#else
+static png_voidp png_IM_malloc(png_structp png_ptr,png_size_t size)
+#endif
 {
 #if (PNG_LIBPNG_VER < 10011)
   png_voidp
@@ -6102,12 +6106,22 @@
                     profile_type, (unsigned long)length);
     }
 #if (PNG_LIBPNG_VER > 10005)
-  text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
+#if PNG_LIBPNG_VER >= 14000
+  text=(png_textp) png_malloc(ping,(png_alloc_size_t) sizeof(png_text));
+#else
+  text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
+#endif
   description_length=strlen((const char *) profile_description);
   allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20
                                   + description_length);
-  text[0].text=(png_charp) png_malloc(ping,allocated_length);
-  text[0].key=(png_charp) png_malloc(ping, (png_uint_32) 80);
+#if PNG_LIBPNG_VER >= 14000
+   text[0].text=(png_charp) png_malloc(ping,
+      (png_alloc_size_t) allocated_length);
+   text[0].key=(png_charp) png_malloc(ping, (png_alloc_size_t) 80);
+#else
+   text[0].text=(png_charp) png_malloc(ping, (png_size_t) allocated_length);
+   text[0].key=(png_charp) png_malloc(ping, (png_size_t) 80);
+#endif
   text[0].key[0]='\0';
   (void) strcat(text[0].key, "Raw profile type ");
   (void) strncat(text[0].key, (const char *) profile_type, 61);
@@ -7503,7 +7517,12 @@
       if (*attribute->key == '[')
         continue;
 #if (PNG_LIBPNG_VER > 10005)
-      text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
+#if PNG_LIBPNG_VER >= 14000
+      text=(png_textp) png_malloc(ping,
+           (png_alloc_size_t) sizeof(png_text));
+#else
+      text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
+#endif
       text[0].key=attribute->key;
       text[0].text=attribute->value;
       text[0].text_length=strlen(attribute->value);