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

On request of Martin Weber <martweb@gmx.net>: Fixed bug #52728 - problem 

2001-04-06  Stanislav Brabec  <utx@penguin.cz>

        On request of Martin Weber <martweb@gmx.net>:
        * plugins/common/tga.c: Fixed bug #52728 - problem in loading
        compressed and uncompressed 15 bit tga, compressed 16 bit tga
        files and removed a false warning for 32 bit tga files.
This commit is contained in:
Stanislav Brabec 2001-04-05 22:31:19 +00:00 committed by Stanislav Brabec
parent 200ea06454
commit 7ae373c153
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-06 Stanislav Brabec <utx@penguin.cz>
On request of Martin Weber <martweb@gmx.net>:
* plugins/common/tga.c: Fixed bug #52728 - problem in loading
compressed and uncompressed 15 bit tga, compressed 16 bit tga
files and removed a false warning for 32 bit tga files.
2001-04-02 Sven Neumann <sven@gimp.org> 2001-04-02 Sven Neumann <sven@gimp.org>
* app/Makefile.am * app/Makefile.am

22
plug-ins/common/tga.c
View File

@ -518,25 +518,15 @@ load_image (gchar *filename)
} }
break; break;
case TGA_TYPE_COLOR: case TGA_TYPE_COLOR:
if (info.alphaBits == 0 && info.bpp == 32) if (info.bpp != 15 && info.bpp != 16 && info.bpp != 24
{ && info.bpp != 32)
g_message ("TGA: Possibly incorrect alpha in \"%s\"\n", filename);
info.alphaBits = 8;
}
if (info.bpp != 16 && info.bpp != 24
&& (info.alphaBits != 8 || info.bpp != 32))
{ {
g_message ("TGA: Unhandled sub-format in \"%s\"\n", filename); g_message ("TGA: Unhandled sub-format in \"%s\"\n", filename);
return -1; return -1;
} }
break; break;
case TGA_TYPE_GRAY: case TGA_TYPE_GRAY:
if (info.alphaBits == 0 && info.bpp == 16) if (info.bpp != 8 && (info.alphaBits != 8 || (info.bpp != 16 || info.bpp != 15)))
{
g_message ("TGA: Possibly incorrect alpha in \"%s\"\n", filename);
info.alphaBits = 8;
}
if (info.bpp != 8 && (info.alphaBits != 8 || info.bpp != 16))
{ {
g_message ("TGA: Unhandled sub-format in \"%s\"\n", filename); g_message ("TGA: Unhandled sub-format in \"%s\"\n", filename);
return -1; return -1;
@ -549,7 +539,7 @@ load_image (gchar *filename)
} }
/* Plausible but unhandled formats */ /* Plausible but unhandled formats */
if (info.bytes * 8 != info.bpp) if (info.bytes * 8 != info.bpp && !(info.bytes == 2 && info.bpp == 15))
{ {
g_message ("TGA: No support yet for TGA with these parameters\n"); g_message ("TGA: No support yet for TGA with these parameters\n");
return -1; return -1;
@ -825,7 +815,7 @@ read_line (FILE *fp,
if (info->imageType == TGA_TYPE_COLOR) if (info->imageType == TGA_TYPE_COLOR)
{ {
if (info->bpp == 16) if (info->bpp == 16 || info->bpp == 15)
{ {
upsample (row, buffer, info->width, info->bytes); upsample (row, buffer, info->width, info->bytes);
} }
@ -902,7 +892,7 @@ ReadImage (FILE *fp,
bgr2rgb(gimp_cmap, tga_cmap, info->colorMapLength, cmap_bytes, 1); bgr2rgb(gimp_cmap, tga_cmap, info->colorMapLength, cmap_bytes, 1);
else if (info->colorMapSize == 24) else if (info->colorMapSize == 24)
bgr2rgb(gimp_cmap, tga_cmap, info->colorMapLength, cmap_bytes, 0); bgr2rgb(gimp_cmap, tga_cmap, info->colorMapLength, cmap_bytes, 0);
else if (info->colorMapSize == 16) else if (info->colorMapSize == 16 || info->colorMapSize == 15)
upsample(gimp_cmap, tga_cmap, info->colorMapLength, cmap_bytes); upsample(gimp_cmap, tga_cmap, info->colorMapLength, cmap_bytes);
} }