diff options
| author | Juan Linietsky | 2015-12-21 09:07:06 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-12-21 09:07:06 -0300 |
| commit | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (patch) | |
| tree | 872a375b64d93fd6aaf1239e058a13630c9cfabe /drivers/png/pngmem.c | |
| parent | 81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (diff) | |
| parent | b2f670ebaefa16b0345f9a7ae825f78dbfdec9f8 (diff) | |
| download | godot-15429d6ac95acb044c9eebd64356f33e7e5d14ef.tar.gz godot-15429d6ac95acb044c9eebd64356f33e7e5d14ef.tar.zst godot-15429d6ac95acb044c9eebd64356f33e7e5d14ef.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/png/pngmem.c')
| -rw-r--r-- | drivers/png/pngmem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/png/pngmem.c b/drivers/png/pngmem.c index bf5ff037d..ae74dcace 100644 --- a/drivers/png/pngmem.c +++ b/drivers/png/pngmem.c @@ -1,8 +1,8 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.5.7 [December 15, 2011] - * Copyright (c) 1998-2011 Glenn Randers-Pehrson + * Last changed in libpng 1.5.13 [September 27, 2012] + * Copyright (c) 1998-2002,2004,2006-2012 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.) * @@ -56,7 +56,7 @@ png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr), if (malloc_fn != NULL) { png_struct dummy_struct; - memset(&dummy_struct, 0, sizeof dummy_struct); + png_memset(&dummy_struct, 0, sizeof dummy_struct); dummy_struct.mem_ptr=mem_ptr; struct_ptr = (*(malloc_fn))(&dummy_struct, (png_alloc_size_t)size); } @@ -90,7 +90,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn, if (free_fn != NULL) { png_struct dummy_struct; - memset(&dummy_struct, 0, sizeof dummy_struct); + png_memset(&dummy_struct, 0, sizeof dummy_struct); dummy_struct.mem_ptr=mem_ptr; (*(free_fn))(&dummy_struct, struct_ptr); return; @@ -102,7 +102,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn, } /* Allocate memory. For reasonable files, size should never exceed - * 64K. However, zlib may allocate more then 64K if you don't tell + * 64K. However, zlib may allocate more than 64K if you don't tell * it not to. See zconf.h and png.h for more information. zlib does * need to allocate exactly 64K, so whatever you call here must * have the ability to do that. @@ -475,7 +475,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn, } /* Allocate memory. For reasonable files, size should never exceed - * 64K. However, zlib may allocate more then 64K if you don't tell + * 64K. However, zlib may allocate more than 64K if you don't tell * it not to. See zconf.h and png.h for more information. zlib does * need to allocate exactly 64K, so whatever you call here must * have the ability to do that. |