Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Discard cached & EXIF thumbnails, which are smaller than the configured maximum size

Browse Source
This commit is contained in:
Bert Münnich 2014-10-30 09:30:00 +01:00
parent f5f49e7a9d
commit eb5feb4585
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
thumbs.c
View File

@ -240,6 +240,7 @@ Imlib_Image tns_scale_down(Imlib_Image im, int dim)
bool tns_load(tns_t *tns, int n, bool force) bool tns_load(tns_t *tns, int n, bool force)
{ {
int w, h; int w, h;
int maxwh = thumb_sizes[ARRLEN(thumb_sizes)-1];
bool cache_hit = false; bool cache_hit = false;
float zw, zh; float zw, zh;
thumb_t *t; thumb_t *t;
@ -261,11 +262,11 @@ bool tns_load(tns_t *tns, int n, bool force)
imlib_free_image(); imlib_free_image();
} }
if (!force && (im = tns_cache_load(file->path, &force)) != NULL) {
cache_hit = true;
} else {
#if HAVE_LIBEXIF
if (!force) { if (!force) {
if ((im = tns_cache_load(file->path, &force)) != NULL) {
cache_hit = true;
#if HAVE_LIBEXIF
} else {
int pw = 0, ph = 0, x = 0, y = 0; int pw = 0, ph = 0, x = 0, y = 0;
bool err; bool err;
ExifData *ed; ExifData *ed;
@ -318,8 +319,17 @@ bool tns_load(tns_t *tns, int n, bool force)
} }
exif_data_unref(ed); exif_data_unref(ed);
} }
}
#endif #endif
}
}
if (im != NULL) {
imlib_context_set_image(im);
if (imlib_image_get_width() < maxwh && imlib_image_get_height() < maxwh) {
imlib_free_image_and_decache();
im = NULL;
cache_hit = false;
}
}
if (im == NULL && (access(file->path, R_OK) < 0 || if (im == NULL && (access(file->path, R_OK) < 0 ||
(im = imlib_load_image(file->path)) == NULL)) (im = imlib_load_image(file->path)) == NULL))
{ {
@ -327,14 +337,13 @@ bool tns_load(tns_t *tns, int n, bool force)
warn("could not open image: %s", file->name); warn("could not open image: %s", file->name);
return false; return false;
} }
}
if (!cache_hit) { if (!cache_hit) {
#if HAVE_LIBEXIF #if HAVE_LIBEXIF
imlib_context_set_image(im); imlib_context_set_image(im);
exif_auto_orientate(file); exif_auto_orientate(file);
#endif #endif
im = tns_scale_down(im, thumb_sizes[ARRLEN(thumb_sizes)-1]); im = tns_scale_down(im, maxwh);
tns_cache_write(im, file->path, true); tns_cache_write(im, file->path, true);
} }