mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Relocated declarations of index and padding in new index-checking

Browse Source 
code.
This commit is contained in:
Glenn Randers-Pehrson 2012-03-01 22:18:09 -06:00
parent cf49919686
commit 5541ea8aaf
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pngrtran.c
View File

@ -2304,7 +2304,6 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
(!png_ptr->interlaced && png_ptr->pass == 0))) (!png_ptr->interlaced && png_ptr->pass == 0)))
{ {
png_bytep rp = png_ptr->row_buf + 1 + row_info->rowbytes; png_bytep rp = png_ptr->row_buf + 1 + row_info->rowbytes;
int index, padding;
switch (row_info->bit_depth) switch (row_info->bit_depth)
{ {
@ -2313,7 +2312,7 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
/* in this case, all bytes must be 0 so we don't need /* in this case, all bytes must be 0 so we don't need
* to unpack the pixels except for the rightmost one. * to unpack the pixels except for the rightmost one.
*/ */
padding = 8*row_info->rowbytes - png_ptr->width; int padding = 8*row_info->rowbytes - png_ptr->width;
for (; rp > png_ptr->row_buf; rp--) for (; rp > png_ptr->row_buf; rp--)
{ {
@ -2327,11 +2326,11 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
case 2: case 2:
{ {
padding = 2*(4*row_info->rowbytes - png_ptr->width); int padding = 2*(4*row_info->rowbytes - png_ptr->width);
for (; rp > png_ptr->row_buf; rp--) for (; rp > png_ptr->row_buf; rp--)
{ {
index = ((*rp >> padding) & 0x03); int index = ((*rp >> padding) & 0x03);
if (index > png_ptr->num_palette_max) if (index > png_ptr->num_palette_max)
png_ptr->num_palette_max = index; png_ptr->num_palette_max = index;
@ -2359,11 +2358,11 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
case 4: case 4:
{ {
padding = 4*(2*row_info->rowbytes - png_ptr->width); int padding = 4*(2*row_info->rowbytes - png_ptr->width);
for (; rp > png_ptr->row_buf; rp--) for (; rp > png_ptr->row_buf; rp--)
{ {
index = ((*rp >> padding) & 0x0f); int index = ((*rp >> padding) & 0x0f);
if (index > png_ptr->num_palette_max) if (index > png_ptr->num_palette_max)
png_ptr->num_palette_max = index; png_ptr->num_palette_max = index;