dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1256: Import damages colormap numbering.

Browse source 
Do not remove fully transparent colors from the PNG palette.

(cherry picked from commit 7812aced5d)
This commit is contained in:
Jehan 2019-03-08 15:12:04 +01:00
parent f49c436755
commit 3384bdf6bc
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plug-ins/common/file-png.c
View file

@ -863,7 +863,6 @@ load_image (const gchar *filename,
gint bpp; /* Bytes per pixel */
gint width; /* image width */
gint height; /* image height */
gint empty; /* Number of fully transparent indices */
gint num_passes; /* Number of interlace passes in file */
gint pass; /* Current pass in file */
gint tile_height; /* Height of tile in GIMP */
@ -1194,30 +1193,14 @@ load_image (const gchar *filename,
* Load the colormap as necessary...
*/
empty = 0; /* by default assume no full transparent palette entries */
if (png_get_color_type (pp, info) & PNG_COLOR_MASK_PALETTE)
{
png_colorp palette;
int num_palette;
png_get_PLTE (pp, info, &palette, &num_palette);
if (png_get_valid (pp, info, PNG_INFO_tRNS))
{
for (empty = 0; empty < 256 && alpha[empty] == 0; ++empty)
/* Calculates number of fully transparent "empty" entries */;
/* keep at least one entry */
empty = MIN (empty, num_palette - 1);
gimp_image_set_colormap (image, (guchar *) (palette + empty),
num_palette - empty);
}
else
{
gimp_image_set_colormap (image, (guchar *) palette,
num_palette);
}
gimp_image_set_colormap (image, (guchar *) palette,
num_palette);
}
bpp = babl_format_get_bytes_per_pixel (file_format);
@ -1387,7 +1370,6 @@ load_image (const gchar *filename,
while (length--)
{
data[1] = alpha[data[0]];
data[0] -= empty;
data += n_components;
}