AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

fix included modules case.

Browse Source 
2001-01-26  Havoc Pennington  <hp@redhat.com>

	* gdk-pixbuf-io.c (mname): fix included modules case.
This commit is contained in:
Havoc Pennington 2001-01-26 18:50:58 +00:00 committed by Havoc Pennington
parent 9234d91146
commit d3f92415e6
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,12 @@
2001-01-26 Havoc Pennington <hp@redhat.com>
* gdk-pixbuf-io.c (mname): fix included modules case.
2001-01-22 Havoc Pennington <hp@redhat.com>
* gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): check errors
from gdk_pixbuf_load_module
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support

14
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -322,7 +322,7 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
}
#else
#define mname(type,fn) gdk_pixbuf__ ## type ## _image_ ##fn
#define mname(type,fn) gdk_pixbuf__ ## type ## _ ##fn
#define m_fill_vtable(type) extern void mname(type,fill_vtable) (GdkPixbufModule *module)
m_fill_vtable (png);
@ -602,10 +602,16 @@ gdk_pixbuf_new_from_xpm_data (const char **data)
{
GdkPixbuf *(* load_xpm_data) (const char **data);
GdkPixbuf *pixbuf;
GError *error = NULL;
if (file_formats[XPM_FILE_FORMAT_INDEX].module == NULL)
gdk_pixbuf_load_module (&file_formats[XPM_FILE_FORMAT_INDEX], NULL);
if (file_formats[XPM_FILE_FORMAT_INDEX].module == NULL) {
if (!gdk_pixbuf_load_module (&file_formats[XPM_FILE_FORMAT_INDEX], &error)) {
g_warning ("Error loading XPM image loader: %s", error->message);
g_error_free (error);
return FALSE;
}
}
if (file_formats[XPM_FILE_FORMAT_INDEX].module == NULL) {
g_warning ("Can't find gdk-pixbuf module for parsing inline XPM data");
return NULL;