Set the initial ref_count to 1.

1999-09-17  Federico Mena Quintero  <federico@redhat.com>

	* src/io-bmp.c (image_load): Set the initial ref_count to 1.

	* src/io-gif.c (image_load): Likewise.

	* src/io-jpeg.c (image_load): Likewise.

	* src/io-png.c (image_load): Likewise.

	* src/io-tiff.c (image_load): Likewise.

	* src/io-xpm.c (_pixbuf_create_from_xpm): Likewise.

	* src/gdk-pixbuf-io.c (gdk_pixbuf_load_image): Added an assertion
	for the ref_count to be != 0.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 9386fa3c570149465777f8e35d1d9c083c463d46..a7c48604c6ef4b8fb49d26cb3adc363bef29e358 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,20 @@
 1999-09-17  Federico Mena Quintero  <federico@redhat.com>
 
+       * src/io-bmp.c (image_load): Set the initial ref_count to 1.
+
+       * src/io-gif.c (image_load): Likewise.
+
+       * src/io-jpeg.c (image_load): Likewise.
+
+       * src/io-png.c (image_load): Likewise.
+
+       * src/io-tiff.c (image_load): Likewise.
+
+       * src/io-xpm.c (_pixbuf_create_from_xpm): Likewise.
+
+       * src/gdk-pixbuf-io.c (gdk_pixbuf_load_image): Added an assertion
+       for the ref_count to be != 0.
+
        * src/gdk-pixbuf.c (gdk_pixbuf_ref): Be more paranoid with sanity
        checking.
        (gdk_pixbuf_unref): Fix incorrect sanity check and comparison.

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 7b644000eba05dc65c710cf72d0323771f0dbf25..72d611dbddaf234541c2fcc88199b0a7b8232207 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -194,6 +194,7 @@ gdk_pixbuf_load_image (const char *file)
                        fseek(f, 0, SEEK_SET);
                        pixbuf = (*file_formats [i].load)(f);
                        fclose (f);
+                       g_assert (pixbuf->ref_count != 0);
                        return pixbuf;
                }
        }

diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index 61955995488b4b414fa0f68401e844be5310ffac..503747bcb1bb287f7df098d9c6f96091e981786d 100644 (file)
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -47,7 +47,7 @@ GdkPixBuf *image_load(FILE * f)
     /* Ok, I'm anal...shoot me */
     if (!(pixbuf->art_pixbuf))
        return NULL;
-    pixbuf->ref_count = 0;
+    pixbuf->ref_count = 1;
     pixbuf->unref_func = NULL;
 
     return pixbuf;

diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 926964f39d625c3f962ea2a7f1401649d6c2bf4a..2fb964b66a798577c84c8f3ea7039b5dfe13cfe3 100644 (file)
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -174,7 +174,7 @@ GdkPixBuf *image_load(FILE * f)
        return NULL;
     }
 
-    pixbuf->ref_count = 0;
+    pixbuf->ref_count = 1;
     pixbuf->unref_func = NULL;
 
     return pixbuf;

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 8e2a830bdde715955ab61f6fdcf3b54f0c6e46fd..afe5baee829506cedb7002d0a1981aa1af8e5cfd 100644 (file)
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -121,7 +121,7 @@ GdkPixBuf *image_load(FILE *f)
                g_free(pixbuf);
                return NULL;
        }
-       pixbuf->ref_count = 0;
+       pixbuf->ref_count = 1;
        pixbuf->unref_func = NULL;
 
        return pixbuf;

diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 9746ed21c79fb4e16f922abffd12608381ffd00f..1f86600f544f457024d082d9c05776efe6cf462b 100644 (file)
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -158,7 +158,7 @@ GdkPixBuf *image_load(FILE * f)
        return NULL;
     }
 
-    pixbuf->ref_count = 0;
+    pixbuf->ref_count = 1;
     pixbuf->unref_func = NULL;
 
     return pixbuf;

diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 771a05267442f7824a9f66236b8a8a38ab02394c..dffe9ef2572450bd5205f176f7a1ed64b5860778 100644 (file)
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -94,7 +94,7 @@ GdkPixBuf *image_load(FILE * f)
     /* Ok, I'm anal...shoot me */
     if (!(pixbuf->art_pixbuf))
        return NULL;
-    pixbuf->ref_count = 0;
+    pixbuf->ref_count = 1;
     pixbuf->unref_func = NULL;
 
     return pixbuf;

diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index b97fca2f110c3ab79674430dbe3f3647d4b7af64..db78f1d9310aead5c8fe25414b6c5185146703b1 100644 (file)
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -417,7 +417,7 @@ static GdkPixBuf *
         return NULL;
     }
 
-    pixbuf->ref_count = 0;
+    pixbuf->ref_count = 1;
     pixbuf->unref_func = NULL;
 
     return pixbuf;