From cb4d6d6f5be213edbc4f3b1e4452e5b7ce5e9378 Mon Sep 17 00:00:00 2001
From: adamhrv <adam@ahprojects.com>
Date: Thu, 17 Jan 2019 11:26:41 +0100
Subject: updates for batch processing

---
 megapixels/commands/cv/resize.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'megapixels/commands/cv/resize.py')

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:
-- 
cgit v1.2.3-70-g09d2