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

Make sure we have a bpp value we can handle, and fail gracefully if not. 

2004-10-14  Manish Singh  <yosh@gimp.org>

        * plug-ins/common/bmpread.c: Make sure we have a bpp value we can
        handle, and fail gracefully if not. Fixes bug #155401.
This commit is contained in:
Manish Singh 2004-10-14 17:16:38 +00:00 committed by Manish Singh
parent 27c2be7cea
commit 95b4758bc5
2 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-14 Manish Singh <yosh@gimp.org>
* plug-ins/common/bmpread.c: Make sure we have a bpp value we can
handle, and fail gracefully if not. Fixes bug #155401.
2004-10-14 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpwidgets.c

79
plug-ins/bmp/bmpread.c
View File

@ -413,18 +413,20 @@ ReadImage (FILE *fd,
gboolean grey,
const Bitmap_Channel *masks)
{
guchar v, n;
GimpPixelRgn pixel_rgn;
gint xpos = 0;
gint ypos = 0;
gint32 image;
gint32 layer;
GimpDrawable *drawable;
guchar *dest, *temp, *buffer;
guchar gimp_cmap[768];
gushort rgb;
glong rowstride, channels;
gint i, j, cur_progress, max_progress;
guchar v, n;
GimpPixelRgn pixel_rgn;
gint xpos = 0;
gint ypos = 0;
gint32 image;
gint32 layer;
GimpDrawable *drawable;
guchar *dest, *temp, *buffer;
guchar gimp_cmap[768];
gushort rgb;
glong rowstride, channels;
gint i, j, cur_progress, max_progress;
GimpImageBaseType base_type;
GimpImageType image_type;
if (! (compression == BI_RGB ||
(bpp == 8 && compression == BI_RLE8) ||
@ -438,31 +440,44 @@ ReadImage (FILE *fd,
/* Make a new image in the gimp */
if (bpp >= 16)
switch (bpp)
{
image = gimp_image_new (width, height, GIMP_RGB);
layer = gimp_layer_new (image, _("Background"),
width, height,
GIMP_RGB_IMAGE, 100, GIMP_NORMAL_MODE);
case 32:
case 24:
case 16:
base_type = GIMP_RGB;
image_type = GIMP_RGB_IMAGE;
channels = 3;
}
else if (grey)
{
image = gimp_image_new (width, height, GIMP_GRAY);
layer = gimp_layer_new (image, _("Background"),
width, height,
GIMP_GRAY_IMAGE, 100, GIMP_NORMAL_MODE);
channels = 1;
}
else
{
image = gimp_image_new (width, height, GIMP_INDEXED);
layer = gimp_layer_new (image, _("Background"),
width, height,
GIMP_INDEXED_IMAGE, 100, GIMP_NORMAL_MODE);
break;
case 8:
case 4:
case 1:
if (grey)
{
base_type = GIMP_GRAY;
image_type = GIMP_RGB_IMAGE;
}
else
{
base_type = GIMP_INDEXED;
image_type = GIMP_INDEXED_IMAGE;
}
channels = 1;
break;
default:
g_message (_("Unrecognized or invalid BMP compression format."));
return -1;
}
image = gimp_image_new (width, height, base_type);
layer = gimp_layer_new (image, _("Background"),
width, height,
image_type, 100, GIMP_NORMAL_MODE);
gimp_image_set_filename (image, filename);
gimp_image_add_layer (image, layer, 0);