fixed min_size bug being greater than max_size <Nick>

git-svn-id: https://callirhoe.googlecode.com/svn/branches/phantome@211 81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df
This commit is contained in:
geortz@gmail.com 2014-11-03 10:31:27 +00:00
parent 64dfad3a28
commit 475e91f5fe

View File

@ -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: