diff --git a/cars/applications/dense_matching/dense_matching_tools.py b/cars/applications/dense_matching/dense_matching_tools.py index 209adea7..c2515b24 100644 --- a/cars/applications/dense_matching/dense_matching_tools.py +++ b/cars/applications/dense_matching/dense_matching_tools.py @@ -495,7 +495,7 @@ def estimate_right_classif_on_left( ): for col_classif in prange( # pylint: disable=E1133 max(0, col + disp_min), - min(data_shape[1], col + disp_max), + min(data_shape[2], col + disp_max), ): if right_classif[classif_c, row, col_classif]: classif_in_range[classif_c] = True @@ -532,7 +532,7 @@ def mask_left_classif_from_right_mask( all_masked = True for col_classif in prange( # pylint: disable=E1133 max(0, col + disp_min[row, col]), - min(data_shape[1], col + disp_max[row, col]), + min(data_shape[2], col + disp_max[row, col]), ): if not right_mask[row, col_classif]: all_masked = False diff --git a/tests/data/ref_output/classif_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/classif_end2end_ventoux_split_no_merging.tif index d901113c..d4fe7c71 100644 Binary files a/tests/data/ref_output/classif_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/classif_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/classification_end2end_ventoux_split.tif b/tests/data/ref_output/classification_end2end_ventoux_split.tif index e7531a91..c80d061b 100644 Binary files a/tests/data/ref_output/classification_end2end_ventoux_split.tif and b/tests/data/ref_output/classification_end2end_ventoux_split.tif differ diff --git a/tests/data/ref_output/classification_end2end_ventoux_with_classif.tif b/tests/data/ref_output/classification_end2end_ventoux_with_classif.tif index 6ee0428c..2d725b65 100644 Binary files a/tests/data/ref_output/classification_end2end_ventoux_with_classif.tif and b/tests/data/ref_output/classification_end2end_ventoux_with_classif.tif differ diff --git a/tests/data/ref_output/clr_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/clr_end2end_ventoux_split_no_merging.tif index 4f94d345..3b4439fb 100644 Binary files a/tests/data/ref_output/clr_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/clr_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/color_end2end_paca_matches_filling.tif b/tests/data/ref_output/color_end2end_paca_matches_filling.tif index ac253976..470df2f5 100644 Binary files a/tests/data/ref_output/color_end2end_paca_matches_filling.tif and b/tests/data/ref_output/color_end2end_paca_matches_filling.tif differ diff --git a/tests/data/ref_output/color_end2end_ventoux_split.tif b/tests/data/ref_output/color_end2end_ventoux_split.tif index 02316666..010ca6ac 100644 Binary files a/tests/data/ref_output/color_end2end_ventoux_split.tif and b/tests/data/ref_output/color_end2end_ventoux_split.tif differ diff --git a/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split.tif b/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split.tif index f9dd31b8..9089a1f9 100644 Binary files a/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split.tif and b/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split.tif differ diff --git a/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split_no_merging.tif index 03487136..9161f3aa 100644 Binary files a/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split.tif b/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split.tif index 2c0b7bdc..49b60cf0 100644 Binary files a/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split.tif and b/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split.tif differ diff --git a/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split_no_merging.tif index cb88b99e..32635698 100644 Binary files a/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif b/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif index d4edc355..8a9fc6e8 100644 Binary files a/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif and b/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif differ diff --git a/tests/data/ref_output/dsm_end2end_ventoux_split.tif b/tests/data/ref_output/dsm_end2end_ventoux_split.tif index eec6c0d3..bd95db5a 100644 Binary files a/tests/data/ref_output/dsm_end2end_ventoux_split.tif and b/tests/data/ref_output/dsm_end2end_ventoux_split.tif differ diff --git a/tests/data/ref_output/dsm_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/dsm_end2end_ventoux_split_no_merging.tif index b3d2e874..adfec8d3 100644 Binary files a/tests/data/ref_output/dsm_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/dsm_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/filling_end2end_ventoux_split.tif b/tests/data/ref_output/filling_end2end_ventoux_split.tif index 224d6825..6cf1c84b 100644 Binary files a/tests/data/ref_output/filling_end2end_ventoux_split.tif and b/tests/data/ref_output/filling_end2end_ventoux_split.tif differ diff --git a/tests/data/ref_output/filling_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/filling_end2end_ventoux_split_no_merging.tif index 9c12f902..9829eeeb 100644 Binary files a/tests/data/ref_output/filling_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/filling_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/mask_end2end_paca_matches_filling.tif b/tests/data/ref_output/mask_end2end_paca_matches_filling.tif index 38e1f2db..d8256ece 100644 Binary files a/tests/data/ref_output/mask_end2end_paca_matches_filling.tif and b/tests/data/ref_output/mask_end2end_paca_matches_filling.tif differ diff --git a/tests/data/ref_output/msk_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/msk_end2end_ventoux_split_no_merging.tif index c7fa73c8..fe5c6c58 100644 Binary files a/tests/data/ref_output/msk_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/msk_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/performance_map_end2end_ventoux_split.tif b/tests/data/ref_output/performance_map_end2end_ventoux_split.tif index d44eb032..29f41d31 100644 Binary files a/tests/data/ref_output/performance_map_end2end_ventoux_split.tif and b/tests/data/ref_output/performance_map_end2end_ventoux_split.tif differ diff --git a/tests/data/ref_output/performance_map_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/performance_map_end2end_ventoux_split_no_merging.tif index 74b5a513..ebc79332 100644 Binary files a/tests/data/ref_output/performance_map_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/performance_map_end2end_ventoux_split_no_merging.tif differ diff --git a/tests/data/ref_output/source_pc_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/source_pc_end2end_ventoux_split_no_merging.tif index 3470c523..6db7e3c1 100644 Binary files a/tests/data/ref_output/source_pc_end2end_ventoux_split_no_merging.tif and b/tests/data/ref_output/source_pc_end2end_ventoux_split_no_merging.tif differ