diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-12-18 11:45:07 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-12-18 11:45:07 +0000 |
| commit | c554ec47dca508a085c4206aea5cc5cadc1311fb (patch) | |
| tree | 6f00b5382e5d13fb72e4174017c8a344b4436902 /plugins/AdvaImg/src/LibPNG/pngmem.c | |
| parent | 040c8cd3bba9c42d5db076c6e612638a9c32a932 (diff) | |
libpng updated to 1.6.15
git-svn-id: http://svn.miranda-ng.org/main/trunk@11507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AdvaImg/src/LibPNG/pngmem.c')
| -rw-r--r-- | plugins/AdvaImg/src/LibPNG/pngmem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/AdvaImg/src/LibPNG/pngmem.c b/plugins/AdvaImg/src/LibPNG/pngmem.c index ba643a9fb1..56330098e2 100644 --- a/plugins/AdvaImg/src/LibPNG/pngmem.c +++ b/plugins/AdvaImg/src/LibPNG/pngmem.c @@ -1,8 +1,8 @@ /* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.6.8 [December 19, 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.)
*
@@ -199,7 +199,7 @@ png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size), return ret;
}
-#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* USER_MEM */
/* This function was added at libpng version 1.2.3. The png_malloc_warn()
* function will issue a png_warning and return NULL instead of issuing a
@@ -244,7 +244,7 @@ png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED) {
if (png_ptr == NULL || ptr == NULL)
return;
-#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* USER_MEM */
free(ptr);
}
@@ -277,5 +277,5 @@ png_get_mem_ptr(png_const_structrp png_ptr) return png_ptr->mem_ptr;
}
-#endif /* PNG_USER_MEM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* USER_MEM */
+#endif /* READ || WRITE */
|