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

[libpng16] Removed trailing blanks

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2012-08-10 19:22:53 -05:00
parent aa9dea57d7
commit 3744f94fd1
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
png.c
View File

@ -749,13 +749,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else #else
# ifdef __STDC__ # ifdef __STDC__
return PNG_STRING_NEWLINE \ return PNG_STRING_NEWLINE \
"libpng version 1.6.0beta27 - August 10, 2012" PNG_STRING_NEWLINE \ "libpng version 1.6.0beta27 - August 11, 2012" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2012 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE; PNG_STRING_NEWLINE;
# else # else
return "libpng version 1.6.0beta27 - August 10, 2012\ return "libpng version 1.6.0beta27 - August 11, 2012\
Copyright (c) 1998-2012 Glenn Randers-Pehrson\ Copyright (c) 1998-2012 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@ -1065,7 +1065,7 @@ png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)
* C and D are the 16-bit words of V2, AD is the product of * C and D are the 16-bit words of V2, AD is the product of
* A and D, and X || Y is (X << 16) + Y. * A and D, and X || Y is (X << 16) + Y.
*/ */
static void static void
png_64bit_product (long v1, long v2, unsigned long *hi_product, png_64bit_product (long v1, long v2, unsigned long *hi_product,
unsigned long *lo_product) unsigned long *lo_product)
{ {

8
pngrutil.c
View File

@ -574,7 +574,7 @@ png_decompress_chunk(png_structrp png_ptr,
if (limit >= prefix_size + (terminate != 0)) if (limit >= prefix_size + (terminate != 0))
{ {
int ret; int ret;
limit -= prefix_size + (terminate != 0); limit -= prefix_size + (terminate != 0);
if (limit < *newlength) if (limit < *newlength)
@ -596,7 +596,7 @@ png_decompress_chunk(png_structrp png_ptr,
ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/, ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
/* input: */ png_ptr->read_buffer + prefix_size, &lzsize, /* input: */ png_ptr->read_buffer + prefix_size, &lzsize,
/* output: */ NULL, newlength); /* output: */ NULL, newlength);
if (ret == Z_STREAM_END) if (ret == Z_STREAM_END)
{ {
/* Use 'inflateReset' here, not 'inflateReset2' because this /* Use 'inflateReset' here, not 'inflateReset2' because this
@ -1009,7 +1009,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
* maintainers to ignore it. * maintainers to ignore it.
*/ */
#ifdef PNG_READ_tRNS_SUPPORTED #ifdef PNG_READ_tRNS_SUPPORTED
if (png_ptr->num_trans > 0 || if (png_ptr->num_trans > 0 ||
(info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)) (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0))
{ {
/* Cancel this because otherwise it would be used if the transforms /* Cancel this because otherwise it would be used if the transforms
@ -1587,7 +1587,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
else else
errmsg = "bad keyword"; errmsg = "bad keyword";
} }
else else
errmsg = "too many profiles"; errmsg = "too many profiles";

6
pngwutil.c
View File

@ -708,7 +708,7 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
*new_key = 0; *new_key = 0;
return 0; return 0;
} }
while (*key && key_len < 79) while (*key && key_len < 79)
{ {
png_byte ch = (png_byte)(0xff & *key++); png_byte ch = (png_byte)(0xff & *key++);
@ -1696,7 +1696,7 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
png_debug(1, "in png_write_iTXt"); png_debug(1, "in png_write_iTXt");
key_len = png_check_keyword(png_ptr, key, new_key); key_len = png_check_keyword(png_ptr, key, new_key);
if (key_len == 0) if (key_len == 0)
png_error(png_ptr, "iTXt: invalid keyword"); png_error(png_ptr, "iTXt: invalid keyword");
@ -1822,7 +1822,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
if (purpose_len == 0) if (purpose_len == 0)
png_error(png_ptr, "pCAL: invalid keyword"); png_error(png_ptr, "pCAL: invalid keyword");
++purpose_len; /* terminator */ ++purpose_len; /* terminator */
png_debug1(3, "pCAL purpose length = %d", (int)purpose_len); png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);