Merge pull request #774 from sbrunner/fix-mask-add

Fix mask join (auto-mask and file)
sbrunner · Aug 15, 2022 · 325502f · 325502f
2 parents 64fc7bb + d6a686a
commit 325502f
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/scan_to_paperless/process.py b/scan_to_paperless/process.py
@@ -168,7 +168,13 @@ def _get_mask(
                 )
                 if mask_file:
                     mask = cv2.add(
-                        mask, cv2.bitwise_not(cv2.cvtColor(cv2.imread(mask_file), cv2.COLOR_BGR2GRAY))
+                        mask,
+                        cv2.bitwise_not(
+                            cv2.resize(
+                                cv2.cvtColor(cv2.imread(mask_file), cv2.COLOR_BGR2GRAY),
+                                (mask.shape[1], mask.shape[0]),
+                            )
+                        ),
                     )
 
             final_mask = cv2.bitwise_not(mask)
@@ -186,10 +192,12 @@ def _get_mask(
 
             final_mask = cv2.imread(mask_file)
 
-        maskbw = final_mask if len(final_mask.shape) == 2 else cv2.cvtColor(final_mask, cv2.COLOR_BGR2GRAY)
-        if self.image is not None and final_mask is not None:
-            return cast(NpNdarrayInt, cv2.resize(maskbw, (self.image.shape[1], self.image.shape[0])))
-        return cast(NpNdarrayInt, maskbw)
+            maskbw = (
+                final_mask if len(final_mask.shape) == 2 else cv2.cvtColor(final_mask, cv2.COLOR_BGR2GRAY)
+            )
+            if self.image is not None and final_mask is not None:
+                return cast(NpNdarrayInt, cv2.resize(maskbw, (self.image.shape[1], self.image.shape[0])))
+        return cast(NpNdarrayInt, final_mask)
 
     def init_mask(self) -> None:
         """Init the mask image used to mask the image on the crop and deskew calculation."""