convertMaps

leftfield-geospatial · Sep 25, 2023 · 40708fd · 40708fd
1 parent 14eb43b
commit 40708fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/simple_ortho/camera.py b/simple_ortho/camera.py
@@ -395,6 +395,7 @@ def _get_undistort_maps(self, alpha: float) -> Tuple[Tuple[np.ndarray, np.ndarra
         undistort_maps = cv2.initUndistortRectifyMap(
             self._K, self._dist_param, np.eye(3), K_undistort, im_size, cv2.CV_16SC2
         )
+        undistort_maps = cv2.convertMaps(*undistort_maps, cv2.CV_16SC2)
         return undistort_maps, K_undistort
 
     def _world_to_pixel(self, xyz: np.ndarray) -> np.ndarray:
@@ -549,6 +550,7 @@ def _get_undistort_maps(self, alpha: float) -> Tuple[Tuple[np.ndarray, np.ndarra
         undistort_maps = cv2.fisheye.initUndistortRectifyMap(
             self._K, self._dist_param, np.eye(3), K_undistort, im_size, cv2.CV_16SC2
         )
+        undistort_maps = cv2.convertMaps(*undistort_maps, cv2.CV_16SC2)
         return undistort_maps, K_undistort
 
     def _world_to_pixel(self, xyz: np.ndarray) -> np.ndarray:

diff --git a/simple_ortho/ortho.py b/simple_ortho/ortho.py
@@ -412,7 +412,7 @@ def _remap_tile(
         # separate tile_ji into (j, i) grids, converting to float32 for compatibility with cv2.remap
         tile_jgrid = tile_ji[0, :].reshape(tile_win.height, tile_win.width).astype('float32')
         tile_igrid = tile_ji[1, :].reshape(tile_win.height, tile_win.width).astype('float32')
-        # tile_jgrid, tile_igrid = cv2.convertMaps(tile_jgrid, tile_igrid, cv2.CV_16SC2)
+        tile_jgrid, tile_igrid = cv2.convertMaps(tile_jgrid, tile_igrid, cv2.CV_16SC2)
 
         # initialise ortho tile array
         tile_array = np.full(