From 2633a03012796946a7af70bb89ade4948975f0eb Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Fri, 9 Jul 2004 22:40:37 +0000 Subject: [PATCH] function doesn't return a value, so don't use g_return_val_if_fail() Fri Jul 9 15:38:06 2004 Manish Singh * 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. --- gdk-pixbuf/ChangeLog | 11 +++++++++++ gdk-pixbuf/gdk-pixbuf-io.c | 2 +- gdk-pixbuf/gdk-pixbuf-scale.c | 1 + gdk-pixbuf/io-tiff.c | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index dcc570264c..8c2915aede 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,14 @@ +Fri Jul 9 15:38:06 2004 Manish Singh + + * 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 * gdk-pixbuf-io.h: diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index c6a3ea1a2c..809df09ebb 100644 --- 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 b81aeb1a68..041bd254e4 100644 --- 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 72c50fc61f..9beb045b01 100644 --- 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)