Updated version number, updated as_gray as per this issue BVLC/caffe#…

…6902
cnztech · Oct 28, 2020 · 5a9f6f4 · 5a9f6f4
1 parent 33682eb
commit 5a9f6f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/image_match/__init__.py b/image_match/__init__.py
@@ -1,2 +1,2 @@
 __author__ = 'ryan'
-__version__ = '1.1.2'
+__version__ = '1.1.3'
diff --git a/image_match/goldberg.py b/image_match/goldberg.py
@@ -236,14 +236,14 @@ def preprocess_image(image_or_path, bytestream=False, handle_mpo=False):
             return rgb2gray(np.asarray(img, dtype=np.uint8))
         elif type(image_or_path) in string_types or \
              type(image_or_path) is text_type:
-            return imread(image_or_path, as_grey=True)
+            return imread(image_or_path, as_gray=True)
         elif type(image_or_path) is bytes:
             try:
                 img = Image.open(image_or_path)
                 arr = np.array(img.convert('RGB'))
             except IOError:
                 # try again due to PIL weirdness
-                return imread(image_or_path, as_grey=True)
+                return imread(image_or_path, as_gray=True)
             if handle_mpo:
                 # take the first images from the MPO
                 if arr.shape == (2,) and isinstance(arr[1].tolist(), MpoImageFile):