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

[libpng17] Committed pngvalid.c omitted from previous commit; fix trivial typos

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2015-03-22 21:01:48 -05:00
parent 53097f5bbb
commit 67890a19f3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/libtests/pngvalid.c
View File

@ -5848,8 +5848,9 @@ transform_info_imp(transform_display *dp, png_structp pp, png_infop pi)
/* If png_set_filler is in action then fake the output color type to include /* If png_set_filler is in action then fake the output color type to include
* an alpha channel where appropriate. * an alpha channel where appropriate.
*/ */
if (dp->output_bit_depth >= 8 && (dp->output_colour_type == PNG_COLOR_TYPE_RGB || if (dp->output_bit_depth >= 8 &&
dp->output_colour_type == PNG_COLOR_TYPE_GRAY) && dp->this.filler) (dp->output_colour_type == PNG_COLOR_TYPE_RGB ||
dp->output_colour_type == PNG_COLOR_TYPE_GRAY) && dp->this.filler)
dp->output_colour_type |= 4; dp->output_colour_type |= 4;
/* Validate the combination of colour type and bit depth that we are getting /* Validate the combination of colour type and bit depth that we are getting

2
pngerror.c
View File

@ -1151,7 +1151,7 @@ PNG_FUNCTION(void, png_affirm,(png_const_structrp png_ptr,
} }
#ifdef PNG_RANGE_CHECK_SUPPORTED #ifdef PNG_RANGE_CHECK_SUPPORTED
/* The character/byte checking APIs. These do their own calls to png_assert /* The character/byte checking APIs. These do their own calls to png_affirm
* because the caller provides the position. * because the caller provides the position.
*/ */
char /* PRIVATE */ char /* PRIVATE */

2
pngpriv.h
View File

@ -911,7 +911,7 @@ extern "C" {
* *
* All of these functions must be declared with PNG_INTERNAL_FUNCTION. * All of these functions must be declared with PNG_INTERNAL_FUNCTION.
*/ */
/* Assert handling */ /* Affirm handling */
PNG_INTERNAL_FUNCTION(void, png_affirm,(png_const_structrp png_ptr, PNG_INTERNAL_FUNCTION(void, png_affirm,(png_const_structrp png_ptr,
param_deb(png_const_charp condition) unsigned int position), PNG_NORETURN); param_deb(png_const_charp condition) unsigned int position), PNG_NORETURN);