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] Fixed some misleading indentation (Krishnaraj Bhat).

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2016-03-07 07:49:09 -06:00
parent 6d2e06f25f
commit bbe8ea6eb0
5 changed files with 115 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta79 - February 14, 2016
Libpng 1.7.0beta79 - March 7, 2016
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@ -1239,7 +1239,7 @@ Version 1.7.0beta78 [January 23, 2016]
32 bits of address space when size_t/ptrdiff_t are 64 bit types.
Revised workaround for false-positive Coverity issue in pngvalid.c.
Version 1.7.0beta79 [February 14, 2016]
Version 1.7.0beta79 [March 7, 2016]
Only use exit(77) in configure builds.
Corrected error in PNG_IMAGE_PNG_SIZE_MAX. This new macro underreported
the palette size because it failed to take into account that the memory
@ -1262,6 +1262,7 @@ Version 1.7.0beta79 [February 14, 2016]
to higher values.)
Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h
(Robert C. Seacord). Various other flags in png.h made unsigned as well.
Fixed some misleading indentation (Krishnaraj Bhat).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

6
CHANGES
View File

@ -4922,7 +4922,8 @@ Version 1.7.0beta40 [November 6, 2014]
(bug report by Marcin Juszkiewicz, fix by John Bowler).
Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
example.c, pngtest.c, and applications in the contrib directory.
Avoid out-of-bounds memory access in png_user_version_check().
Fixed an out-of-range read in png_user_version_check() (Bug report from
Qixue Xiao, CVE-2015-8540).
Simplified and future-proofed png_user_version_check().
Fixed GCC unsigned int->float warnings. Various versions of GCC
seem to generate warnings when an unsigned value is implicitly
@ -5538,7 +5539,7 @@ Version 1.7.0beta78 [January 23, 2016]
32 bits of address space when size_t/ptrdiff_t are 64 bit types.
Revised workaround for false-positive Coverity issue in pngvalid.c.
Version 1.7.0beta79 [February 14, 2016]
Version 1.7.0beta79 [March 7, 2016]
Only use exit(77) in configure builds.
Corrected error in PNG_IMAGE_PNG_SIZE_MAX. This new macro underreported
the palette size because it failed to take into account that the memory
@ -5561,6 +5562,7 @@ Version 1.7.0beta79 [February 14, 2016]
to higher values.)
Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h
(Robert C. Seacord). Various other flags in png.h made unsigned as well.
Fixed some misleading indentation (Krishnaraj Bhat).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

10
contrib/libtests/pngvalid.c
View File

@ -3307,10 +3307,10 @@ init_standard_palette(png_store *ps, png_structp pp, png_infop pi, int npalette,
for (; i<256; ++i)
tRNS[i] = 24;
# ifdef PNG_WRITE_tRNS_SUPPORTED
#ifdef PNG_WRITE_tRNS_SUPPORTED
if (j > 0)
png_set_tRNS(pp, pi, tRNS, j, 0/*color*/);
# endif
#endif
}
}
@ -7937,11 +7937,11 @@ image_transform_png_set_background_set(const image_transform *this,
else
back.gray = (png_uint_16)data.red;
# ifdef PNG_FLOATING_POINT_SUPPORTED
#ifdef PNG_FLOATING_POINT_SUPPORTED
png_set_background(pp, &back, PNG_BACKGROUND_GAMMA_FILE, expand, 0);
# else
#else
png_set_background_fixed(pp, &back, PNG_BACKGROUND_GAMMA_FILE, expand, 0);
# endif
#endif
this->next->set(this->next, that, pp, pi);
}

2
pngget.c
View File

@ -1140,6 +1140,7 @@ png_get_user_chunk_ptr(png_const_structrp png_ptr)
{
if (png_ptr)
return png_ptr->user_chunk_ptr;
return NULL;
}
#endif
@ -1152,6 +1153,7 @@ png_get_compression_buffer_size(png_const_structrp png_ptr)
# if defined(PNG_SEQUENTIAL_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
return png_ptr->IDAT_size;
# else
return PNG_IDAT_READ_SIZE; /* progressive reader */
# endif

12
pngread.c
View File

@ -140,9 +140,9 @@ png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
# ifdef PNG_READ_GAMMA_SUPPORTED
/* Default gamma correction values: */
#if 0 /*NYI*/
# if 0 /*NYI*/
png_ptr->gamma_accuracy = PNG_DEFAULT_GAMMA_ACCURACY;
#endif /*NYI*/
# endif /*NYI*/
png_ptr->gamma_threshold = PNG_GAMMA_THRESHOLD_FIXED;
# endif /* READ_GAMMA */
}
@ -3629,11 +3629,11 @@ png_image_read_background(png_voidp argument)
unsigned int outchannels = 1+preserve_alpha;
int swap_alpha = 0;
# ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
#ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
if (preserve_alpha != 0 &&
(image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
swap_alpha = 1;
# endif
#endif
for (pass = 0; pass < passes; ++pass)
{
@ -3917,7 +3917,7 @@ png_image_read_direct(png_voidp argument)
else
filler = 255;
# ifdef PNG_FORMAT_AFIRST_SUPPORTED
#ifdef PNG_FORMAT_AFIRST_SUPPORTED
if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
{
where = PNG_FILLER_BEFORE;
@ -3925,7 +3925,7 @@ png_image_read_direct(png_voidp argument)
}
else
# endif
#endif
where = PNG_FILLER_AFTER;
png_set_add_alpha(png_ptr, filler, where);