diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-02-28 06:08:20 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:11:02 -0500 |
| commit | 0ffb71a6af67d70416adfe24a54a54108efe4d8a (patch) | |
| tree | 2bf24870dfa713f006238996c9ed5a6d5bcb6e2f /pngrtran.c | |
| parent | 79134c69a43e313ef2bb3704262abbbad4d72124 (diff) | |
| download | libpng-0ffb71a6af67d70416adfe24a54a54108efe4d8a.tar.gz | |
Imported from libpng-1.4.0beta49.tarv1.4.0beta49
Diffstat (limited to 'pngrtran.c')
| -rw-r--r-- | pngrtran.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/pngrtran.c b/pngrtran.c index eae7e3c8b..808038b73 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [February 14, 2009] + * Last changed in libpng 1.4.0 [February 28, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -321,8 +321,14 @@ png_set_dither(png_structp png_ptr, png_colorp palette, png_ptr->palette_to_index[i] = (png_byte)i; } +#ifdef PNG_CALLOC_SUPPORTED hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 * png_sizeof(png_dsortp))); +#else + hash = (png_dsortpp)png_malloc(png_ptr, (png_uint_32)(769 * + png_sizeof(png_dsortp))); + png_memset(hash, 0, 769 * png_sizeof(png_dsortp)); +#endif num_new_palette = num_palette; @@ -469,8 +475,15 @@ png_set_dither(png_structp png_ptr, png_colorp palette, int num_blue = (1 << PNG_DITHER_BLUE_BITS); png_size_t num_entries = ((png_size_t)1 << total_bits); +#ifdef PNG_CALLOC_SUPPORTED png_ptr->palette_lookup = (png_bytep )png_calloc(png_ptr, (png_uint_32)(num_entries * png_sizeof(png_byte))); +#else + png_ptr->palette_lookup = (png_bytep )png_malloc(png_ptr, + (png_uint_32)(num_entries * png_sizeof(png_byte))); + png_memset(png_ptr->palette_lookup, 0, num_entries * + png_sizeof(png_byte)); +#endif distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries * png_sizeof(png_byte))); @@ -3976,8 +3989,14 @@ png_build_gamma_table(png_structp png_ptr) else g = 1.0; +#ifdef PNG_CALLOC_SUPPORTED png_ptr->gamma_16_table = (png_uint_16pp)png_calloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p))); +#else + png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr, + (png_uint_32)(num * png_sizeof(png_uint_16p))); + png_memset(png_ptr->gamma_16_table, 0, num * png_sizeof(png_uint_16p)); +#endif if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND)) { @@ -4036,8 +4055,14 @@ png_build_gamma_table(png_structp png_ptr) g = 1.0 / (png_ptr->gamma); +#ifdef PNG_CALLOC_SUPPORTED png_ptr->gamma_16_to_1 = (png_uint_16pp)png_calloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p ))); +#else + png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr, + (png_uint_32)(num * png_sizeof(png_uint_16p ))); + png_memset(png_ptr->gamma_16_to_1, 0, num * png_sizeof(png_uint_16p)); +#endif for (i = 0; i < num; i++) { @@ -4059,8 +4084,15 @@ png_build_gamma_table(png_structp png_ptr) else g = png_ptr->gamma; /* probably doing rgb_to_gray */ +#ifdef PNG_CALLOC_SUPPORTED png_ptr->gamma_16_from_1 = (png_uint_16pp)png_calloc(png_ptr, (png_uint_32)(num * png_sizeof(png_uint_16p))); +#else + png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr, + (png_uint_32)(num * png_sizeof(png_uint_16p))); + png_memset(png_ptr->gamma_16_from_1, 0, + num * png_sizeof(png_uint_16p)); +#endif for (i = 0; i < num; i++) { |