cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Minor revisions to comments on pngstruct.h and pngvalid.c

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-05-15 19:38:06 -05:00
parent 0e128dfa2f
commit 73904f52b4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pngstruct.h
View File

@ -111,7 +111,7 @@ struct png_struct_def
png_bytep avg_row; /* buffer to save "avg" row when filtering */ png_bytep avg_row; /* buffer to save "avg" row when filtering */
png_bytep paeth_row; /* buffer to save "Paeth" row when filtering */ png_bytep paeth_row; /* buffer to save "Paeth" row when filtering */
png_row_info row_info; /* used for transformation routines */ png_row_info row_info; /* used for transformation routines */
png_size_t info_rowbytes; /* Adding in 1.5.3: cache of updated row bytes */ png_size_t info_rowbytes; /* Added in 1.5.3: cache of updated row bytes */
png_uint_32 idat_size; /* current IDAT size for read */ png_uint_32 idat_size; /* current IDAT size for read */
png_uint_32 crc; /* current chunk CRC value */ png_uint_32 crc; /* current chunk CRC value */

16
pngvalid.c
View File

@ -534,7 +534,7 @@ store_pool_mark(png_bytep mark)
make_four_random_bytes(store_seed, mark); make_four_random_bytes(store_seed, mark);
} }
/* Use this for random 32 bit values, this function makes sure the result is /* Use this for random 32 bit values; this function makes sure the result is
* non-zero. * non-zero.
*/ */
static png_uint_32 static png_uint_32
@ -2277,7 +2277,7 @@ bit_size(png_structp pp, png_byte colour_type, png_byte bit_depth)
#define TRANSFORM_ROWMAX (TRANSFORM_WIDTH*8U) #define TRANSFORM_ROWMAX (TRANSFORM_WIDTH*8U)
#define SIZE_ROWMAX (16*8U) /* 16 pixels, max 8 bytes each - 128 bytes */ #define SIZE_ROWMAX (16*8U) /* 16 pixels, max 8 bytes each - 128 bytes */
#define STANDARD_ROWMAX TRANSFORM_ROWMAX /* The larger of the two */ #define STANDARD_ROWMAX TRANSFORM_ROWMAX /* The larger of the two */
#define SIZE_HEIGHTMAX 16 /* Maxium range of size images */ #define SIZE_HEIGHTMAX 16 /* Maximum range of size images */
static size_t static size_t
transform_rowsize(png_structp pp, png_byte colour_type, png_byte bit_depth) transform_rowsize(png_structp pp, png_byte colour_type, png_byte bit_depth)
@ -2674,7 +2674,7 @@ deinterlace_row(png_bytep buffer, png_const_bytep row,
} }
} }
/* Build a single row for the 'size' test images, this fills in only the /* Build a single row for the 'size' test images; this fills in only the
* first bit_width bits of the sample row. * first bit_width bits of the sample row.
*/ */
static void static void
@ -2777,7 +2777,7 @@ make_size_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type,
png_byte tempRow[SIZE_ROWMAX]; png_byte tempRow[SIZE_ROWMAX];
/* If do_interlace *and* the image is interlaced we /* If do_interlace *and* the image is interlaced we
* need a reduced interlace row, this may be reduced * need a reduced interlace row; this may be reduced
* to empty. * to empty.
*/ */
if (do_interlace && interlace_type == PNG_INTERLACE_ADAM7) if (do_interlace && interlace_type == PNG_INTERLACE_ADAM7)
@ -2951,7 +2951,7 @@ make_error(png_store* volatile ps, png_byte PNG_CONST colour_type,
if (colour_type == 3) /* palette */ if (colour_type == 3) /* palette */
init_standard_palette(ps, pp, pi, 1U << bit_depth, 0/*do tRNS*/); init_standard_palette(ps, pp, pi, 1U << bit_depth, 0/*do tRNS*/);
/* Time for a few errors, these are in various optional chunks, the /* Time for a few errors; these are in various optional chunks, the
* standard tests test the standard chunks pretty well. * standard tests test the standard chunks pretty well.
*/ */
# define exception__prev exception_prev_1 # define exception__prev exception_prev_1
@ -3172,7 +3172,7 @@ perform_formatting_test(png_store *volatile ps)
* requirement that the pointer to the first member of a structure must be the * requirement that the pointer to the first member of a structure must be the
* same as the pointer to the structure. This allows us to reuse standard_ * same as the pointer to the structure. This allows us to reuse standard_
* functions in the gamma test code; something that could not be done with * functions in the gamma test code; something that could not be done with
* nested funtions! * nested functions!
*/ */
typedef struct standard_display typedef struct standard_display
{ {
@ -4171,7 +4171,7 @@ image_pixel_convert_PLTE(image_pixel *this)
} }
} }
/* Add an alpha channel, this will glom in the tRNS information because tRNS is /* Add an alpha channel; this will import the tRNS information because tRNS is
* not valid in an alpha image. The bit depth will invariably be set to at * not valid in an alpha image. The bit depth will invariably be set to at
* least 8. Palette images will be converted to alpha (using the above API). * least 8. Palette images will be converted to alpha (using the above API).
*/ */
@ -5679,7 +5679,7 @@ perform_transform_test(png_modifier *pm)
size_t pos = base_pos; size_t pos = base_pos;
PNG_CONST image_transform *list = 0; PNG_CONST image_transform *list = 0;
/* 'max' is currently hardwired to '1', this should be settable on the /* 'max' is currently hardwired to '1'; this should be settable on the
* command line. * command line.
*/ */
counter = image_transform_add(&list, 1/*max*/, counter, counter = image_transform_add(&list, 1/*max*/, counter,