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

app: make sure image colormaps always have at least one color

Browse source 
In gimp_image_set_colormap(), make sure the image's colormap always
has at least one color -- babl palette formats must have at least
one color.

If the function is called with 0 colors, use black.  We still need
to support this case, in particular, since existing XCFs may have
an empty colormap, and since plug-ins can call
gimp-image-set-colormap with 0 colors.
This commit is contained in:
Ell 2018-06-14 03:12:35 -04:00
parent 4117c98655
commit c16c68e63e
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/core/gimpimage-colormap.c
View file

@ -182,6 +182,8 @@ gimp_image_set_colormap (GimpImage *image,
gboolean push_undo)
{
GimpImagePrivate *private;
GimpPaletteEntry *entry;
gint i;
g_return_if_fail (GIMP_IS_IMAGE (image));
g_return_if_fail (colormap != NULL || n_colors == 0);
@ -194,34 +196,26 @@ gimp_image_set_colormap (GimpImage *image,
if (private->colormap)
memset (private->colormap, 0, GIMP_IMAGE_COLORMAP_SIZE);
else
gimp_image_colormap_init (image);
if (colormap)
{
if (! private->colormap)
{
gimp_image_colormap_init (image);
}
memcpy (private->colormap, colormap, n_colors * 3);
memcpy (private->colormap, colormap, n_colors * 3);
}
/* make sure the image's colormap always has at least one color. when
* n_colors == 0, use black.
*/
private->n_colors = MAX (n_colors, 1);
private->n_colors = n_colors;
gimp_data_freeze (GIMP_DATA (private->palette));
if (private->palette)
{
GimpPaletteEntry *entry;
gint i;
while ((entry = gimp_palette_get_entry (private->palette, 0)))
gimp_palette_delete_entry (private->palette, entry);
gimp_data_freeze (GIMP_DATA (private->palette));
for (i = 0; i < private->n_colors; i++)
gimp_image_colormap_set_palette_entry (image, i);
while ((entry = gimp_palette_get_entry (private->palette, 0)))
gimp_palette_delete_entry (private->palette, entry);
for (i = 0; i < private->n_colors; i++)
gimp_image_colormap_set_palette_entry (image, i);
gimp_data_thaw (GIMP_DATA (private->palette));
}
gimp_data_thaw (GIMP_DATA (private->palette));
gimp_image_colormap_changed (image, -1);
}