[gimp/gimp-2-10] Issue #1256: Import damages colormap numbering.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] Issue #1256: Import damages colormap numbering.
- Date: Fri, 8 Mar 2019 14:16:55 +0000 (UTC)
commit 7812aced5dd01904a7f6360fa8b257656147f5aa
Author: Jehan <jehan girinstud io>
Date: Fri Mar 8 15:12:04 2019 +0100
Issue #1256: Import damages colormap numbering.
Do not remove fully transparent colors from the PNG palette.
plug-ins/common/file-png.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index b7cc9dba25..cc0eba29c1 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -856,7 +856,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 */
@@ -1187,30 +1186,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);
@@ -1380,7 +1363,6 @@ load_image (const gchar *filename,
while (length--)
{
data[1] = alpha[data[0]];
- data[0] -= empty;
data += n_components;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]