gdk-pixbuf/test-loaders.c (test_loader): Catch errors at close time.

gdk-pixbuf/test-loaders.c (main): Remove C++ comments.
demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
only in response to an area_prepared signal.

diff --git a/ChangeLog b/ChangeLog
index 082ed119c4a08a8e9d47dc1357e67e790ec6fa77..253b9e223fb60cdc89f4545b0f69061b2b0cab8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
+       only in response to an area_prepared signal.
+
 2001-08-28  Alex Larsson  <alexl@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 082ed119c4a08a8e9d47dc1357e67e790ec6fa77..253b9e223fb60cdc89f4545b0f69061b2b0cab8e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
+       only in response to an area_prepared signal.
+
 2001-08-28  Alex Larsson  <alexl@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 082ed119c4a08a8e9d47dc1357e67e790ec6fa77..253b9e223fb60cdc89f4545b0f69061b2b0cab8e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
+       only in response to an area_prepared signal.
+
 2001-08-28  Alex Larsson  <alexl@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 082ed119c4a08a8e9d47dc1357e67e790ec6fa77..253b9e223fb60cdc89f4545b0f69061b2b0cab8e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
+       only in response to an area_prepared signal.
+
 2001-08-28  Alex Larsson  <alexl@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 082ed119c4a08a8e9d47dc1357e67e790ec6fa77..253b9e223fb60cdc89f4545b0f69061b2b0cab8e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
+       only in response to an area_prepared signal.
+
 2001-08-28  Alex Larsson  <alexl@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 082ed119c4a08a8e9d47dc1357e67e790ec6fa77..253b9e223fb60cdc89f4545b0f69061b2b0cab8e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
+       only in response to an area_prepared signal.
+
 2001-08-28  Alex Larsson  <alexl@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 082ed119c4a08a8e9d47dc1357e67e790ec6fa77..253b9e223fb60cdc89f4545b0f69061b2b0cab8e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf
+       only in response to an area_prepared signal.
+
 2001-08-28  Alex Larsson  <alexl@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_class_init):

diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index a61491fdde22f64d6f9a0f35771bc1f5b7be0548..c1d55b64df2a9e40d92ab6a054de7a15f0900434 100644 (file)
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -449,19 +449,15 @@ update_timeout(gpointer data)
                 }
                         
                         
-        } else { /* Really done */ 
-
-                GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (status->loader); 
-                new_testrgb_window (pixbuf, "After progressive load"); 
-                done = TRUE; 
-
-        }
-
+        } 
+       else 
+         done = TRUE;
+         
        if (done) {
-                gtk_widget_queue_draw(*status->rgbwin);
                 /* ignoring errors, we should not do that. */
                gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL);
-               g_object_unref (G_OBJECT(status->loader));
+               gtk_widget_queue_draw (*status->rgbwin);
+               g_object_unref (G_OBJECT (status->loader));
                fclose (status->imagefile);
                g_free (status->buf);
        }

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index e36719def0ab348c04e0bcf2f21c414c663d2a95..bc6b35981de3c589ae0b7a83288e80259753cbb7 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,9 +1,16 @@
-2001-08-21  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+Tue Aug 28 20:10:31 2001  Matthias Clasen  <matthiasc@poet.de>
+
+Tue Aug 28 20:03:43 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * test-loaders.c (test_loader): Catch errors at close time. 
+       * test-loaders.c (main): Remove C++ comments. 
+
+2001-08-21  Matthias Clasen  <matthiasc@poet.de>
 
        * Makefile.am, gdk-pixbuf-io.c, pixbufloader_tga.def, 
        io-tga.c: Add tga loader, patch by Nicola Girardi. (#56067)
 
-2001-08-20  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+2001-08-20  Matthias Clasen  <matthiasc@poet.de>
 
        * test-images.h, test-loaders.c: Add ico and wbmp tests.
        * io-jpeg.c (gdk_pixbuf__jpeg_image_save): Fail with a suitable

diff --git a/gdk-pixbuf/test-loaders.c b/gdk-pixbuf/test-loaders.c
index 12385b23ab33ed69112791f0fe45facecf93a8cb..f0b14a89a67d0e0930ee9d08762df64a2ea75208 100644 (file)
--- a/gdk-pixbuf/test-loaders.c
+++ b/gdk-pixbuf/test-loaders.c
@@ -148,7 +148,7 @@ test_loader (const guchar *bytes, gsize len, gboolean data_is_ok)
       err = NULL;
       did_fail = TRUE;
     }
-  gdk_pixbuf_loader_close (loader, NULL);
+  gdk_pixbuf_loader_close (loader, &err);
   if (err)
     {
       g_error_free (err);
@@ -404,8 +404,8 @@ main (int argc, char **argv)
   TEST (tiff1_test_1, FALSE);   
 
 #if 0
-  TEST_RANDOMLY_MODIFIED (valid_gif_test, FALSE);   //  these all break more or
-  TEST_RANDOMLY_MODIFIED (valid_png_test, FALSE);   // less spectacularly, patched or not
+  TEST_RANDOMLY_MODIFIED (valid_gif_test, FALSE);   /*  these all break more or */
+  TEST_RANDOMLY_MODIFIED (valid_png_test, FALSE);   /* less spectacularly, patched or not */
   TEST_RANDOMLY_MODIFIED (valid_tiff1_test, FALSE);
 #endif
 
@@ -416,7 +416,7 @@ main (int argc, char **argv)
                                                     * the wbmp loader is broken
                                                     */
 #endif
-  TEST_RANDOMLY_MODIFIED (valid_jpeg_test, FALSE);  // The jpeg loader does not break
+  TEST_RANDOMLY_MODIFIED (valid_jpeg_test, FALSE);  /* The jpeg loader does not break */
 
 #if 0
   TEST_RANDOM (GIF_HEADER, 150, FALSE);