From 85a8bdb1fc529b16201d4bbcd181e2ae3f58bbcc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 16 May 2002 19:11:43 +0000 Subject: Fixes for #78258 Thu May 16 14:51:14 2002 Owen Taylor Fixes for #78258 * gtk/gtkrbtree.c demos/gtk-demo/editable-cells.c: Fix some 64-bit warning problems. (Patch from Matthias Clasen.) * gtk/gtkrbtree.c (_gtk_rbtree_debug_spew_helper): Surround a bunch of debug code with G_ENABLE_DEBUG. * configure.in demos/gtk-demo/main.c: Replace #ifndef G_OS_WIN32 with proper #ifdef HAVE_FLOCKFILE. --- gdk-pixbuf/gdk-pixdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdk-pixbuf/gdk-pixdata.c') diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c index eaff61d28c..2320571e20 100644 --- a/gdk-pixbuf/gdk-pixdata.c +++ b/gdk-pixbuf/gdk-pixdata.c @@ -707,9 +707,9 @@ gdk_pixdata_to_csource (GdkPixdata *pixdata, cdata.static_prefix, cdata.const_prefix, name); APPEND (gstring, " 0x%x, /* Pixbuf magic: 'GdkP' */\n", GDK_PIXBUF_MAGIC_NUMBER); - APPEND (gstring, " %u + %u, /* header length + pixel_data length */\n", + APPEND (gstring, " %u + %lu, /* header length + pixel_data length */\n", GDK_PIXDATA_HEADER_LENGTH, - rle_encoded ? img_buffer_end - img_buffer : rowstride * height); + rle_encoded ? (glong)(img_buffer_end - img_buffer) : (glong)rowstride * height); APPEND (gstring, " 0x%x, /* pixdata_type */\n", pixdata->pixdata_type); APPEND (gstring, " %u, /* rowstride */\n", -- cgit v1.2.1