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

[devel] Zapped "zap" (changed "zap" to "remove")

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-08-29 16:16:26 -05:00
parent 44271398bd
commit 63071acbd9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pngrtran.c
View File

@ -1640,7 +1640,7 @@ png_init_read_transformations(png_structp png_ptr)
/* Prevent the transformations being done again.
*
* NOTE: this is highly dubious; it zaps the transformations in
* NOTE: this is highly dubious; it removes the transformations in
* place. This seems inconsistent with the general treatment of the
* transformations elsewhere.
*/

8
pngvalid.c
View File

@ -3998,8 +3998,8 @@ read_palette(store_palette palette, int *npalette, png_structp pp, png_infop pi)
if ((png_get_tRNS(pp, pi, &trans_alpha, &num, 0) & PNG_INFO_tRNS) != 0 &&
(trans_alpha != NULL || num != 1/*returns 1 for a transparent color*/) &&
/* Oops, if a palette tRNS gets expanded png_read_update_info (at least so
* far as 1.5.4) does not zap the trans_alpha pointer, only num_trans, so
* in the above call we get a success, we get a pointer (who knows what
* far as 1.5.4) does not remove the trans_alpha pointer, only num_trans,
* so in the above call we get a success, we get a pointer (who knows what
* to) and we get num_trans == 0:
*/
!(trans_alpha != NULL && num == 0)) /* TODO: fix this in libpng. */
@ -6419,7 +6419,7 @@ image_transform_png_set_rgb_to_gray_mod(PNG_CONST image_transform *this,
* 1/32768, because even in the rounding case the requirement that
* coefficients add up to 32768 can cause a larger rounding error.
*
* The only time when rounding doesn occur in 1.5.5 and later is when
* The only time when rounding doesn't occur in 1.5.5 and later is when
* the non-gamma code path is used for less than 16 bit data.
*/
gray = r * data.red_coefficient + g * data.green_coefficient +
@ -6492,7 +6492,7 @@ image_transform_png_set_rgb_to_gray_mod(PNG_CONST image_transform *this,
that->red_sBIT = that->blue_sBIT;
that->blue_sBIT = that->green_sBIT = that->red_sBIT;
/* And zap the colour bit in the type: */
/* And remove the colour bit in the type: */
if (that->colour_type == PNG_COLOR_TYPE_RGB)
that->colour_type = PNG_COLOR_TYPE_GRAY;
else if (that->colour_type == PNG_COLOR_TYPE_RGB_ALPHA)