comparison src/image-load.c @ 1559:597ed9e9979c

Fix up few warnings (especially on 64bits platforms).
author zas_
date Tue, 21 Apr 2009 21:47:11 +0000
parents 6026466313b2
children 566abe50976d
comparison
equal deleted inserted replaced
1558:e6da3a90e7b2 1559:597ed9e9979c
94 94
95 #ifdef HAVE_GTHREAD 95 #ifdef HAVE_GTHREAD
96 il->data_mutex = g_mutex_new(); 96 il->data_mutex = g_mutex_new();
97 il->can_destroy_cond = g_cond_new(); 97 il->can_destroy_cond = g_cond_new();
98 #endif 98 #endif
99 DEBUG_1("new image loader %p, bufsize=%u idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count); 99 DEBUG_1("new image loader %p, bufsize=%" G_GSIZE_FORMAT " idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
100 } 100 }
101 101
102 static void image_loader_class_init(ImageLoaderClass *class) 102 static void image_loader_class_init(ImageLoaderClass *class)
103 { 103 {
104 GObjectClass *gobject_class = G_OBJECT_CLASS (class); 104 GObjectClass *gobject_class = G_OBJECT_CLASS (class);
158 158
159 image_loader_stop(il); 159 image_loader_stop(il);
160 160
161 if (il->error) DEBUG_1("%s", image_loader_get_error(il)); 161 if (il->error) DEBUG_1("%s", image_loader_get_error(il));
162 162
163 DEBUG_1("freeing image loader %p bytes_read=%d", il, il->bytes_read); 163 DEBUG_1("freeing image loader %p bytes_read=%" G_GSIZE_FORMAT, il, il->bytes_read);
164 164
165 if (il->idle_done_id) 165 if (il->idle_done_id)
166 { 166 {
167 g_source_remove(il->idle_done_id); 167 g_source_remove(il->idle_done_id);
168 il->idle_done_id = 0; 168 il->idle_done_id = 0;
617 if (il->fd) 617 if (il->fd)
618 { 618 {
619 ExifData *exif = exif_read_fd(il->fd); 619 ExifData *exif = exif_read_fd(il->fd);
620 620
621 if (options->thumbnails.use_exif) 621 if (options->thumbnails.use_exif)
622 il->mapped_file = exif_get_preview(exif, &il->bytes_total, il->requested_width, il->requested_height); 622 il->mapped_file = exif_get_preview(exif, (guint *)&il->bytes_total, il->requested_width, il->requested_height);
623 else 623 else
624 il->mapped_file = exif_get_preview(exif, &il->bytes_total, 0, 0); /* get the largest available preview image or NULL for normal images*/ 624 il->mapped_file = exif_get_preview(exif, (guint *)&il->bytes_total, 0, 0); /* get the largest available preview image or NULL for normal images*/
625 625
626 if (il->mapped_file) 626 if (il->mapped_file)
627 { 627 {
628 il->preview = TRUE; 628 il->preview = TRUE;
629 DEBUG_1("Usable reduced size (preview) image loaded from file %s", il->fd->path); 629 DEBUG_1("Usable reduced size (preview) image loaded from file %s", il->fd->path);