fix for Windows and Mac CI

isl-org · Dec 30, 2024 · 6dcd9d9 · 6dcd9d9
1 parent 583eaa3
commit 6dcd9d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cpp/open3d/pipelines/registration/Feature.cpp b/cpp/open3d/pipelines/registration/Feature.cpp
@@ -185,9 +185,9 @@ std::shared_ptr<Feature> ComputeFPFHFeature(
     std::vector<std::vector<double>> map_fpfh_idx_to_distance2;
     if (filter_fpfh) {
         // compute neighbors of the selected points
-        // using vector<u_int8_t> as a boolean mask for the parallel loop
+        // using vector<uint8_t> as a boolean mask for the parallel loop
         // since vector<bool> is not thread safe in writing.
-        std::vector<u_int8_t> mask_spfh(input.points_.size(), 0);
+        std::vector<uint8_t> mask_spfh(input.points_.size(), 0);
         map_fpfh_idx_to_indices = std::vector<std::vector<int>>(n_fpfh);
         map_fpfh_idx_to_distance2 = std::vector<std::vector<double>>(n_fpfh);
 #pragma omp parallel for schedule(static) \

diff --git a/cpp/open3d/t/pipelines/kernel/FeatureImpl.h b/cpp/open3d/t/pipelines/kernel/FeatureImpl.h
@@ -123,7 +123,7 @@ void ComputeFPFHFeatureCPU
     const int64_t n_points = points.GetLength();
 
     const bool filter_fpfh =
-            mask.has_value() & map_batch_info_idx_to_point_idx.has_value();
+            mask.has_value() && map_batch_info_idx_to_point_idx.has_value();
     if (mask.has_value() ^ map_batch_info_idx_to_point_idx.has_value()) {
         utility::LogError(
                 "Parameters mask and map_batch_info_idx_to_point_idx must be "