callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try again to make gdk_pixbuf_get_file_info work for tiff images

Browse Source 
svn path=/trunk/; revision=18384
This commit is contained in:
Matthias Clasen
2007-07-05 20:16:59 +00:00
parent f4f7a0a186
commit d2c4ba3639
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,9 @@
2007-07-05 Matthias Clasen <mclasen@redhat.com>
* io-tiff.c: Revert the last change, it was wrong
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Redo the last
change in a different way.
2007-07-04 Tor Lillqvist <tml@novell.com> 2007-07-04 Tor Lillqvist <tml@novell.com>
* pixops/Makefile.am (timescale_LDADD): Use GDK_PIXBUF_DEP_LIBS * pixops/Makefile.am (timescale_LDADD): Use GDK_PIXBUF_DEP_LIBS

8
gdk-pixbuf/gdk-pixbuf-loader.c
View File

@ -723,8 +723,12 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
GError *tmp = NULL; GError *tmp = NULL;
if (!priv->image_module->stop_load (priv->context, &tmp) || tmp) if (!priv->image_module->stop_load (priv->context, &tmp) || tmp)
{ {
gdk_pixbuf_loader_ensure_error (loader, &tmp); /* don't call gdk_pixbuf_loader_ensure_error()
g_propagate_error (error, tmp); * here, since we might not get an error in the
* gdk_pixbuf_get_file_info() case
*/
if (tmp)
g_propagate_error (error, tmp);
retval = FALSE; retval = FALSE;
} }
} }

7
gdk-pixbuf/io-tiff.c
View File

@ -199,13 +199,8 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
gint h = height; gint h = height;
(* context->size_func) (&w, &h, context->user_data); (* context->size_func) (&w, &h, context->user_data);
if (w == 0 || h == 0) { if (w == 0 || h == 0)
g_set_error (error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
_("Width or height of TIFF image is zero"));
return NULL; return NULL;
}
} }
pixels = g_try_malloc (bytes); pixels = g_try_malloc (bytes);