diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2019-01-17 15:11:47 +0100 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2019-01-17 15:11:47 +0100 |
| commit | 85ae432fb6c6c17292b319bca068e46a4ea81eb3 (patch) | |
| tree | 4d0270fac0fdc7c1c1333af9c4bb82c6eb00669d /megapixels/commands/cv/resize.py | |
| parent | c293006ba43944ffeb4dcab17b2256f3a5491a36 (diff) | |
| parent | 03ad11fb2a3dcd425d50167b15d72d4e0ef536a2 (diff) | |
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'megapixels/commands/cv/resize.py')
| -rw-r--r-- | megapixels/commands/cv/resize.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/megapixels/commands/cv/resize.py b/megapixels/commands/cv/resize.py index dcd621b3..7409ee6f 100644 --- a/megapixels/commands/cv/resize.py +++ b/megapixels/commands/cv/resize.py @@ -49,7 +49,7 @@ centerings = { help='File glob ext') @click.option('--size', 'opt_size', type=(int, int), default=(256, 256), - help='Output image size (square)') + help='Max output size') @click.option('--method', 'opt_scale_method', type=click.Choice(methods.keys()), default='lanczos', @@ -88,7 +88,7 @@ def cli(ctx, opt_dir_in, opt_dir_out, opt_glob_ext, opt_size, opt_scale_method, # ------------------------------------------------- # process here - def pool_resize(fp_im, opt_size, scale_method, centering): + def pool_resize(fp_im, opt_size, scale_method): # Threaded image resize function try: pbar.update(1) @@ -100,7 +100,7 @@ def cli(ctx, opt_dir_in, opt_dir_out, opt_glob_ext, opt_size, opt_scale_method, log.error(e) return False - im = ImageOps.fit(im, opt_size, method=scale_method, centering=centering) + #im = ImageOps.fit(im, opt_size, method=scale_method, centering=centering) if opt_equalize: im_np = im_utils.pil2np(im) @@ -117,8 +117,8 @@ def cli(ctx, opt_dir_in, opt_dir_out, opt_glob_ext, opt_size, opt_scale_method, except: return False - centering = centerings[opt_center] - scale_method = methods[opt_scale_method] + #centering = centerings[opt_center] + #scale_method = methods[opt_scale_method] # get list of files to process fp_ims = glob(join(opt_dir_in, '*.{}'.format(opt_glob_ext))) @@ -132,7 +132,8 @@ def cli(ctx, opt_dir_in, opt_dir_out, opt_glob_ext, opt_size, opt_scale_method, # setup multithreading pbar = tqdm(total=len(fp_ims)) - pool_resize = partial(pool_resize, opt_size=opt_size, scale_method=scale_method, centering=centering) + #pool_resize = partial(pool_resize, opt_size=opt_size, scale_method=scale_method, centering=centering) + pool_resize = partial(pool_resize, opt_size=opt_size) #result_list = pool.map(prod_x, data_list) pool = ThreadPool(opt_threads) with tqdm(total=len(fp_ims)) as pbar: |