From 7a4c68938789206bfec3c6d15cc4bb922daf6443 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 18 Oct 2000 18:42:54 +0000 Subject: Some updates 2000-10-18 Havoc Pennington * gtk/gtk-sections.txt: Some updates * gdk/gdk-sections.txt: remove GdkPixbufAlphaMode * gdk-pixbuf/gdk-pixbuf-sections.txt: Add new API, remove GdkPixbufClass/GdkAnimationClass since those are private * gdk-pixbuf/Makefile.am (IGNORE_HFILES): ignore more headers 2000-10-18 Havoc Pennington * gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug where any number of empty lines would get skipped * gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the edge. * gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the warning about invalid iterators (explain more thoroughly) (gtk_text_iter_in_region): rename gtk_text_iter_in_range * gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less big * demos/*.c: Add error handling * gtk/gtktextbuffer.c: don't modify const iterators * gtk/gdk-pixbuf-loader.c: Add full error handling here * gtk/gtkimage.c (gtk_image_set_from_file): ignore errors on file load * gtk/gtkiconfactory.c: Update to reflect addition of error handling to gdk-pixbuf loaders 2000-10-16 Havoc Pennington * gdk-pixbuf-io.c (gdk_pixbuf_get_module) (gdk_pixbuf_get_named_module) (gdk_pixbuf_load_module): add error reporting here also * make-inline-pixbuf.c (main): use GError * io-xpm.c: include unistd.h * gdk-pixbuf-util.c: include string.h * io-*.c: add error reporting * gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file): add error reporting * gdk-pixbuf-io.c (gdk_pixbuf_new_from_file): Add error reporting * gdk-pixbuf-io.h: Add GError** to load_increment and load methods * gdk-pixbuf-io.c (gdk_pixbuf_save) (gdk_pixbuf_savev): return a G_FILE_ERROR if we fail to write or close the file. * gdk-pixbuf.h: remove GDK_PIXBUF_ERROR_IO, instead we'll use G_FILE_ERROR_*. Rename enum to GdkPixbufError, properly following the GError naming rules. Add GError** to load functions. --- demos/testpixbuf.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'demos/testpixbuf.c') diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c index f118205e21..fac01f6b87 100644 --- a/demos/testpixbuf.c +++ b/demos/testpixbuf.c @@ -428,22 +428,27 @@ static gint update_timeout(gpointer data) { ProgressFileStatus *status = data; - gboolean done, error; + gboolean done; + GError *error; done = FALSE; error = FALSE; if (!feof(status->imagefile)) { gint nbytes; - + nbytes = fread(status->buf, 1, status->readlen, status->imagefile); - error = !gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes); - if (error) { - G_BREAKPOINT(); + error = NULL; + if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) { + g_warning ("Error writing to loader: %s", + error->message); + g_error_free (error); + done = TRUE; } - + + } else { /* Really done */ GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (status->loader); @@ -452,11 +457,6 @@ update_timeout(gpointer data) } - if (error) { - g_warning ("Serious error writing to loader"); - done = TRUE; - } - if (done) { gtk_widget_queue_draw(*status->rgbwin); gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader)); @@ -556,17 +556,26 @@ main (int argc, char **argv) } /* Test loading from inline data. */ - pixbuf = gdk_pixbuf_new_from_inline (apple_red, FALSE, -1); + pixbuf = gdk_pixbuf_new_from_inline (apple_red, FALSE, -1, NULL); new_testrgb_window (pixbuf, "Red apple from inline data"); - pixbuf = gdk_pixbuf_new_from_inline (gnome_foot, TRUE, sizeof (gnome_foot)); + pixbuf = gdk_pixbuf_new_from_inline (gnome_foot, TRUE, sizeof (gnome_foot), NULL); new_testrgb_window (pixbuf, "Foot from inline data"); found_valid = TRUE; } else { for (i = 1; i < argc; i++) { + GError *error; + + error = NULL; + pixbuf = gdk_pixbuf_new_from_file (argv[i], &error); - pixbuf = gdk_pixbuf_new_from_file (argv[i]); + if (pixbuf == NULL) { + g_warning ("Error loading image: %s", + error->message); + g_error_free (error); + } + #if 0 pixbuf = gdk_pixbuf_rotate(pixbuf, 10.0); #endif -- cgit v1.2.1