Mercurial > geeqie.yaz
annotate src/image-load.c @ 1438:9141908e0609
fixed possible deadlock with multiple thumb loaders in parallel
author | nadvornik |
---|---|
date | Sun, 15 Mar 2009 09:06:13 +0000 |
parents | b4ad1d201279 |
children | 2c54f3f71634 |
rev | line source |
---|---|
9 | 1 /* |
196 | 2 * Geeqie |
9 | 3 * (C) 2004 John Ellis |
1284 | 4 * Copyright (C) 2008 - 2009 The Geeqie Team |
9 | 5 * |
6 * Author: John Ellis | |
7 * | |
8 * This software is released under the GNU General Public License (GNU GPL). | |
9 * Please read the included file COPYING for more information. | |
10 * This software comes with no warranty of any kind, use at your own risk! | |
11 */ | |
12 | |
13 | |
281 | 14 #include "main.h" |
9 | 15 #include "image-load.h" |
507 | 16 |
17 #include "exif.h" | |
586 | 18 #include "filedata.h" |
9 | 19 #include "ui_fileops.h" |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
20 #include "gq-marshal.h" |
9 | 21 |
22 #include <fcntl.h> | |
1008 | 23 #include <sys/mman.h> |
9 | 24 |
1014 | 25 |
26 /**************************************************************************************/ | |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
27 /* image loader class */ |
1014 | 28 |
29 | |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
30 enum { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
31 SIGNAL_AREA_READY = 0, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
32 SIGNAL_ERROR, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
33 SIGNAL_DONE, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
34 SIGNAL_PERCENT, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
35 SIGNAL_COUNT |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
36 }; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
37 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
38 static guint signals[SIGNAL_COUNT] = { 0 }; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
39 |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
40 static void image_loader_init(GTypeInstance *instance, gpointer g_class); |
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
41 static void image_loader_class_init(ImageLoaderClass *class); |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
42 static void image_loader_finalize(GObject *object); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
43 static void image_loader_stop(ImageLoader *il); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
44 |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
45 GType image_loader_get_type(void) |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
46 { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
47 static GType type = 0; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
48 if (type == 0) |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
49 { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
50 static const GTypeInfo info = { |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
51 sizeof(ImageLoaderClass), |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
52 NULL, /* base_init */ |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
53 NULL, /* base_finalize */ |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
54 (GClassInitFunc)image_loader_class_init, /* class_init */ |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
55 NULL, /* class_finalize */ |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
56 NULL, /* class_data */ |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
57 sizeof(ImageLoader), |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
58 0, /* n_preallocs */ |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
59 (GInstanceInitFunc)image_loader_init, /* instance_init */ |
1016 | 60 NULL /* value_table */ |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
61 }; |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
62 type = g_type_register_static(G_TYPE_OBJECT, "ImageLoaderType", &info, 0); |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
63 } |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
64 return type; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
65 } |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
66 |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
67 static void image_loader_init(GTypeInstance *instance, gpointer g_class) |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
68 { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
69 ImageLoader *il = (ImageLoader *)instance; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
70 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
71 il->pixbuf = NULL; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
72 il->idle_id = -1; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
73 il->idle_priority = G_PRIORITY_DEFAULT_IDLE; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
74 il->done = FALSE; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
75 il->loader = NULL; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
76 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
77 il->bytes_read = 0; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
78 il->bytes_total = 0; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
79 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
80 il->idle_done_id = -1; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
81 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
82 il->idle_read_loop_count = options->image.idle_read_loop_count; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
83 il->read_buffer_size = options->image.read_buffer_size; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
84 il->mapped_file = NULL; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
85 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
86 il->requested_width = 0; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
87 il->requested_height = 0; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
88 il->shrunk = FALSE; |
1015 | 89 |
1026 | 90 il->can_destroy = TRUE; |
91 | |
1015 | 92 #ifdef HAVE_GTHREAD |
93 il->data_mutex = g_mutex_new(); | |
1021 | 94 il->can_destroy_cond = g_cond_new(); |
1015 | 95 #endif |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
96 DEBUG_1("new image loader %p, bufsize=%u idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
97 } |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
98 |
1346
c9949c19a6d0
No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents:
1284
diff
changeset
|
99 static void image_loader_class_init(ImageLoaderClass *class) |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
100 { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
101 GObjectClass *gobject_class = G_OBJECT_CLASS (class); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
102 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
103 // gobject_class->set_property = image_loader_set_property; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
104 // gobject_class->get_property = image_loader_get_property; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
105 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
106 gobject_class->finalize = image_loader_finalize; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
107 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
108 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
109 signals[SIGNAL_AREA_READY] = |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
110 g_signal_new("area_ready", |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
111 G_OBJECT_CLASS_TYPE(gobject_class), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
112 G_SIGNAL_RUN_LAST, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
113 G_STRUCT_OFFSET(ImageLoaderClass, area_ready), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
114 NULL, NULL, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
115 gq_marshal_VOID__INT_INT_INT_INT, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
116 G_TYPE_NONE, 4, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
117 G_TYPE_INT, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
118 G_TYPE_INT, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
119 G_TYPE_INT, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
120 G_TYPE_INT); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
121 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
122 signals[SIGNAL_ERROR] = |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
123 g_signal_new("error", |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
124 G_OBJECT_CLASS_TYPE(gobject_class), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
125 G_SIGNAL_RUN_LAST, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
126 G_STRUCT_OFFSET(ImageLoaderClass, error), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
127 NULL, NULL, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
128 g_cclosure_marshal_VOID__VOID, |
1026 | 129 G_TYPE_NONE, 0); |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
130 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
131 signals[SIGNAL_DONE] = |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
132 g_signal_new("done", |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
133 G_OBJECT_CLASS_TYPE(gobject_class), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
134 G_SIGNAL_RUN_LAST, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
135 G_STRUCT_OFFSET(ImageLoaderClass, done), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
136 NULL, NULL, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
137 g_cclosure_marshal_VOID__VOID, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
138 G_TYPE_NONE, 0); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
139 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
140 signals[SIGNAL_PERCENT] = |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
141 g_signal_new("percent", |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
142 G_OBJECT_CLASS_TYPE(gobject_class), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
143 G_SIGNAL_RUN_LAST, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
144 G_STRUCT_OFFSET(ImageLoaderClass, percent), |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
145 NULL, NULL, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
146 g_cclosure_marshal_VOID__DOUBLE, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
147 G_TYPE_NONE, 1, |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
148 G_TYPE_DOUBLE); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
149 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
150 } |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
151 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
152 static void image_loader_finalize(GObject *object) |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
153 { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
154 ImageLoader *il = (ImageLoader *)object; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
155 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
156 image_loader_stop(il); |
1014 | 157 |
158 DEBUG_1("freeing image loader %p bytes_read=%d", il, il->bytes_read); | |
159 | |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
160 if (il->idle_done_id != -1) g_source_remove(il->idle_done_id); |
1014 | 161 |
162 while (g_source_remove_by_user_data(il)) | |
163 { | |
164 DEBUG_1("pending signals detected"); | |
165 } | |
166 | |
167 while (il->area_param_list) | |
168 { | |
169 DEBUG_1("pending area_ready signals detected"); | |
170 while (g_source_remove_by_user_data(il->area_param_list->data)) {} | |
171 g_free(il->area_param_list->data); | |
172 il->area_param_list = g_list_delete_link(il->area_param_list, il->area_param_list); | |
173 } | |
174 | |
1045
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
175 while (il->area_param_delayed_list) |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
176 { |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
177 g_free(il->area_param_delayed_list->data); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
178 il->area_param_delayed_list = g_list_delete_link(il->area_param_delayed_list, il->area_param_delayed_list); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
179 } |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
180 |
1043 | 181 if (il->pixbuf) g_object_unref(il->pixbuf); |
182 | |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
183 file_data_unref(il->fd); |
1015 | 184 #ifdef HAVE_GTHREAD |
185 g_mutex_free(il->data_mutex); | |
1021 | 186 g_cond_free(il->can_destroy_cond); |
1015 | 187 #endif |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
188 } |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
189 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
190 void image_loader_free(ImageLoader *il) |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
191 { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
192 if (!il) return; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
193 g_object_unref(G_OBJECT(il)); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
194 } |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
195 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
196 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
197 ImageLoader *image_loader_new(FileData *fd) |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
198 { |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
199 ImageLoader *il; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
200 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
201 if (!fd) return NULL; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
202 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
203 il = (ImageLoader *) g_object_new(TYPE_IMAGE_LOADER, NULL); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
204 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
205 il->fd = file_data_ref(fd); |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
206 |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
207 return il; |
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
208 } |
9 | 209 |
1014 | 210 /**************************************************************************************/ |
211 /* send signals via idle calbacks - the callback are executed in the main thread */ | |
212 | |
213 typedef struct _ImageLoaderAreaParam ImageLoaderAreaParam; | |
214 struct _ImageLoaderAreaParam { | |
215 ImageLoader *il; | |
216 guint x; | |
217 guint y; | |
218 guint w; | |
219 guint h; | |
220 }; | |
221 | |
222 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
223 static gboolean image_loader_emit_area_ready_cb(gpointer data) |
1014 | 224 { |
225 ImageLoaderAreaParam *par = data; | |
226 ImageLoader *il = par->il; | |
227 g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, par->x, par->y, par->w, par->h); | |
1015 | 228 g_mutex_lock(il->data_mutex); |
1014 | 229 il->area_param_list = g_list_remove(il->area_param_list, par); |
230 g_free(par); | |
1015 | 231 g_mutex_unlock(il->data_mutex); |
1014 | 232 |
233 return FALSE; | |
234 } | |
235 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
236 static gboolean image_loader_emit_done_cb(gpointer data) |
1014 | 237 { |
238 ImageLoader *il = data; | |
239 g_signal_emit(il, signals[SIGNAL_DONE], 0); | |
240 return FALSE; | |
241 } | |
242 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
243 static gboolean image_loader_emit_error_cb(gpointer data) |
1014 | 244 { |
245 ImageLoader *il = data; | |
246 g_signal_emit(il, signals[SIGNAL_ERROR], 0); | |
247 return FALSE; | |
248 } | |
249 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
250 static gboolean image_loader_emit_percent_cb(gpointer data) |
1014 | 251 { |
252 ImageLoader *il = data; | |
1015 | 253 g_signal_emit(il, signals[SIGNAL_PERCENT], 0, image_loader_get_percent(il)); |
1014 | 254 return FALSE; |
255 } | |
256 | |
257 /* DONE and ERROR are emited only once, thus they can have normal priority | |
258 PERCENT and AREA_READY should be processed ASAP | |
259 */ | |
260 | |
261 static void image_loader_emit_done(ImageLoader *il) | |
262 { | |
263 g_idle_add_full(il->idle_priority, image_loader_emit_done_cb, il, NULL); | |
264 } | |
265 | |
266 static void image_loader_emit_error(ImageLoader *il) | |
267 { | |
268 g_idle_add_full(il->idle_priority, image_loader_emit_error_cb, il, NULL); | |
269 } | |
270 | |
271 static void image_loader_emit_percent(ImageLoader *il) | |
272 { | |
273 g_idle_add_full(G_PRIORITY_HIGH, image_loader_emit_percent_cb, il, NULL); | |
274 } | |
275 | |
1045
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
276 /* this function expects that il->data_mutex is locked by caller */ |
1014 | 277 static void image_loader_emit_area_ready(ImageLoader *il, guint x, guint y, guint w, guint h) |
278 { | |
279 ImageLoaderAreaParam *par = g_new0(ImageLoaderAreaParam, 1); | |
280 par->il = il; | |
281 par->x = x; | |
282 par->y = y; | |
283 par->w = w; | |
284 par->h = h; | |
285 | |
286 il->area_param_list = g_list_prepend(il->area_param_list, par); | |
1015 | 287 |
1014 | 288 g_idle_add_full(G_PRIORITY_HIGH, image_loader_emit_area_ready_cb, par, NULL); |
289 } | |
290 | |
291 /**************************************************************************************/ | |
292 /* the following functions may be executed in separate thread */ | |
293 | |
1045
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
294 /* this function expects that il->data_mutex is locked by caller */ |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
295 static void image_loader_queue_delayed_erea_ready(ImageLoader *il, guint x, guint y, guint w, guint h) |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
296 { |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
297 ImageLoaderAreaParam *par = g_new0(ImageLoaderAreaParam, 1); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
298 par->il = il; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
299 par->x = x; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
300 par->y = y; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
301 par->w = w; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
302 par->h = h; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
303 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
304 il->area_param_delayed_list = g_list_prepend(il->area_param_delayed_list, par); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
305 } |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
306 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
307 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
308 |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
309 static gboolean image_loader_get_stopping(ImageLoader *il) |
1020 | 310 { |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
311 gboolean ret; |
1020 | 312 if (!il) return FALSE; |
313 | |
314 g_mutex_lock(il->data_mutex); | |
315 ret = il->stopping; | |
316 g_mutex_unlock(il->data_mutex); | |
317 | |
318 return ret; | |
319 } | |
320 | |
1045
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
321 |
9 | 322 static void image_loader_sync_pixbuf(ImageLoader *il) |
323 { | |
324 GdkPixbuf *pb; | |
1015 | 325 |
326 g_mutex_lock(il->data_mutex); | |
327 | |
328 if (!il->loader) | |
329 { | |
330 g_mutex_unlock(il->data_mutex); | |
331 return; | |
332 } | |
9 | 333 |
334 pb = gdk_pixbuf_loader_get_pixbuf(il->loader); | |
335 | |
1015 | 336 if (pb == il->pixbuf) |
337 { | |
338 g_mutex_unlock(il->data_mutex); | |
339 return; | |
340 } | |
9 | 341 |
1043 | 342 if (il->pixbuf) g_object_unref(il->pixbuf); |
343 | |
9 | 344 il->pixbuf = pb; |
1043 | 345 if (il->pixbuf) g_object_ref(il->pixbuf); |
346 | |
1015 | 347 g_mutex_unlock(il->data_mutex); |
9 | 348 } |
349 | |
500 | 350 static void image_loader_area_updated_cb(GdkPixbufLoader *loader, |
9 | 351 guint x, guint y, guint w, guint h, |
352 gpointer data) | |
353 { | |
354 ImageLoader *il = data; | |
355 | |
1015 | 356 if (!image_loader_get_pixbuf(il)) |
9 | 357 { |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
358 image_loader_sync_pixbuf(il); |
1015 | 359 if (!image_loader_get_pixbuf(il)) |
9 | 360 { |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
361 log_printf("critical: area_ready signal with NULL pixbuf (out of mem?)\n"); |
9 | 362 } |
363 } | |
1045
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
364 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
365 g_mutex_lock(il->data_mutex); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
366 if (il->delay_area_ready) |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
367 image_loader_queue_delayed_erea_ready(il, x, y, w, h); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
368 else |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
369 image_loader_emit_area_ready(il, x, y, w, h); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
370 g_mutex_unlock(il->data_mutex); |
9 | 371 } |
372 | |
500 | 373 static void image_loader_area_prepared_cb(GdkPixbufLoader *loader, gpointer data) |
374 { | |
375 GdkPixbuf *pb; | |
376 guchar *pix; | |
377 size_t h, rs; | |
961
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
378 |
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
379 /* a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 */ |
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
380 gchar *format = gdk_pixbuf_format_get_name(gdk_pixbuf_loader_get_format(loader)); |
995 | 381 if (strcmp(format, "svg") == 0) |
961
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
382 { |
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
383 g_free(format); |
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
384 return; |
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
385 } |
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
386 |
3f03282ec40e
a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents:
890
diff
changeset
|
387 g_free(format); |
500 | 388 |
389 pb = gdk_pixbuf_loader_get_pixbuf(loader); | |
390 | |
391 h = gdk_pixbuf_get_height(pb); | |
392 rs = gdk_pixbuf_get_rowstride(pb); | |
393 pix = gdk_pixbuf_get_pixels(pb); | |
394 | |
395 memset(pix, 0, rs * h); /*this should be faster than pixbuf_fill */ | |
396 | |
397 } | |
398 | |
9 | 399 static void image_loader_size_cb(GdkPixbufLoader *loader, |
400 gint width, gint height, gpointer data) | |
401 { | |
402 ImageLoader *il = data; | |
403 GdkPixbufFormat *format; | |
404 gchar **mime_types; | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
405 gboolean scale = FALSE; |
9 | 406 gint n; |
407 | |
1015 | 408 g_mutex_lock(il->data_mutex); |
409 if (il->requested_width < 1 || il->requested_height < 1) | |
410 { | |
411 g_mutex_unlock(il->data_mutex); | |
412 return; | |
413 } | |
414 g_mutex_unlock(il->data_mutex); | |
9 | 415 |
416 format = gdk_pixbuf_loader_get_format(loader); | |
417 if (!format) return; | |
418 | |
419 mime_types = gdk_pixbuf_format_get_mime_types(format); | |
420 n = 0; | |
421 while (mime_types[n]) | |
422 { | |
423 if (strstr(mime_types[n], "jpeg")) scale = TRUE; | |
424 n++; | |
425 } | |
426 g_strfreev(mime_types); | |
442 | 427 |
9 | 428 if (!scale) return; |
429 | |
1015 | 430 g_mutex_lock(il->data_mutex); |
431 | |
9 | 432 if (width > il->requested_width || height > il->requested_height) |
433 { | |
434 gint nw, nh; | |
435 | |
436 if (((gdouble)il->requested_width / width) < ((gdouble)il->requested_height / height)) | |
437 { | |
438 nw = il->requested_width; | |
439 nh = (gdouble)nw / width * height; | |
440 if (nh < 1) nh = 1; | |
441 } | |
442 else | |
443 { | |
444 nh = il->requested_height; | |
445 nw = (gdouble)nh / height * width; | |
446 if (nw < 1) nw = 1; | |
447 } | |
442 | 448 |
9 | 449 gdk_pixbuf_loader_set_size(loader, nw, nh); |
14
25335c62cd9b
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
450 il->shrunk = TRUE; |
9 | 451 } |
1015 | 452 g_mutex_unlock(il->data_mutex); |
453 | |
9 | 454 } |
455 | |
1014 | 456 static void image_loader_stop_loader(ImageLoader *il) |
9 | 457 { |
458 if (!il) return; | |
459 | |
460 if (il->loader) | |
461 { | |
462 /* some loaders do not have a pixbuf till close, order is important here */ | |
463 gdk_pixbuf_loader_close(il->loader, NULL); | |
464 image_loader_sync_pixbuf(il); | |
465 g_object_unref(G_OBJECT(il->loader)); | |
466 il->loader = NULL; | |
467 } | |
1020 | 468 g_mutex_lock(il->data_mutex); |
9 | 469 il->done = TRUE; |
1020 | 470 g_mutex_unlock(il->data_mutex); |
9 | 471 } |
472 | |
1014 | 473 static void image_loader_setup_loader(ImageLoader *il) |
474 { | |
1015 | 475 g_mutex_lock(il->data_mutex); |
1014 | 476 il->loader = gdk_pixbuf_loader_new(); |
1015 | 477 |
1014 | 478 g_signal_connect(G_OBJECT(il->loader), "area_updated", |
479 G_CALLBACK(image_loader_area_updated_cb), il); | |
480 g_signal_connect(G_OBJECT(il->loader), "size_prepared", | |
481 G_CALLBACK(image_loader_size_cb), il); | |
482 g_signal_connect(G_OBJECT(il->loader), "area_prepared", | |
483 G_CALLBACK(image_loader_area_prepared_cb), il); | |
1020 | 484 g_mutex_unlock(il->data_mutex); |
1014 | 485 } |
486 | |
487 | |
9 | 488 static void image_loader_done(ImageLoader *il) |
489 { | |
1014 | 490 image_loader_stop_loader(il); |
9 | 491 |
1014 | 492 image_loader_emit_done(il); |
9 | 493 } |
494 | |
495 static void image_loader_error(ImageLoader *il) | |
496 { | |
1014 | 497 image_loader_stop_loader(il); |
9 | 498 |
1009
dd311dae857a
fixed thumbnail loader for the new raw preview interface
nadvornik
parents:
1008
diff
changeset
|
499 DEBUG_1("pixbuf_loader reported load error for: %s", il->fd->path); |
9 | 500 |
1014 | 501 image_loader_emit_error(il); |
9 | 502 } |
503 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
504 static gboolean image_loader_continue(ImageLoader *il) |
9 | 505 { |
506 gint b; | |
507 gint c; | |
508 | |
509 if (!il) return FALSE; | |
510 | |
413
9e521adbf312
Add two new options to control image read buffer at runtime.
zas_
parents:
281
diff
changeset
|
511 c = il->idle_read_loop_count ? il->idle_read_loop_count : 1; |
1020 | 512 while (c > 0 && !image_loader_get_stopping(il)) |
9 | 513 { |
1008 | 514 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read); |
9 | 515 |
516 if (b == 0) | |
517 { | |
518 image_loader_done(il); | |
519 return FALSE; | |
520 } | |
521 | |
1008 | 522 if (b < 0 || (b > 0 && !gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, NULL))) |
9 | 523 { |
524 image_loader_error(il); | |
525 return FALSE; | |
526 } | |
527 | |
528 il->bytes_read += b; | |
529 | |
530 c--; | |
531 } | |
532 | |
1012
fe82830ab8fd
converted image loader to a GObject and use signals for notification
nadvornik
parents:
1011
diff
changeset
|
533 if (il->bytes_total > 0) |
9 | 534 { |
1014 | 535 image_loader_emit_percent(il); |
9 | 536 } |
537 | |
538 return TRUE; | |
539 } | |
540 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
541 static gboolean image_loader_begin(ImageLoader *il) |
9 | 542 { |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
543 gssize b; |
1014 | 544 |
545 if (il->pixbuf) return FALSE; | |
442 | 546 |
1008 | 547 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read); |
1014 | 548 if (b < 1) return FALSE; |
45
7cfa60beda76
Thu May 26 13:57:19 2005 John Ellis <johne@verizon.net>
gqview
parents:
43
diff
changeset
|
549 |
1014 | 550 image_loader_setup_loader(il); |
9 | 551 |
1008 | 552 if (!gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, NULL)) |
9 | 553 { |
1014 | 554 image_loader_stop_loader(il); |
9 | 555 return FALSE; |
556 } | |
557 | |
1008 | 558 il->bytes_read += b; |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
559 |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
560 /* read until size is known */ |
1020 | 561 while (il->loader && !gdk_pixbuf_loader_get_pixbuf(il->loader) && b > 0 && !image_loader_get_stopping(il)) |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
562 { |
1008 | 563 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read); |
564 if (b < 0 || (b > 0 && !gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, NULL))) | |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
565 { |
1014 | 566 image_loader_stop_loader(il); |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
567 return FALSE; |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
568 } |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
569 il->bytes_read += b; |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
570 } |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
571 if (!il->pixbuf) image_loader_sync_pixbuf(il); |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
572 |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
573 if (il->bytes_read == il->bytes_total || b < 1) |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
574 { |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
575 /* done, handle (broken) loaders that do not have pixbuf till close */ |
1014 | 576 image_loader_stop_loader(il); |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
577 |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
578 if (!il->pixbuf) return FALSE; |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
579 |
1014 | 580 image_loader_done(il); |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
581 return TRUE; |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
582 } |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
583 |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
584 if (!il->pixbuf) |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
585 { |
1014 | 586 image_loader_stop_loader(il); |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
587 return FALSE; |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
588 } |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
54
diff
changeset
|
589 |
9 | 590 return TRUE; |
591 } | |
592 | |
1014 | 593 /**************************************************************************************/ |
594 /* the following functions are always executed in the main thread */ | |
595 | |
596 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
597 static gboolean image_loader_setup_source(ImageLoader *il) |
9 | 598 { |
599 struct stat st; | |
600 gchar *pathl; | |
601 | |
1008 | 602 if (!il || il->loader || il->mapped_file) return FALSE; |
603 | |
604 il->mapped_file = NULL; | |
605 | |
606 if (il->fd) | |
607 { | |
608 ExifData *exif = exif_read_fd(il->fd); | |
609 | |
1060 | 610 if (options->thumbnails.use_exif) |
611 il->mapped_file = exif_get_preview(exif, &il->bytes_total, il->requested_width, il->requested_height); | |
612 else | |
613 il->mapped_file = exif_get_preview(exif, &il->bytes_total, 0, 0); /* get the largest available preview image or NULL for normal images*/ | |
614 | |
1008 | 615 if (il->mapped_file) |
616 { | |
617 il->preview = TRUE; | |
1060 | 618 DEBUG_1("Usable reduced size (preview) image loaded from file %s", il->fd->path); |
1008 | 619 } |
620 exif_free_fd(il->fd, exif); | |
621 } | |
9 | 622 |
1008 | 623 |
624 if (!il->mapped_file) | |
625 { | |
626 /* normal file */ | |
627 gint load_fd; | |
628 | |
1009
dd311dae857a
fixed thumbnail loader for the new raw preview interface
nadvornik
parents:
1008
diff
changeset
|
629 pathl = path_from_utf8(il->fd->path); |
1008 | 630 load_fd = open(pathl, O_RDONLY | O_NONBLOCK); |
631 g_free(pathl); | |
632 if (load_fd == -1) return FALSE; | |
9 | 633 |
1008 | 634 if (fstat(load_fd, &st) == 0) |
635 { | |
636 il->bytes_total = st.st_size; | |
637 } | |
638 else | |
639 { | |
640 close(load_fd); | |
641 return FALSE; | |
642 } | |
643 | |
644 il->mapped_file = mmap(0, il->bytes_total, PROT_READ|PROT_WRITE, MAP_PRIVATE, load_fd, 0); | |
645 close(load_fd); | |
646 if (il->mapped_file == MAP_FAILED) | |
647 { | |
648 il->mapped_file = 0; | |
649 return FALSE; | |
650 } | |
651 il->preview = FALSE; | |
9 | 652 } |
1014 | 653 |
654 return TRUE; | |
655 } | |
656 | |
657 static void image_loader_stop_source(ImageLoader *il) | |
658 { | |
659 if (!il) return; | |
660 | |
661 if (il->mapped_file) | |
662 { | |
663 if (il->preview) | |
664 { | |
665 exif_free_preview(il->mapped_file); | |
666 } | |
667 else | |
668 { | |
669 munmap(il->mapped_file, il->bytes_total); | |
670 } | |
671 il->mapped_file = NULL; | |
672 } | |
673 } | |
9 | 674 |
1014 | 675 static void image_loader_stop(ImageLoader *il) |
676 { | |
677 if (!il) return; | |
678 | |
679 if (il->idle_id != -1) | |
680 { | |
681 g_source_remove(il->idle_id); | |
682 il->idle_id = -1; | |
683 } | |
684 | |
1015 | 685 if (il->thread) |
686 { | |
1021 | 687 /* stop loader in the other thread */ |
1020 | 688 g_mutex_lock(il->data_mutex); |
1015 | 689 il->stopping = TRUE; |
1021 | 690 while (!il->can_destroy) g_cond_wait(il->can_destroy_cond, il->data_mutex); |
1020 | 691 g_mutex_unlock(il->data_mutex); |
1015 | 692 } |
1014 | 693 |
694 image_loader_stop_loader(il); | |
695 image_loader_stop_source(il); | |
696 | |
697 } | |
698 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
699 void image_loader_delay_area_ready(ImageLoader *il, gboolean enable) |
1045
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
700 { |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
701 g_mutex_lock(il->data_mutex); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
702 il->delay_area_ready = enable; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
703 if (!enable) |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
704 { |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
705 /* send delayed */ |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
706 GList *list, *work; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
707 list = g_list_reverse(il->area_param_delayed_list); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
708 il->area_param_delayed_list = NULL; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
709 g_mutex_unlock(il->data_mutex); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
710 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
711 work = list; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
712 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
713 while (work) |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
714 { |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
715 ImageLoaderAreaParam *par = work->data; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
716 work = work->next; |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
717 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
718 g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, par->x, par->y, par->w, par->h); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
719 g_free(par); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
720 } |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
721 g_list_free(list); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
722 } |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
723 else |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
724 { |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
725 /* just unlock */ |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
726 g_mutex_unlock(il->data_mutex); |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
727 } |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
728 } |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
729 |
0ab0deb0cfcc
added possibility to redraw only the parts of image that are already
nadvornik
parents:
1043
diff
changeset
|
730 |
1014 | 731 /**************************************************************************************/ |
732 /* execution via idle calls */ | |
9 | 733 |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
734 static gboolean image_loader_idle_cb(gpointer data) |
1014 | 735 { |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
736 gboolean ret = FALSE; |
1014 | 737 ImageLoader *il = data; |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
738 |
1014 | 739 if (il->idle_id != -1) |
740 { | |
741 ret = image_loader_continue(il); | |
742 } | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
743 |
1014 | 744 if (!ret) |
745 { | |
746 image_loader_stop_source(il); | |
747 } | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
748 |
1014 | 749 return ret; |
750 } | |
751 | |
752 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
753 static gboolean image_loader_start_idle(ImageLoader *il) |
1014 | 754 { |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
755 gboolean ret; |
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
756 |
1014 | 757 if (!il) return FALSE; |
14
25335c62cd9b
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
758 |
1014 | 759 if (!il->fd) return FALSE; |
760 | |
761 if (!image_loader_setup_source(il)) return FALSE; | |
762 | |
763 ret = image_loader_begin(il); | |
764 | |
765 if (ret && !il->done) il->idle_id = g_idle_add_full(il->idle_priority, image_loader_idle_cb, il, NULL); | |
766 return ret; | |
767 } | |
768 | |
769 /**************************************************************************************/ | |
1015 | 770 /* execution via thread */ |
1021 | 771 static GThreadPool *image_loader_thread_pool = NULL; |
1015 | 772 |
1036 | 773 static GCond *image_loader_prio_cond = NULL; |
774 static GMutex *image_loader_prio_mutex = NULL; | |
775 static gint image_loader_prio_num = 0; | |
776 | |
777 | |
1184 | 778 static void image_loader_thread_enter_high(void) |
1036 | 779 { |
780 g_mutex_lock(image_loader_prio_mutex); | |
781 image_loader_prio_num++; | |
782 g_mutex_unlock(image_loader_prio_mutex); | |
783 } | |
784 | |
1184 | 785 static void image_loader_thread_leave_high(void) |
1036 | 786 { |
787 g_mutex_lock(image_loader_prio_mutex); | |
788 image_loader_prio_num--; | |
1438
9141908e0609
fixed possible deadlock with multiple thumb loaders in parallel
nadvornik
parents:
1433
diff
changeset
|
789 if (image_loader_prio_num == 0) g_cond_broadcast(image_loader_prio_cond); /* wake up all low prio threads */ |
1036 | 790 g_mutex_unlock(image_loader_prio_mutex); |
791 } | |
792 | |
1184 | 793 static void image_loader_thread_wait_high(void) |
1036 | 794 { |
795 g_mutex_lock(image_loader_prio_mutex); | |
796 while (image_loader_prio_num) | |
797 { | |
798 g_cond_wait(image_loader_prio_cond, image_loader_prio_mutex); | |
799 } | |
800 | |
801 g_mutex_unlock(image_loader_prio_mutex); | |
802 } | |
803 | |
804 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
805 static void image_loader_thread_run(gpointer data, gpointer user_data) |
1015 | 806 { |
807 ImageLoader *il = data; | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
808 gboolean cont; |
1036 | 809 |
810 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) | |
811 { | |
812 /* low prio, wait untill high prio tasks finishes */ | |
813 image_loader_thread_wait_high(); | |
814 } | |
815 else | |
816 { | |
817 /* high prio */ | |
818 image_loader_thread_enter_high(); | |
819 } | |
820 | |
821 cont = image_loader_begin(il); | |
1015 | 822 |
1026 | 823 if (!cont && !image_loader_get_pixbuf(il)) |
824 { | |
825 /* | |
826 loader failed, we have to send signal | |
827 (idle mode returns the image_loader_begin return value directly) | |
828 (success is always reported indirectly from image_loader_begin) | |
829 */ | |
830 image_loader_emit_error(il); | |
831 } | |
832 | |
1020 | 833 while (cont && !image_loader_get_is_done(il) && !image_loader_get_stopping(il)) |
1015 | 834 { |
1036 | 835 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) |
836 { | |
837 /* low prio, wait untill high prio tasks finishes */ | |
838 image_loader_thread_wait_high(); | |
839 } | |
1015 | 840 cont = image_loader_continue(il); |
841 } | |
1020 | 842 image_loader_stop_loader(il); |
1021 | 843 |
1036 | 844 if (il->idle_priority <= G_PRIORITY_DEFAULT_IDLE) |
845 { | |
846 /* high prio */ | |
847 image_loader_thread_leave_high(); | |
848 } | |
849 | |
1021 | 850 g_mutex_lock(il->data_mutex); |
851 il->can_destroy = TRUE; | |
852 g_cond_signal(il->can_destroy_cond); | |
853 g_mutex_unlock(il->data_mutex); | |
854 | |
1015 | 855 } |
856 | |
1021 | 857 |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
858 static gboolean image_loader_start_thread(ImageLoader *il) |
1015 | 859 { |
860 if (!il) return FALSE; | |
861 | |
862 if (!il->fd) return FALSE; | |
863 | |
1021 | 864 il->thread = TRUE; |
865 | |
1015 | 866 if (!image_loader_setup_source(il)) return FALSE; |
867 | |
1021 | 868 if (!image_loader_thread_pool) |
869 { | |
870 image_loader_thread_pool = g_thread_pool_new(image_loader_thread_run, NULL, -1, FALSE, NULL); | |
1036 | 871 image_loader_prio_cond = g_cond_new(); |
872 image_loader_prio_mutex = g_mutex_new(); | |
1021 | 873 } |
874 | |
1026 | 875 il->can_destroy = FALSE; /* ImageLoader can't be freed until image_loader_thread_run finishes */ |
876 | |
1021 | 877 g_thread_pool_push(image_loader_thread_pool, il, NULL); |
878 DEBUG_1("Thread pool num threads: %d", g_thread_pool_get_num_threads(image_loader_thread_pool)); | |
1015 | 879 |
880 return TRUE; | |
881 } | |
882 | |
883 | |
884 /**************************************************************************************/ | |
1014 | 885 /* public interface */ |
886 | |
887 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
888 gboolean image_loader_start(ImageLoader *il) |
1014 | 889 { |
890 if (!il) return FALSE; | |
891 | |
892 if (!il->fd) return FALSE; | |
893 | |
1015 | 894 #ifdef HAVE_GTHREAD |
895 return image_loader_start_thread(il); | |
896 #else | |
1014 | 897 return image_loader_start_idle(il); |
1015 | 898 #endif |
9 | 899 } |
900 | |
901 | |
902 /* don't forget to gdk_pixbuf_ref() it if you want to use it after image_loader_free() */ | |
903 GdkPixbuf *image_loader_get_pixbuf(ImageLoader *il) | |
904 { | |
1015 | 905 GdkPixbuf *ret; |
9 | 906 if (!il) return NULL; |
1015 | 907 |
908 g_mutex_lock(il->data_mutex); | |
909 ret = il->pixbuf; | |
910 g_mutex_unlock(il->data_mutex); | |
911 return ret; | |
9 | 912 } |
913 | |
914 gchar *image_loader_get_format(ImageLoader *il) | |
915 { | |
916 GdkPixbufFormat *format; | |
917 gchar **mimev; | |
918 gchar *mime; | |
919 | |
920 if (!il || !il->loader) return NULL; | |
921 | |
922 format = gdk_pixbuf_loader_get_format(il->loader); | |
923 if (!format) return NULL; | |
924 | |
925 mimev = gdk_pixbuf_format_get_mime_types(format); | |
926 if (!mimev) return NULL; | |
927 | |
928 /* return first member of mimev, as GdkPixbufLoader has no way to tell us which exact one ? */ | |
929 mime = g_strdup(mimev[0]); | |
930 g_strfreev(mimev); | |
931 | |
932 return mime; | |
933 } | |
934 | |
935 void image_loader_set_requested_size(ImageLoader *il, gint width, gint height) | |
936 { | |
937 if (!il) return; | |
938 | |
1015 | 939 g_mutex_lock(il->data_mutex); |
9 | 940 il->requested_width = width; |
941 il->requested_height = height; | |
1015 | 942 g_mutex_unlock(il->data_mutex); |
9 | 943 } |
944 | |
413
9e521adbf312
Add two new options to control image read buffer at runtime.
zas_
parents:
281
diff
changeset
|
945 void image_loader_set_buffer_size(ImageLoader *il, guint count) |
9 | 946 { |
947 if (!il) return; | |
948 | |
1015 | 949 g_mutex_lock(il->data_mutex); |
413
9e521adbf312
Add two new options to control image read buffer at runtime.
zas_
parents:
281
diff
changeset
|
950 il->idle_read_loop_count = count ? count : 1; |
1015 | 951 g_mutex_unlock(il->data_mutex); |
9 | 952 } |
953 | |
954 void image_loader_set_priority(ImageLoader *il, gint priority) | |
955 { | |
956 if (!il) return; | |
957 | |
1036 | 958 if (il->thread) return; /* can't change prio if the thread already runs */ |
9 | 959 il->idle_priority = priority; |
960 } | |
961 | |
962 | |
963 gdouble image_loader_get_percent(ImageLoader *il) | |
964 { | |
1015 | 965 gdouble ret; |
966 if (!il) return 0.0; | |
967 | |
968 g_mutex_lock(il->data_mutex); | |
969 if (il->bytes_total == 0) | |
970 { | |
971 ret = 0.0; | |
972 } | |
973 else | |
974 { | |
975 ret = (gdouble)il->bytes_read / il->bytes_total; | |
976 } | |
977 g_mutex_unlock(il->data_mutex); | |
978 return ret; | |
9 | 979 } |
980 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
981 gboolean image_loader_get_is_done(ImageLoader *il) |
9 | 982 { |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
983 gboolean ret; |
9 | 984 if (!il) return FALSE; |
985 | |
1015 | 986 g_mutex_lock(il->data_mutex); |
987 ret = il->done; | |
988 g_mutex_unlock(il->data_mutex); | |
989 | |
990 return ret; | |
9 | 991 } |
992 | |
1011 | 993 FileData *image_loader_get_fd(ImageLoader *il) |
994 { | |
1015 | 995 FileData *ret; |
1011 | 996 if (!il) return NULL; |
997 | |
1015 | 998 g_mutex_lock(il->data_mutex); |
999 ret = il->fd; | |
1000 g_mutex_unlock(il->data_mutex); | |
1001 | |
1002 return ret; | |
1011 | 1003 } |
1004 | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
1005 gboolean image_loader_get_shrunk(ImageLoader *il) |
1011 | 1006 { |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
1007 gboolean ret; |
1011 | 1008 if (!il) return FALSE; |
1009 | |
1015 | 1010 g_mutex_lock(il->data_mutex); |
1011 ret = il->shrunk; | |
1012 g_mutex_unlock(il->data_mutex); | |
1013 return ret; | |
1011 | 1014 } |
1015 | |
1016 | |
1014 | 1017 /* FIXME - this can be rather slow and blocks until the size is known */ |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
1018 gboolean image_load_dimensions(FileData *fd, gint *width, gint *height) |
9 | 1019 { |
1020 ImageLoader *il; | |
1433
b4ad1d201279
Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents:
1346
diff
changeset
|
1021 gboolean success; |
9 | 1022 |
138 | 1023 il = image_loader_new(fd); |
9 | 1024 |
1014 | 1025 success = image_loader_start_idle(il); |
9 | 1026 |
1027 if (success && il->pixbuf) | |
1028 { | |
1029 if (width) *width = gdk_pixbuf_get_width(il->pixbuf); | |
1030 if (height) *height = gdk_pixbuf_get_height(il->pixbuf);; | |
1031 } | |
1032 else | |
1033 { | |
1034 if (width) *width = -1; | |
1035 if (height) *height = -1; | |
1036 } | |
1037 | |
1038 image_loader_free(il); | |
1039 | |
1040 return success; | |
1041 } | |
1055
1646720364cf
Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents:
1045
diff
changeset
|
1042 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |