commit 3c1c95399bb2c64b9423c6aab3d9fd0cc1a15619
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed Dec 21 18:11:51 2011 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed Dec 21 18:11:51 2011 -0600
tree 7348271c52b0eb54ecd3cdc2cde55d9248c678ee
parent d332c67da7818132e462fc44ec28b0b7420bc5b5

[libpng16] Added #ifdef PNG_USER_MEM_SUPPORTED in pngmem.c where needed.

pngmem.c

diff --git a/pngmem.c b/pngmem.c
index daed745..7f06201 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -72,16 +72,21 @@
     * to implement a user memory handler.  This checks to be sure it isn't
     * called with big numbers.
     */
+#ifdef PNG_USER_MEM_SUPPORTED
+   PNG_UNUSED(png_ptr)
+#endif
    if (size > 0 && size <= ~(size_t)0
 #     ifdef PNG_MAX_MALLOC_64K
          && size <= 65536U
 #     endif
       )
    {
+#ifdef PNG_USER_MEM_SUPPORTED
       if (png_ptr != NULL && png_ptr->malloc_fn != NULL)
          return png_ptr->malloc_fn(png_ptr, size);
 
       else
+#endif
          return malloc((size_t)size); /* checked for truncation above */
    }