Merge branch 'master' of asdf.us:megapixels_dev

1 files changed, 8 insertions, 6 deletions

diff --git a/megapixels/app/utils/im_utils.py b/megapixels/app/utils/im_utils.py
index d36c1c32..670d5168 100644
--- a/megapixels/app/utils/im_utils.py
+++ b/megapixels/app/utils/im_utils.py
@@ -11,11 +11,6 @@ from skimage import feature
 import imutils
 import time
 import numpy as np
-import torch
-import torch.nn as nn
-import torchvision.models as models
-import torchvision.transforms as transforms
-from torch.autograd import Variable
 from sklearn.metrics.pairwise import cosine_similarity
 import datetime
 
@@ -293,6 +288,13 @@ def bgr2rgb(im):
   """
   return cv.cvtColor(im,cv.COLOR_BGR2RGB)
 
+def rgb2bgr(im):
+  """Wrapper for cv2.cvtColor transform
+    :param im: Numpy.ndarray (BGR)
+    :returns: Numpy.ndarray (RGB)
+  """
+  return cv.cvtColor(im,cv.COLOR_RGB2BGR)
+
 def compute_laplacian(im):
   # below 100 is usually blurry
   return cv.Laplacian(im, cv.CV_64F).var()
@@ -329,7 +331,7 @@ def normalizedGraylevelVariance(img):
     s = stdev[0]**2 / mean[0]
     return s[0]
 
-def compute_if_blank(im,width=100,sigma=0,thresh_canny=.1,thresh_mean=4,mask=None):
+def is_blank(im,width=100,sigma=0,thresh_canny=.1,thresh_mean=4,mask=None):
   # im is graysacale np
   #im = imutils.resize(im,width=width)
   #mask = imutils.resize(mask,width=width)