Merge branch '949-classif_epipolaire_trouee' into 'master'

Fix d'inversions ligne/colonne dans les fontions de fusion de classif épipolaire Closes #949 See merge request 3d/cars-park/cars!790
CNES · Dec 18, 2024 · 507a46c · 507a46c
2 parents 2ab048c + a9a47d1
commit 507a46c
Show file tree

Hide file tree

Showing 21 changed files with 2 additions and 2 deletions.
diff --git 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
diff --git a/tests/data/ref_output/classification_end2end_ventoux_split.tif b/tests/data/ref_output/classification_end2end_ventoux_split.tif
diff --git a/tests/data/ref_output/classification_end2end_ventoux_with_classif.tif b/tests/data/ref_output/classification_end2end_ventoux_with_classif.tif
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
diff --git a/tests/data/ref_output/color_end2end_paca_matches_filling.tif b/tests/data/ref_output/color_end2end_paca_matches_filling.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_split.tif b/tests/data/ref_output/color_end2end_ventoux_split.tif
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
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
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
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
diff --git a/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif b/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_split.tif b/tests/data/ref_output/dsm_end2end_ventoux_split.tif
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
diff --git a/tests/data/ref_output/filling_end2end_ventoux_split.tif b/tests/data/ref_output/filling_end2end_ventoux_split.tif
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
diff --git a/tests/data/ref_output/mask_end2end_paca_matches_filling.tif b/tests/data/ref_output/mask_end2end_paca_matches_filling.tif
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
diff --git a/tests/data/ref_output/performance_map_end2end_ventoux_split.tif b/tests/data/ref_output/performance_map_end2end_ventoux_split.tif
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
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