|
Line
Link Here
|
| 0 |
-- libpng3-1.2.5.orig/pngrtran.c |
0 |
++ libpng3-1.2.5/pngrtran.c |
|
Lines 1930-1936
Link Here
|
| 1930 |
if (flags & PNG_FLAG_FILLER_AFTER) |
1930 |
if (flags & PNG_FLAG_FILLER_AFTER) |
| 1931 |
{ |
1931 |
{ |
| 1932 |
png_bytep sp = row + (png_size_t)row_width * 3; |
1932 |
png_bytep sp = row + (png_size_t)row_width * 3; |
| 1933 |
png_bytep dp = sp + (png_size_t)row_width; |
1933 |
png_bytep dp = sp + (png_size_t)row_width ; |
| 1934 |
for (i = 1; i < row_width; i++) |
1934 |
for (i = 1; i < row_width; i++) |
| 1935 |
{ |
1935 |
{ |
| 1936 |
*(--dp) = lo_filler; |
1936 |
*(--dp) = lo_filler; |
|
Lines 1947-1953
Link Here
|
| 1947 |
else |
1947 |
else |
| 1948 |
{ |
1948 |
{ |
| 1949 |
png_bytep sp = row + (png_size_t)row_width * 3; |
1949 |
png_bytep sp = row + (png_size_t)row_width * 3; |
| 1950 |
png_bytep dp = sp + (png_size_t)row_width; |
1950 |
png_bytep dp = sp + (png_size_t)row_width ; |
| 1951 |
for (i = 0; i < row_width; i++) |
1951 |
for (i = 0; i < row_width; i++) |
| 1952 |
{ |
1952 |
{ |
| 1953 |
*(--dp) = *(--sp); |
1953 |
*(--dp) = *(--sp); |
|
Lines 1965-1972
Link Here
|
| 1965 |
/* This changes the data from RRGGBB to RRGGBBXX */ |
1965 |
/* This changes the data from RRGGBB to RRGGBBXX */ |
| 1966 |
if (flags & PNG_FLAG_FILLER_AFTER) |
1966 |
if (flags & PNG_FLAG_FILLER_AFTER) |
| 1967 |
{ |
1967 |
{ |
| 1968 |
png_bytep sp = row + (png_size_t)row_width * 3; |
1968 |
png_bytep sp = row + (png_size_t)row_width * 6; |
| 1969 |
png_bytep dp = sp + (png_size_t)row_width; |
1969 |
png_bytep dp = sp + (png_size_t)row_width * 2; |
| 1970 |
for (i = 1; i < row_width; i++) |
1970 |
for (i = 1; i < row_width; i++) |
| 1971 |
{ |
1971 |
{ |
| 1972 |
*(--dp) = hi_filler; |
1972 |
*(--dp) = hi_filler; |
|
Lines 1987-1994
Link Here
|
| 1987 |
/* This changes the data from RRGGBB to XXRRGGBB */ |
1987 |
/* This changes the data from RRGGBB to XXRRGGBB */ |
| 1988 |
else |
1988 |
else |
| 1989 |
{ |
1989 |
{ |
| 1990 |
png_bytep sp = row + (png_size_t)row_width * 3; |
1990 |
png_bytep sp = row + (png_size_t)row_width * 6; |
| 1991 |
png_bytep dp = sp + (png_size_t)row_width; |
1991 |
png_bytep dp = sp + (png_size_t)row_width * 2; |
| 1992 |
for (i = 0; i < row_width; i++) |
1992 |
for (i = 0; i < row_width; i++) |
| 1993 |
{ |
1993 |
{ |
| 1994 |
*(--dp) = *(--sp); |
1994 |
*(--dp) = *(--sp); |
| 1995 |
-- libpng3-1.2.5.orig/pngerror.c 2002-10-03 05:32:27.000000000 -0600 |
1995 |
++ libpng3-1.2.5/pngerror.c 2004-04-29 09:26:18.000000000 -0600 |
|
Lines 135-144
Link Here
|
| 135 |
buffer[iout] = 0; |
135 |
buffer[iout] = 0; |
| 136 |
else |
136 |
else |
| 137 |
{ |
137 |
{ |
|
|
138 |
png_size_t len = strnlen(error_message, 63); |
| 139 |
|
| 138 |
buffer[iout++] = ':'; |
140 |
buffer[iout++] = ':'; |
| 139 |
buffer[iout++] = ' '; |
141 |
buffer[iout++] = ' '; |
| 140 |
png_memcpy(buffer+iout, error_message, 64); |
142 |
png_memcpy(buffer+iout, error_message, len); |
| 141 |
buffer[iout+63] = 0; |
143 |
buffer[iout+len] = 0; |
| 142 |
} |
144 |
} |
| 143 |
} |
145 |
} |
