dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 669074 - Corrected typo, spotted by David Allen, in BMP file signature.

This commit is contained in:
Kevin Cozens 2012-01-31 14:37:43 -05:00
parent 05bca8c622
commit 2871093626
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
plug-ins/file-bmp/bmp-read.c
View File

@ -162,7 +162,7 @@ ReadBMP (const gchar *name,
if (!ReadOK (fd, magick, 2) || !(!strncmp (magick, "BA", 2) ||
!strncmp (magick, "BM", 2) || !strncmp (magick, "IC", 2) ||
!strncmp (magick, "PI", 2) || !strncmp (magick, "CI", 2) ||
!strncmp (magick, "PT", 2) || !strncmp (magick, "CI", 2) ||
!strncmp (magick, "CP", 2)))
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
@ -689,41 +689,41 @@ ReadImage (FILE *fd,
(gdouble) max_progress);
}
if (channels == 4)
{
gboolean has_alpha = FALSE;
if (channels == 4)
{
gboolean has_alpha = FALSE;
/* at least one pixel should have nonzero alpha */
for (ypos = 0; ypos < height; ypos++)
{
temp = dest + (ypos * rowstride);
for (xpos = 0; xpos < width; xpos++)
{
if (temp[3])
{
has_alpha = TRUE;
break;
}
temp += 4;
}
if (has_alpha)
break;
}
/* at least one pixel should have nonzero alpha */
for (ypos = 0; ypos < height; ypos++)
{
temp = dest + (ypos * rowstride);
for (xpos = 0; xpos < width; xpos++)
{
if (temp[3])
{
has_alpha = TRUE;
break;
}
temp += 4;
}
if (has_alpha)
break;
}
/* workaround unwanted behaviour when all alpha pixels are zero */
if (!has_alpha)
{
for (ypos = 0; ypos < height; ypos++)
{
temp = dest + (ypos * rowstride);
for (xpos = 0; xpos < width; xpos++)
{
temp[3] = 255;
temp += 4;
}
}
}
}
/* workaround unwanted behaviour when all alpha pixels are zero */
if (!has_alpha)
{
for (ypos = 0; ypos < height; ypos++)
{
temp = dest + (ypos * rowstride);
for (xpos = 0; xpos < width; xpos++)
{
temp[3] = 255;
temp += 4;
}
}
}
}
}
break;