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

[devel] Relocate the INVERT_ALPHA function within png_read_png()

Browse Source 
and png_write_png().
This commit is contained in:
Glenn Randers-Pehrson 2009-06-29 16:45:53 -05:00
parent cd2634b3ce
commit 6878eb6899
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ANNOUNCE
View File

@ -495,6 +495,8 @@ version 1.4.0beta66 [June 27, 2009]
Refer to the libpng license instead of the libpng license in each file. Refer to the libpng license instead of the libpng license in each file.
version 1.4.0beta67 [June 29, 2009] version 1.4.0beta67 [June 29, 2009]
Relocated INVERT_ALPHA within png_read_png() and png_write_png()
to match its position in pngrtran.c.
version 1.4.0betaN [future] version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm. Build shared libraries with -lz and sometimes -lm.

2
CHANGES
View File

@ -2172,7 +2172,7 @@ version 1.4.0beta66 [June 27, 2009]
Refer to the libpng license instead of the libpng license in each file. Refer to the libpng license instead of the libpng license in each file.
version 1.4.0beta67 [June 29, 2009] version 1.4.0beta67 [June 29, 2009]
Relocated INVERT_ALPHA withing png_read_png() and png_write_png() Relocated INVERT_ALPHA within png_read_png() and png_write_png()
to match its position in pngrtran.c. to match its position in pngrtran.c.
version 1.4.0betaN [future] version 1.4.0betaN [future]

13
pngread.c
View File

@ -1195,12 +1195,6 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
if (png_ptr == NULL) if (png_ptr == NULL)
return; return;
#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
/* Invert the alpha channel from opacity to transparency
*/
if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
png_set_invert_alpha(png_ptr);
#endif
/* png_read_info() gives us all of the information from the /* png_read_info() gives us all of the information from the
* PNG file before the first IDAT (image data chunk). * PNG file before the first IDAT (image data chunk).
@ -1301,6 +1295,13 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
png_set_swap(png_ptr); png_set_swap(png_ptr);
#endif #endif
#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
/* Invert the alpha channel from opacity to transparency
*/
if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
png_set_invert_alpha(png_ptr);
#endif
/* We don't handle adding filler bytes */ /* We don't handle adding filler bytes */
/* Optional call to gamma correct and add the background to the palette /* Optional call to gamma correct and add the background to the palette

11
pngwrite.c
View File

@ -1347,11 +1347,6 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,
{ {
if (png_ptr == NULL || info_ptr == NULL) if (png_ptr == NULL || info_ptr == NULL)
return; return;
#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
/* Invert the alpha channel from opacity to transparency */
if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
png_set_invert_alpha(png_ptr);
#endif
/* Write the file header information. */ /* Write the file header information. */
png_write_info(png_ptr, info_ptr); png_write_info(png_ptr, info_ptr);
@ -1411,6 +1406,12 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,
png_set_packswap(png_ptr); png_set_packswap(png_ptr);
#endif #endif
#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
/* Invert the alpha channel from opacity to transparency */
if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
png_set_invert_alpha(png_ptr);
#endif
/* ----------------------- end of transformations ------------------- */ /* ----------------------- end of transformations ------------------- */
/* Write the bits */ /* Write the bits */