changeset 1559:597ed9e9979c

Fix up few warnings (especially on 64bits platforms).
author zas_
date Tue, 21 Apr 2009 21:47:11 +0000
parents e6da3a90e7b2
children dd0a89cdb021
files src/image-load.c src/image-load.h src/utilops.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/image-load.c	Tue Apr 21 21:16:32 2009 +0000
+++ b/src/image-load.c	Tue Apr 21 21:47:11 2009 +0000
@@ -96,7 +96,7 @@
 	il->data_mutex = g_mutex_new();
 	il->can_destroy_cond = g_cond_new();
 #endif
-	DEBUG_1("new image loader %p, bufsize=%u idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
+	DEBUG_1("new image loader %p, bufsize=%" G_GSIZE_FORMAT " idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
 }
 
 static void image_loader_class_init(ImageLoaderClass *class)
@@ -160,7 +160,7 @@
 
 	if (il->error) DEBUG_1("%s", image_loader_get_error(il));
 
-	DEBUG_1("freeing image loader %p bytes_read=%d", il, il->bytes_read);
+	DEBUG_1("freeing image loader %p bytes_read=%" G_GSIZE_FORMAT, il, il->bytes_read);
 
 	if (il->idle_done_id)
 		{
@@ -619,9 +619,9 @@
 		ExifData *exif = exif_read_fd(il->fd);
 
 		if (options->thumbnails.use_exif)
-			il->mapped_file = exif_get_preview(exif, &il->bytes_total, il->requested_width, il->requested_height);
+			il->mapped_file = exif_get_preview(exif, (guint *)&il->bytes_total, il->requested_width, il->requested_height);
 		else
-			il->mapped_file = exif_get_preview(exif, &il->bytes_total, 0, 0); /* get the largest available preview image or NULL for normal images*/
+			il->mapped_file = exif_get_preview(exif, (guint *)&il->bytes_total, 0, 0); /* get the largest available preview image or NULL for normal images*/
 
 		if (il->mapped_file)
 			{
--- a/src/image-load.h	Tue Apr 21 21:16:32 2009 +0000
+++ b/src/image-load.h	Tue Apr 21 21:47:11 2009 +0000
@@ -58,7 +58,7 @@
 
 	guchar *mapped_file;
 	gsize read_buffer_size;
-	gint idle_read_loop_count;
+	guint idle_read_loop_count;
 };
 
 struct _ImageLoaderClass {
--- a/src/utilops.c	Tue Apr 21 21:16:32 2009 +0000
+++ b/src/utilops.c	Tue Apr 21 21:47:11 2009 +0000
@@ -1666,7 +1666,7 @@
 	ud->content_list = NULL;
 	ud->parent = parent;
 	
-	ud->messages.title = pgettext("physical","Delete");
+	ud->messages.title = (gchar *)pgettext("physical","Delete");
 	ud->messages.question = _("Delete files?");
 	ud->messages.desc_flist = _("This will delete the following files");
 	ud->messages.desc_source_fd = "";