callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug #105360. Previously, alpha was taking up an index entry even if

Browse Source 
2003-02-22  Dave Neary  <bolsh@gimp.org>

        * plug-ins/common/png.c: Fixed bug #105360. Previously,
        alpha was taking up an index entry even if there were
        no transparent entries. Sorry about that :)
This commit is contained in:
Dave Neary
2003-02-22 14:20:53 +00:00
committed by David Neary
parent d9c37118d8
commit eef63583f7
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-02-22 Dave Neary <bolsh@gimp.org>
* plug-ins/common/png.c: Fixed bug #105360. Previously,
alpha was taking up an index entry even if there were
no transparent entries. Sorry about that :)
2003-02-21 Manish Singh <yosh@gimp.org> 2003-02-21 Manish Singh <yosh@gimp.org>
* configure.in: oops, put back in perl binary location stuff for * configure.in: oops, put back in perl binary location stuff for

26
plug-ins/common/png.c
View File

@ -137,19 +137,21 @@ static gboolean runme = FALSE;
*/ */
MAIN () MAIN ()
/* Try to find a colour in the palette which isn't actually /* Try to find a colour in the palette which isn't actually
* used in the image, so that we can use it as the transparency * used in the image, so that we can use it as the transparency
* index. Taken from gif.c */ * index. Taken from gif.c */
static int find_unused_ia_colour (guchar * pixels, static int find_unused_ia_colour (guchar * pixels,
int numpixels, int numpixels,
int *colors) int *colors)
{ {
int i; int i;
gboolean ix_used[256]; gboolean ix_used[256]; // max of 256 palette entries
gboolean trans_used = FALSE;
for (i = 0; i < 256; i++) for (i = 0; i < *colors; i++)
{ {
ix_used[i] = (gboolean) FALSE; ix_used[i] = FALSE;
} }
for (i = 0; i < numpixels; i++) for (i = 0; i < numpixels; i++)
@ -157,12 +159,18 @@ MAIN ()
/* If there is no alpha, then the index associated with /* If there is no alpha, then the index associated with
* this pixel is taken */ * this pixel is taken */
if (pixels[i * 2 + 1]) if (pixels[i * 2 + 1])
ix_used[pixels[i * 2]] = (gboolean) TRUE; ix_used[pixels[i * 2]] = TRUE;
else
trans_used = TRUE;
} }
for (i = 255; i >= 0; i--) // If there is no transparency, ignore alpha.
if (trans_used == FALSE)
return -1;
for (i = 0; i < *colors; i++)
{ {
if (ix_used[i] == (gboolean) FALSE) if (ix_used[i] == FALSE)
{ {
return i; return i;
} }