function doesn't return a value, so don't use g_return_val_if_fail()

Fri Jul  9 15:38:06 2004  Manish Singh  <yosh@gimp.org>

        * gdk-pixbuf-io.c (gdk_pixbuf_format_set_disabled): function doesn't
        return a value, so don't use g_return_val_if_fail()

        * gdk-pixbuf-scale.c (gdk_pixbuf_rotate_simple): initialize dest in
        the can't happen case, to quiet gcc.

        * io-tiff.c (tifflibversion): enclose in #if TIFFLIB_VERSION >=
        20031226.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index dcc570264c3ea180c4db21a48ae7d41fb411d4d1..8c2915aedee740f0f6cebb5490d035dd00bb7540 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,14 @@
+Fri Jul  9 15:38:06 2004  Manish Singh  <yosh@gimp.org>
+
+       * gdk-pixbuf-io.c (gdk_pixbuf_format_set_disabled): function doesn't
+       return a value, so don't use g_return_val_if_fail()
+
+       * gdk-pixbuf-scale.c (gdk_pixbuf_rotate_simple): initialize dest in
+       the can't happen case, to quiet gcc.
+
+       * io-tiff.c (tifflibversion): enclose in #if TIFFLIB_VERSION >=
+       20031226.
+
 Wed Jul  7 23:53:58 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk-pixbuf-io.h: 

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index c6a3ea1a2c013d410bdcbac08c88a832e4c21975..809df09ebb75b4e2321dfa183c5e702e85a4d911 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -1886,7 +1886,7 @@ void
 gdk_pixbuf_format_set_disabled (GdkPixbufFormat *format,
                                gboolean         disabled)
 {
-       g_return_val_if_fail (format != NULL, FALSE);
+       g_return_if_fail (format != NULL);
        
        format->disabled = disabled != FALSE;
 }

diff --git a/gdk-pixbuf/gdk-pixbuf-scale.c b/gdk-pixbuf/gdk-pixbuf-scale.c
index b81aeb1a68e445b0c364cb2fd70453830b7c23b4..041bd254e45e58d2a69eebdce6e963f795cb9451 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-scale.c
+++ b/gdk-pixbuf/gdk-pixbuf-scale.c
@@ -392,6 +392,7 @@ gdk_pixbuf_rotate_simple (const GdkPixbuf   *src,
        } 
       break;
     default:
+      dest = NULL;
       g_warning ("gdk_pixbuf_rotate_simple() can only rotate "
                 "by multiples of 90 degrees");
       g_assert_not_reached ();

diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 72c50fc61f9073c6d641c03fec430e40c0a486d6..9beb045b015d59b1d737af38c1878369155a2d0a 100644 (file)
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -145,6 +145,7 @@ static void free_buffer (guchar *pixels, gpointer data)
        g_free (pixels);
 }
 
+#if TIFFLIB_VERSION >= 20031226
 static gboolean tifflibversion (int *major, int *minor, int *revision)
 {
         if (sscanf (TIFFGetVersion(), 
@@ -154,6 +155,7 @@ static gboolean tifflibversion (int *major, int *minor, int *revision)
 
         return TRUE;
 }
+#endif
 
 static GdkPixbuf *
 tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)