From 475e91f5fec8ffb19313ebf8e89408a03322a129 Mon Sep 17 00:00:00 2001 From: "geortz@gmail.com" Date: Mon, 3 Nov 2014 10:31:27 +0000 Subject: [PATCH] fixed min_size bug being greater than max_size git-svn-id: https://callirhoe.googlecode.com/svn/branches/phantome@211 81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df --- calmagick.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/calmagick.py b/calmagick.py index ae791e5..db478b4 100755 --- a/calmagick.py +++ b/calmagick.py @@ -298,7 +298,9 @@ photos.""") def check_parsed_options(options): """set (remaining) default values and check validity of various option combinations""" if options.min_size is None: - options.min_size = 0.333 if options.placement in ['min','max','random'] else 0.05 + options.min_size = min(0.333,options.max_size) if options.placement in ['min','max','random'] else min(0.05,options.max_size) + if options.min_size > options.max_size: + raise lib.Abort("calmagick: --min-size should not be greater than --max-size") if options.sample is not None and not options.range: raise lib.Abort("calmagick: --sample requested without --range") if options.outfile is not None and options.range: