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

Bug 586851 – Transparent BMP files fail to load 

If everything else fails, use gdk_pixbuf_new_from_file().
This commit is contained in:
Massimo Valentini 2009-07-22 18:17:00 +02:00 committed by Martin Nordholts
parent 4572cb9e74
commit 61db48ac74
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,10 @@
#include <string.h> #include <string.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgimp/gimp.h> #include <libgimp/gimp.h>
#include <libgimp/gimppixbuf.h>
#include "bmp.h" #include "bmp.h"
@ -366,10 +368,35 @@ ReadBMP (const gchar *name,
} }
else else
{ {
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
_("Error reading BMP file header from '%s'"),
gimp_filename_to_utf8 (filename)); if (pixbuf)
return -1; {
gint32 layer_ID;
image_ID = gimp_image_new (gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf),
GIMP_RGB);
layer_ID = gimp_layer_new_from_pixbuf (image_ID, _("Background"),
pixbuf,
100.,
GIMP_NORMAL_MODE, 0, 0);
g_object_unref (pixbuf);
gimp_image_set_filename (image_ID, filename);
gimp_image_add_layer (image_ID, layer_ID, -1);
return image_ID;
}
else
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Error reading BMP file header from '%s'"),
gimp_filename_to_utf8 (filename));
return -1;
}
} }
/* Valid bitpdepthis 1, 4, 8, 16, 24, 32 */ /* Valid bitpdepthis 1, 4, 8, 16, 24, 32 */