diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-02-07 18:08:50 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-02-07 18:10:43 -0600 |
| commit | e3f3c4ea0b9753c12a3f661558320bf712096042 (patch) | |
| tree | 2741ff1015965dde6e64732357932b255381b538 /pngmem.c | |
| parent | 67a83db98dd151724219766ed465ba30a454b19f (diff) | |
| download | libpng-e3f3c4ea0b9753c12a3f661558320bf712096042.tar.gz | |
[devel] Imported from libpng-1.5.0beta01.tarv1.5.0beta01
Diffstat (limited to 'pngmem.c')
| -rw-r--r-- | pngmem.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [January 2, 2010] + * Last changed in libpng 1.4.0 [February 8, 2010] * Copyright (c) 1998-2010 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.) @@ -17,6 +17,7 @@ * identify the replacement functions. */ +#define PNG_INTERNAL #define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) @@ -201,7 +202,7 @@ png_malloc_default(png_structp png_ptr, png_alloc_size_t size) { #ifndef PNG_USER_MEM_SUPPORTED if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0) - png_error(png_ptr, "Out Of Memory"); /* Note "O" and "M" */ + png_error(png_ptr, "Out Of Memory"); /* Note "O", "M" */ else png_warning(png_ptr, "Out Of Memory"); #endif @@ -229,7 +230,7 @@ png_malloc_default(png_structp png_ptr, png_alloc_size_t size) { #ifndef PNG_USER_MEM_SUPPORTED if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0) - png_error(png_ptr, "Out Of memory"); /* Note "O" and "M" */ + png_error(png_ptr, "Out Of memory"); /* Note "O", "m" */ else png_warning(png_ptr, "Out Of memory"); #endif |