diff options
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 11 | ||||
| -rw-r--r-- | gdk-pixbuf/io-jpeg.c | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 984a896d8b..9517c7492f 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,12 @@ +Sun Feb 8 01:07:20 2004 Manish Singh <yosh@gimp.org> + + * gdk-pixbuf-io.c: removed unnecessary G_OBJECT() cast checks. + + * io-jpeg.c: make the return type for to_callback_empty_output_buffer + "boolean", which should be defined by the jpeg headers. The right + return type for this function depends on how the jpeg library + was built (one wonders what happens if different compilers are used). + 2004-01-28 Hans Breuer <hans@breuer.org> * gdk_pixbuf.def : updated externals diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 11abe65dbe..4ec06195b9 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -884,7 +884,7 @@ gdk_pixbuf_new_from_file_at_size (const char *filename, if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) { gdk_pixbuf_loader_close (loader, NULL); fclose (f); - g_object_unref (G_OBJECT (loader)); + g_object_unref (loader); return NULL; } } @@ -892,14 +892,14 @@ gdk_pixbuf_new_from_file_at_size (const char *filename, fclose (f); if (!gdk_pixbuf_loader_close (loader, error)) { - g_object_unref (G_OBJECT (loader)); + g_object_unref (loader); return NULL; } pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (!pixbuf) { - g_object_unref (G_OBJECT (loader)); + g_object_unref (loader); g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, @@ -910,7 +910,7 @@ gdk_pixbuf_new_from_file_at_size (const char *filename, g_object_ref (pixbuf); - g_object_unref (G_OBJECT (loader)); + g_object_unref (loader); return pixbuf; } @@ -956,7 +956,6 @@ gdk_pixbuf_get_file_info (const gchar *filename, gint *height) { GdkPixbufLoader *loader; - GError *temp = NULL; guchar buffer [4096]; int length; FILE *f; @@ -992,7 +991,7 @@ gdk_pixbuf_get_file_info (const gchar *filename, fclose (f); gdk_pixbuf_loader_close (loader, NULL); - g_object_unref (G_OBJECT (loader)); + g_object_unref (loader); if (width) *width = info.width; diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c index 4dd5f8f2a5..82acc7d139 100644 --- a/gdk-pixbuf/io-jpeg.c +++ b/gdk-pixbuf/io-jpeg.c @@ -829,7 +829,7 @@ to_callback_do_write (j_compress_ptr cinfo, gsize length) } } -static guchar +static boolean to_callback_empty_output_buffer (j_compress_ptr cinfo) { ToFunctionDestinationManager *destmgr; |