Fix up few warnings (especially on 64bits platforms).
authorLaurent Monin <geeqie@norz.org>
Tue, 21 Apr 2009 21:47:11 +0000 (21:47 +0000)
committerLaurent Monin <geeqie@norz.org>
Tue, 21 Apr 2009 21:47:11 +0000 (21:47 +0000)
src/image-load.c
src/image-load.h
src/utilops.c

index 8269fd2..7d57582 100644 (file)
@@ -96,7 +96,7 @@ static void image_loader_init(GTypeInstance *instance, gpointer g_class)
        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 @@ static void image_loader_finalize(GObject *object)
 
        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 @@ static gboolean image_loader_setup_source(ImageLoader *il)
                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)
                        {
index e9efa3a..d91851e 100644 (file)
@@ -58,7 +58,7 @@ struct _ImageLoader
 
        guchar *mapped_file;
        gsize read_buffer_size;
-       gint idle_read_loop_count;
+       guint idle_read_loop_count;
 };
 
 struct _ImageLoaderClass {
index 5a4980a..710f5bf 100644 (file)
@@ -1666,7 +1666,7 @@ static void file_util_delete_full(FileData *source_fd, GList *source_list, GtkWi
        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 = "";