summaryrefslogtreecommitdiff
path: root/src/filelist.c
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-11-11 21:26:42 +0100
committerDennis Real <github@tildepipe.org>2012-11-11 21:26:42 +0100
commita3d28a957f8b4a24cbc102a8dca77bb78b568ab4 (patch)
tree4025736270638f5035e28541b7edee40ef6700bb /src/filelist.c
parent0f6d9518b5a12538e4064ef1c397b62e6be61f3b (diff)
parent96d57781be7171d29c7ea0ecbbddc48ad374885c (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/filelist.c')
-rw-r--r--src/filelist.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/filelist.c b/src/filelist.c
index 920a5ef..542dbdf 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -281,6 +281,13 @@ gib_list *feh_file_info_preload(gib_list * list)
remove_list = gib_list_add_front(remove_list, l);
if (opt.verbose)
feh_display_status('x');
+ } else if (((unsigned int)file->info->width < opt.min_width)
+ || ((unsigned int)file->info->width > opt.max_width)
+ || ((unsigned int)file->info->height < opt.min_height)
+ || ((unsigned int)file->info->height > opt.max_height)) {
+ remove_list = gib_list_add_front(remove_list, l);
+ if (opt.verbose)
+ feh_display_status('s');
} else if (opt.verbose)
feh_display_status('.');
}
@@ -375,7 +382,8 @@ int feh_cmp_format(void *file1, void *file2)
void feh_prepare_filelist(void)
{
if (opt.list || opt.customlist || (opt.sort > SORT_FILENAME)
- || opt.preload) {
+ || opt.preload || opt.min_width || opt.min_height
+ || (opt.max_width != UINT_MAX) || (opt.max_height != UINT_MAX)) {
/* For these sort options, we have to preload images */
filelist = feh_file_info_preload(filelist);
if (!gib_list_length(filelist))