annotate src/thumb.c @ 839:14520c3a91f8

rotate thumbnails by exif
author nadvornik
date Sun, 15 Jun 2008 21:52:15 +0000
parents 9bd49e725ad3
children 64ef209bcded
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 138
diff changeset
2 * Geeqie
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
3 * (C) 2004 John Ellis
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 446
diff changeset
4 * Copyright (C) 2008 The Geeqie Team
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
7 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
12
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 213
diff changeset
14 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
15 #include "thumb.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
16
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
17 #include "cache.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
18 #include "image-load.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 517
diff changeset
19 #include "filedata.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
20 #include "pixbuf_util.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
21 #include "thumb_standard.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
22 #include "ui_fileops.h"
839
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
23 #include "exif.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
24
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
25 #include <utime.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
26
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
27
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
28 static void thumb_loader_error_cb(ImageLoader *il, gpointer data);
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
29 static void thumb_loader_setup(ThumbLoader *tl, const gchar *path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
30
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
31 static gint normalize_thumb(gint *width, gint *height, gint max_w, gint max_h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
32 static GdkPixbuf *get_xv_thumbnail(gchar *thumb_filename, gint max_w, gint max_h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
33
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
34
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
35 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
36 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
37 * thumbnail routines: creation, caching, and maintenance (public)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
38 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
39 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
40
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
41 static gint thumb_loader_save_to_cache(ThumbLoader *tl)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
42 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
43 gchar *cache_dir;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
44 gint success = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
45 mode_t mode = 0755;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
46
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
47 if (!tl || !tl->fd || !tl->fd->pixbuf) return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
48
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
49 cache_dir = cache_get_location(CACHE_TYPE_THUMB, tl->fd->path, FALSE, &mode);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
50
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
51 if (cache_ensure_dir_exists(cache_dir, mode))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
52 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
53 gchar *cache_path;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
54 gchar *pathl;
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
55 gchar *name = g_strconcat(filename_from_path(tl->fd->path), GQ_CACHE_EXT_THUMB, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
56
715
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
57 cache_path = g_build_filename(cache_dir, name, NULL);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
58 g_free(name);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
59
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
60 DEBUG_1("Saving thumb: %s", cache_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
61
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
62 pathl = path_from_utf8(cache_path);
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
63 success = pixbuf_to_file_as_png(tl->fd->pixbuf, pathl);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
64 if (success)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
65 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
66 struct utimbuf ut;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
67 /* set thumb time to that of source file */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
68
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
69 ut.actime = ut.modtime = filetime(tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
70 if (ut.modtime > 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
71 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
72 utime(pathl, &ut);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
73 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
74 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
75 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
76 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
77 DEBUG_1("Saving failed: %s", pathl);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
78 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
79
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
80 g_free(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
81 g_free(cache_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
82 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
83
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
84 g_free(cache_dir);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
85
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
86 return success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
87 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
88
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
89 static gint thumb_loader_mark_failure(ThumbLoader *tl)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
90 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
91 gchar *cache_dir;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
92 gint success = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
93 mode_t mode = 0755;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 333
diff changeset
94
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
95 if (!tl) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
96
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
97 cache_dir = cache_get_location(CACHE_TYPE_THUMB, tl->fd->path, FALSE, &mode);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
98
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
99 if (cache_ensure_dir_exists(cache_dir, mode))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
100 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
101 gchar *cache_path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
102 gchar *pathl;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
103 FILE *f;
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
104 gchar *name = g_strconcat(filename_from_path(tl->fd->path), GQ_CACHE_EXT_THUMB, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
105
715
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
106 cache_path = g_build_filename(cache_dir, name, NULL);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
107 g_free(name);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
108
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
109 DEBUG_1("marking thumb failure: %s", cache_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
110
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
111 pathl = path_from_utf8(cache_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
112 f = fopen(pathl, "w");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
113 if (f)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
114 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
115 struct utimbuf ut;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
116
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
117 fclose(f);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
118
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
119 ut.actime = ut.modtime = filetime(tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
120 if (ut.modtime > 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
121 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
122 utime(pathl, &ut);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
123 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
124
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
125 success = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
126 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
127
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
128 g_free(pathl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
129 g_free(cache_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
130 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
131
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
132 g_free(cache_dir);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
133 return success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
134 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
135
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
136 static void thumb_loader_percent_cb(ImageLoader *il, gdouble percent, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
137 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
138 ThumbLoader *tl = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
139
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
140 tl->percent_done = percent;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
141
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
142 if (tl->func_progress) tl->func_progress(tl, tl->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
143 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
144
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
145 static void thumb_loader_done_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
146 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
147 ThumbLoader *tl = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
148 GdkPixbuf *pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
149 gint pw, ph;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
150 gint save;
839
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
151 GdkPixbuf *rotated = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
152
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
153 DEBUG_1("thumb done: %s", tl->fd->path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
154
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
155 pixbuf = image_loader_get_pixbuf(tl->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
156 if (!pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
157 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
158 DEBUG_1("...but no pixbuf: %s", tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
159 thumb_loader_error_cb(tl->il, tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
160 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
161 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
162
839
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
163
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
164 if (!tl->cache_hit && options->image.exif_rotate_enable)
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
165 {
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
166 if (!tl->fd->exif_orientation)
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
167 {
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
168 ExifData *exif = exif_read_fd(tl->fd);
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
169 gint orientation;
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
170
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
171 if (exif && exif_get_integer(exif, "Exif.Image.Orientation", &orientation))
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
172 tl->fd->exif_orientation = orientation;
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
173 else
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
174 tl->fd->exif_orientation = 1;
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
175 }
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
176
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
177 rotated = pixbuf_apply_orientation(pixbuf, tl->fd->exif_orientation);
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
178 pixbuf = rotated;
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
179 }
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
180
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
181 pw = gdk_pixbuf_get_width(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
182 ph = gdk_pixbuf_get_height(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
183
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
184 if (tl->cache_hit && pw != tl->max_w && ph != tl->max_h)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
185 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
186 /* requested thumbnail size may have changed, load original */
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
187 DEBUG_1("thumbnail size mismatch, regenerating: %s", tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
188 tl->cache_hit = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
189
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
190 thumb_loader_setup(tl, tl->fd->path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
191
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
192 if (!image_loader_start(tl->il, thumb_loader_done_cb, tl))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
193 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
194 image_loader_free(tl->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
195 tl->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
196
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
197 DEBUG_1("regeneration failure: %s", tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
198 thumb_loader_error_cb(tl->il, tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
199 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
200 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
201 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
202
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
203 /* scale ?? */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
204
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
205 if (pw > tl->max_w || ph > tl->max_h)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
206 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
207 gint w, h;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
208
14
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
209 if (((double)tl->max_w / pw) < ((double)tl->max_h / ph))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
210 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
211 w = tl->max_w;
14
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
212 h = (double)w / pw * ph;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
213 if (h < 1) h = 1;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
214 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
215 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
216 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
217 h = tl->max_h;
14
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
218 w = (double)h / ph * pw;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
219 if (w < 1) w = 1;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
220 }
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
221
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
222 if (tl->fd)
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
223 {
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
224 if (tl->fd->pixbuf) g_object_unref(tl->fd->pixbuf);
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
225 tl->fd->pixbuf = gdk_pixbuf_scale_simple(pixbuf, w, h, (GdkInterpType)options->thumbnails.quality);
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
226 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
227 save = TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
228 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
229 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
230 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
231 if (tl->fd)
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
232 {
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
233 if (tl->fd->pixbuf) g_object_unref(tl->fd->pixbuf);
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
234 tl->fd->pixbuf = pixbuf;
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
235 gdk_pixbuf_ref(tl->fd->pixbuf);
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
236 }
14
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
237 save = il->shrunk;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
238 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
239
839
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
240 if (rotated) gdk_pixbuf_unref(rotated);
14520c3a91f8 rotate thumbnails by exif
nadvornik
parents: 838
diff changeset
241
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
242 /* save it ? */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
243 if (tl->cache_enable && save)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
244 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
245 thumb_loader_save_to_cache(tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
246 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
247
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
248 if (tl->func_done) tl->func_done(tl, tl->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
249 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
250
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
251 static void thumb_loader_error_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
252 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
253 ThumbLoader *tl = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
254
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
255 /* if at least some of the image is available, go to done_cb */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
256 if (image_loader_get_pixbuf(tl->il) != NULL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
257 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
258 thumb_loader_done_cb(il, data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
259 return;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
260 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
261
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
262 DEBUG_1("thumb error: %s", tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
263
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
264 image_loader_free(tl->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
265 tl->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
266
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
267 if (tl->func_error) tl->func_error(tl, tl->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
268 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
269
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
270 static gint thumb_loader_done_delay_cb(gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
271 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
272 ThumbLoader *tl = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
273
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
274 tl->idle_done_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
275
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
276 if (tl->func_done) tl->func_done(tl, tl->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
277
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
278 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
279 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
280
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
281 static void thumb_loader_delay_done(ThumbLoader *tl)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
282 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
283 if (tl->idle_done_id == -1) tl->idle_done_id = g_idle_add(thumb_loader_done_delay_cb, tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
284 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
285
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
286 static void thumb_loader_setup(ThumbLoader *tl, const gchar *path)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
287 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
288 FileData *fd = file_data_new_simple(path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
289 image_loader_free(tl->il);
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
290 tl->il = image_loader_new(fd);
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
291 file_data_unref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
292
333
767b53cd9ab7 Rename thumbnails related options.
zas_
parents: 318
diff changeset
293 if (options->thumbnails.fast)
14
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
294 {
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
295 /* this will speed up jpegs by up to 3x in some cases */
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
296 image_loader_set_requested_size(tl->il, tl->max_w, tl->max_h);
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
297 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
298
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
299 image_loader_set_error_func(tl->il, thumb_loader_error_cb, tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
300 if (tl->func_progress) image_loader_set_percent_func(tl->il, thumb_loader_percent_cb, tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
301 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
302
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
303 void thumb_loader_set_callbacks(ThumbLoader *tl,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
304 ThumbLoaderFunc func_done,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
305 ThumbLoaderFunc func_error,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
306 ThumbLoaderFunc func_progress,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
307 gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
308 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
309 if (!tl) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
310
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
311 if (tl->standard_loader)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
312 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
313 thumb_loader_std_set_callbacks((ThumbLoaderStd *)tl,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
314 (ThumbLoaderStdFunc) func_done,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
315 (ThumbLoaderStdFunc) func_error,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
316 (ThumbLoaderStdFunc) func_progress,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
317 data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
318 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
319 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
320
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
321 tl->func_done = func_done;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
322 tl->func_error = func_error;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
323 tl->func_progress = func_progress;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
324
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
325 tl->data = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
326 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
327
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
328 void thumb_loader_set_cache(ThumbLoader *tl, gint enable_cache, gint local, gint retry_failed)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
329 {
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 333
diff changeset
330 if (!tl) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
331
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
332 if (tl->standard_loader)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
333 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
334 thumb_loader_std_set_cache((ThumbLoaderStd *)tl, enable_cache, local, retry_failed);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
335 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
336 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
337
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
338 tl->cache_enable = enable_cache;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
339 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
340 tl->cache_local = local;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
341 tl->cache_retry = retry_failed;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
342 #endif
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
343 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
344
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
345
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
346 gint thumb_loader_start(ThumbLoader *tl, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
347 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
348 gchar *cache_path = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
349
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
350 if (!tl) return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
351
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
352 if (tl->standard_loader)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
353 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
354 return thumb_loader_std_start((ThumbLoaderStd *)tl, fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
355 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
356
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
357 if (!tl->fd && !fd) return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
358
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
359 if (!tl->fd) tl->fd = file_data_ref(fd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
360
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
361 if (tl->cache_enable)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
362 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
363 cache_path = cache_find_location(CACHE_TYPE_THUMB, tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
364
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
365 if (cache_path)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
366 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
367 if (cache_time_valid(cache_path, tl->fd->path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
368 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
369 DEBUG_1("Found in cache:%s", tl->fd->path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
370
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
371 if (filesize(cache_path) == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
372 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
373 DEBUG_1("Broken image mark found:%s", cache_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
374 g_free(cache_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
375 return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
376 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
377
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
378 DEBUG_1("Cache location:%s", cache_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
379 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
380 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
381 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
382 g_free(cache_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
383 cache_path = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
384 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
385 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
386 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
387
333
767b53cd9ab7 Rename thumbnails related options.
zas_
parents: 318
diff changeset
388 if (!cache_path && options->thumbnails.use_xvpics)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
389 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
390 if (tl->fd->pixbuf) g_object_unref(tl->fd->pixbuf);
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
391 tl->fd->pixbuf = get_xv_thumbnail(tl->fd->path, tl->max_w, tl->max_h);
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
392 if (tl->fd->pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
393 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
394 thumb_loader_delay_done(tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
395 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
396 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
397 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
398
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
399 if (cache_path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
400 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
401 thumb_loader_setup(tl, cache_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
402 g_free(cache_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
403 tl->cache_hit = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
404 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
405 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
406 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
407 thumb_loader_setup(tl, tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
408 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
409
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
410 if (!image_loader_start(tl->il, thumb_loader_done_cb, tl))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
411 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
412 /* try from original if cache attempt */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
413 if (tl->cache_hit)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
414 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
415 tl->cache_hit = FALSE;
694
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 671
diff changeset
416 log_printf("%s", _("Thumbnail image in cache failed to load, trying to recreate.\n"));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
417
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
418 thumb_loader_setup(tl, tl->fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
419 if (image_loader_start(tl->il, thumb_loader_done_cb, tl)) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
420 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
421 /* mark failed thumbnail in cache with 0 byte file */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
422 if (tl->cache_enable)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
423 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
424 thumb_loader_mark_failure(tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
425 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 333
diff changeset
426
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
427 image_loader_free(tl->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
428 tl->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
429 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
430 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
431
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
432 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
433 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
434
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
435 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
436 gint thumb_loader_to_pixmap(ThumbLoader *tl, GdkPixmap **pixmap, GdkBitmap **mask)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
437 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
438 if (!tl || !tl->pixbuf) return -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
439
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
440 gdk_pixbuf_render_pixmap_and_mask(tl->pixbuf, pixmap, mask, 128);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
441
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
442 return thumb_loader_get_space(tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
443 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
444 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
445
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
446 GdkPixbuf *thumb_loader_get_pixbuf(ThumbLoader *tl, gint with_fallback)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
447 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
448 GdkPixbuf *pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
449
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
450 if (tl && tl->standard_loader)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
451 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
452 return thumb_loader_std_get_pixbuf((ThumbLoaderStd *)tl, with_fallback);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
453 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
454
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
455 if (tl && tl->fd && tl->fd->pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
456 {
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
457 pixbuf = tl->fd->pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
458 g_object_ref(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
459 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
460 else if (with_fallback)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
461 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
462 gint w, h;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
463
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
464 pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
465 w = gdk_pixbuf_get_width(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
466 h = gdk_pixbuf_get_height(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
467 if ((w > tl->max_w || h > tl->max_h) &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
468 normalize_thumb(&w, &h, tl->max_w, tl->max_h))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
469 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
470 GdkPixbuf *tmp;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
471
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
472 tmp = pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
473 pixbuf = gdk_pixbuf_scale_simple(tmp, w, h, GDK_INTERP_NEAREST);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
474 gdk_pixbuf_unref(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
475 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
476 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
477 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
478 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
479 pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
480 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
481
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
482 return pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
483 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
484
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
485 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
486 gint thumb_loader_get_space(ThumbLoader *tl)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
487 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
488 if (!tl) return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
489
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
490 if (tl->pixbuf) return (tl->max_w - gdk_pixbuf_get_width(tl->pixbuf));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
491
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
492 return tl->max_w;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
493 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
494 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
495
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
496 ThumbLoader *thumb_loader_new(gint width, gint height)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
497 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
498 ThumbLoader *tl;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
499
333
767b53cd9ab7 Rename thumbnails related options.
zas_
parents: 318
diff changeset
500 if (options->thumbnails.spec_standard)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
501 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
502 return (ThumbLoader *)thumb_loader_std_new(width, height);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
503 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
504
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
505 tl = g_new0(ThumbLoader, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
506 tl->standard_loader = FALSE;
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
507 tl->fd = NULL;
333
767b53cd9ab7 Rename thumbnails related options.
zas_
parents: 318
diff changeset
508 tl->cache_enable = options->thumbnails.enable_caching;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
509 tl->cache_hit = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
510 tl->percent_done = 0.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
511 tl->max_w = width;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
512 tl->max_h = height;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
513
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
514 tl->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
515
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
516 tl->idle_done_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
517
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
518 return tl;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
519 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
520
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
521 void thumb_loader_free(ThumbLoader *tl)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
522 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
523 if (!tl) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
524
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
525 if (tl->standard_loader)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
526 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
527 thumb_loader_std_free((ThumbLoaderStd *)tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
528 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
529 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
530
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
531 image_loader_free(tl->il);
838
9bd49e725ad3 use FileData in thumb_loader
nadvornik
parents: 715
diff changeset
532 file_data_unref(tl->fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
533
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
534 if (tl->idle_done_id != -1) g_source_remove(tl->idle_done_id);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
535
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
536 g_free(tl);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
537 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
538
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
539 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
540 gint thumb_from_xpm_d(const char **data, gint max_w, gint max_h, GdkPixmap **pixmap, GdkBitmap **mask)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
541 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
542 GdkPixbuf *pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
543 gint w, h;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
544
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
545 pixbuf = gdk_pixbuf_new_from_xpm_data(data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
546 w = gdk_pixbuf_get_width(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
547 h = gdk_pixbuf_get_height(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
548
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
549 if ((w > max_w || h > max_h) &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
550 normalize_thumb(&w, &h, max_w, max_h))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
551 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
552 /* scale */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
553 GdkPixbuf *tmp;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
554
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
555 tmp = pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
556 pixbuf = gdk_pixbuf_scale_simple(tmp, w, h, GDK_INTERP_NEAREST);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
557 gdk_pixbuf_unref(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
558 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
559
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
560 gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap, mask, 128);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
561 gdk_pixbuf_unref(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
562
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
563 return w;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
564 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
565 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
566
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
567 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
568 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
569 * xvpics thumbnail support, read-only (private)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
570 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
571 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
572
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
573 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
574 * xvpics code originally supplied by:
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
575 * "Diederen Damien" <D.Diederen@student.ulg.ac.be>
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
576 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
577 * Note: Code has been modified to fit the style of the other code, and to use
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
578 * a few more glib-isms.
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
579 * 08-28-2000: Updated to return a gdk_pixbuf, Imlib is dieing a death here.
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
580 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
581
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
582 #define XV_BUFFER 2048
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
583 static guchar *load_xv_thumbnail(gchar *filename, gint *widthp, gint *heightp)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
584 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
585 FILE *file;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
586 gchar buffer[XV_BUFFER];
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
587 guchar *data;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
588 gint width, height, depth;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
589
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
590 file = fopen(filename, "rt");
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
591 if(!file) return NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
592
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
593 fgets(buffer, XV_BUFFER, file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
594 if(strncmp(buffer, "P7 332", 6) != 0)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
595 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
596 fclose(file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
597 return NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
598 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
599
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 512
diff changeset
600 while (fgets(buffer, XV_BUFFER, file) && buffer[0] == '#') /* do_nothing() */;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
601
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
602 if(sscanf(buffer, "%d %d %d", &width, &height, &depth) != 3)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
603 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
604 fclose(file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
605 return NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
606 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
607
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
608 data = g_new(guchar, width * height);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
609 fread(data, 1, width * height, file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
610
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
611 fclose(file);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
612 *widthp = width;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
613 *heightp = height;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
614 return data;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
615 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
616 #undef XV_BUFFER
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
617
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
618 static gint normalize_thumb(gint *width, gint *height, gint max_w, gint max_h)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
619 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
620 gdouble scale;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
621 gint new_w, new_h;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
622
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
623 scale = MIN((gdouble) max_w / *width, (gdouble) max_h / *height);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
624 new_w = *width * scale;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
625 new_h = *height * scale;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
626
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
627 if (new_w != *width || new_h != *height)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
628 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
629 *width = new_w;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
630 *height = new_h;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
631 return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
632 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
633
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
634 return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
635 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
636
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
637 static void free_rgb_buffer(guchar *pixels, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
638 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
639 g_free(pixels);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
640 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
641
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
642 static GdkPixbuf *get_xv_thumbnail(gchar *thumb_filename, gint max_w, gint max_h)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
643 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
644 gint width, height;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
645 gchar *thumb_name;
715
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
646 gchar *path;
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
647 gchar *directory;
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
648 gchar *name;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
649 guchar *packed_data;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
650
715
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
651 path = path_from_utf8(thumb_filename);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
652 directory = g_path_get_dirname(path);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
653 name = g_path_get_basename(path);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
654
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
655 thumb_name = g_build_filename(directory, ".xvpics", name, NULL);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
656
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
657 g_free(name);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
658 g_free(directory);
179a7224dde1 Use g_build_filename().
zas_
parents: 694
diff changeset
659 g_free(path);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
660
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
661 packed_data = load_xv_thumbnail(thumb_name, &width, &height);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
662 g_free(thumb_name);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
663
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
664 if(packed_data)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
665 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
666 guchar *rgb_data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
667 GdkPixbuf *pixbuf;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
668 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
669
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
670 rgb_data = g_new(guchar, width * height * 3);
517
d84f2210a73c 6 for() vs 201 for (): winner is for ().
zas_
parents: 516
diff changeset
671 for (i = 0; i < width * height; i++)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
672 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
673 rgb_data[i * 3 + 0] = (packed_data[i] >> 5) * 36;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
674 rgb_data[i * 3 + 1] = ((packed_data[i] & 28) >> 2) * 36;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
675 rgb_data[i * 3 + 2] = (packed_data[i] & 3) * 85;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
676 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
677 g_free(packed_data);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
678
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
679 pixbuf = gdk_pixbuf_new_from_data(rgb_data, GDK_COLORSPACE_RGB, FALSE, 8,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
680 width, height, 3 * width, free_rgb_buffer, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
681
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
682 if (normalize_thumb(&width, &height, max_w, max_h))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
683 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
684 /* scale */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
685 GdkPixbuf *tmp;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
686
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
687 tmp = pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
688 pixbuf = gdk_pixbuf_scale_simple(tmp, width, height, GDK_INTERP_NEAREST);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
689 gdk_pixbuf_unref(tmp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
690 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 333
diff changeset
691
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
692 return pixbuf;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
693 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
694
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
695 return NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
696 }