graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-22 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bill Skaggs <weskaggs@primate.ucdavis.edu>

Browse source 
* plug-ins/common/png.c: when saving an IA image, don't load
	the entire image into memory to search for an unused color.
	Fixes bug #308909.
This commit is contained in:
William Skaggs 2006-08-30 16:37:55 +00:00
parent e92602cedd
commit 177cef9d21
2 changed files with 108 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-08-30 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* plug-ins/common/png.c: when saving an IA image, don't load
the entire image into memory to search for an unused color.
Fixes bug #308909.
2006-08-30 Sven Neumann <sven@gimp.org>
* app/config/gimprc-blurbs.h

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

@ -139,11 +139,9 @@ static void save_dialog_response (GtkWidget *widget,
gint response_id,
gpointer data);
static gboolean ia_has_transparent_pixels (const guchar *pixels,
gint numpixels);
static gboolean ia_has_transparent_pixels (GimpDrawable *drawable);
static gint find_unused_ia_color (const guchar *pixels,
gint numpixels,
static gint find_unused_ia_color (GimpDrawable *drawable,
gint *colors);
static gboolean load_defaults (void);
@ -592,59 +590,6 @@ run (const gchar *name,
}
/* Try to find a color in the palette which isn't actually
* used in the image, so that we can use it as the transparency
* index. Taken from gif.c */
static gint
find_unused_ia_color (const guchar *pixels,
gint numpixels,
gint *colors)
{
gint i;
gboolean ix_used[256];
gboolean trans_used = FALSE;
for (i = 0; i < *colors; i++)
{
ix_used[i] = FALSE;
}
for (i = 0; i < numpixels; i++)
{
/* If alpha is over a threshold, the color index in the
* palette is taken. Otherwise, this pixel is transparent. */
if (pixels[i * 2 + 1] > 127)
ix_used[pixels[i * 2]] = TRUE;
else
trans_used = TRUE;
}
/* If there is no transparency, ignore alpha. */
if (trans_used == FALSE)
return -1;
for (i = 0; i < *colors; i++)
{
if (ix_used[i] == FALSE)
{
return i;
}
}
/* Couldn't find an unused color index within the number of
bits per pixel we wanted. Will have to increment the number
of colors in the image and assign a transparent pixel there. */
if ((*colors) < 256)
{
(*colors)++;
return (*colors) - 1;
}
return -1;
}
/*
* 'load_image()' - Load a PNG image into a new image window.
*/
@ -1540,20 +1485,109 @@ save_image (const gchar *filename,
}
static gboolean
ia_has_transparent_pixels (const guchar *pixels,
gint numpixels)
ia_has_transparent_pixels (GimpDrawable *drawable)
{
while (numpixels --)
{
if (pixels [1] <= 127)
return TRUE;
GimpPixelRgn pixel_rgn;
gpointer pr;
guchar *pixel_row;
gint row, col;
guchar *pixel;
pixels += 2;
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0,
drawable->width, drawable->height, FALSE, FALSE);
for (pr = gimp_pixel_rgns_register (1, &pixel_rgn);
pr != NULL;
pr = gimp_pixel_rgns_process (pr))
{
pixel_row = pixel_rgn.data;
for (row = 0; row < pixel_rgn.h; row++)
{
pixel = pixel_row;
for (col = 0; col < pixel_rgn.w; col++)
{
if (pixel[1] <= 127)
return TRUE;
pixel += 2;
}
pixel_row += pixel_rgn.rowstride;
}
}
return FALSE;
}
/* Try to find a color in the palette which isn't actually
* used in the image, so that we can use it as the transparency
* index. Taken from gif.c */
static gint
find_unused_ia_color (GimpDrawable *drawable,
gint *colors)
{
gint i;
gboolean ix_used[256];
gboolean trans_used = FALSE;
GimpPixelRgn pixel_rgn;
gpointer pr;
guchar *pixel_row;
gint row, col;
guchar *pixel;
for (i = 0; i < *colors; i++)
{
ix_used[i] = FALSE;
}
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0,
drawable->width, drawable->height, FALSE, FALSE);
for (pr = gimp_pixel_rgns_register (1, &pixel_rgn);
pr != NULL;
pr = gimp_pixel_rgns_process (pr))
{
pixel_row = pixel_rgn.data;
for (row = 0; row < pixel_rgn.h; row++)
{
pixel = pixel_row;
for (col = 0; col < pixel_rgn.w; col++)
{
if (pixel[1] > 127)
ix_used[ pixel[0] ] = TRUE;
else
trans_used = TRUE;
pixel += 2;
}
pixel_row += pixel_rgn.rowstride;
}
}
/* If there is no transparency, ignore alpha. */
if (trans_used == FALSE)
return -1;
for (i = 0; i < *colors; i++)
{
if (ix_used[i] == FALSE)
{
return i;
}
}
/* Couldn't find an unused color index within the number of
bits per pixel we wanted. Will have to increment the number
of colors in the image and assign a transparent pixel there. */
if ((*colors) < 256)
{
(*colors)++;
return (*colors) - 1;
}
return -1;
}
static void
respin_cmap (png_structp pp,
png_infop info,
@ -1565,10 +1599,6 @@ respin_cmap (png_structp pp,
gint colors;
guchar *before;
gint cols, rows;
GimpPixelRgn pixel_rgn;
guchar *pixels;
gint numpixels;
before = gimp_image_get_colormap (image_ID, &colors);
@ -1581,25 +1611,14 @@ respin_cmap (png_structp pp,
colors = 1;
}
cols = drawable->width;
rows = drawable->height;
numpixels = cols * rows;
pixels = g_new (guchar, numpixels * 2); /* GIMP_INDEXEDA_IMAGE */
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0,
drawable->width, drawable->height, FALSE, FALSE);
gimp_pixel_rgn_get_rect (&pixel_rgn, pixels,
0, 0, drawable->width, drawable->height);
/* Try to find an entry which isn't actually used in the
image, for a transparency index. */
if (ia_has_transparent_pixels (pixels, numpixels))
if (ia_has_transparent_pixels (drawable))
{
gint transparent = find_unused_ia_color (pixels, numpixels, &colors);
gint transparent = find_unused_ia_color (drawable, &colors);
g_print ("has transparent pixels, unused color is %d\n", transparent);
if (transparent != -1) /* we have a winner for a transparent
* index - do like gif2png and swap
@ -1645,7 +1664,6 @@ respin_cmap (png_structp pp,
png_set_PLTE (pp, info, (png_colorp) before, colors);
}
g_free (pixels);
}
static gboolean