Rediff patches

Drop 0003-Adopt-for-failing-tests-on-i386.patch: included upstream

diff --git a/debian/patches/0001-Fix-PCL_ROOT-path.patch b/debian/patches/0001-Fix-PCL_ROOT-path.patch
index c1d70949a7fc065df05df35643997e1782d95e73..14d4886fdf45bec57339d53a25d11461e953d532 100644 (file)
--- a/debian/patches/0001-Fix-PCL_ROOT-path.patch
+++ b/debian/patches/0001-Fix-PCL_ROOT-path.patch
@@ -7,10 +7,10 @@ Subject: Fix PCL_ROOT path
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index ddf93eb..4d048eb 100644
+index cf21c44..2eafd3c 100644
 --- a/PCLConfig.cmake.in
 +++ b/PCLConfig.cmake.in
-@@ -391,7 +391,7 @@ if(WIN32 AND NOT MINGW)
+@@ -411,7 +411,7 @@ if(WIN32 AND NOT MINGW)
    endif()
  else()
  # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y

diff --git a/debian/patches/0003-Adopt-for-failing-tests-on-i386.patch b/debian/patches/0003-Adopt-for-failing-tests-on-i386.patch
deleted file mode 100644 (file)
index cd204a3..0000000
--- a/debian/patches/0003-Adopt-for-failing-tests-on-i386.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Fri, 6 Jan 2023 12:52:49 +0100
-Subject: Adopt for failing tests on i386
-
----
- test/filters/test_convolution.cpp                            | 2 ++
- test/io/test_tim_grabber.cpp                                 | 2 +-
- test/octree/test_octree.cpp                                  | 2 +-
- test/sample_consensus/test_sample_consensus_plane_models.cpp | 2 ++
- 4 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/test/filters/test_convolution.cpp b/test/filters/test_convolution.cpp
-index 2bae7ae..dab6ac7 100644
---- a/test/filters/test_convolution.cpp
-+++ b/test/filters/test_convolution.cpp
-@@ -396,12 +396,14 @@ TEST (Convolution, convolveRowsXYZRGB)
-   // check result
-   for (std::uint32_t i = 0; i < output->width ; ++i)
-   {
-+#ifndef __i386__
-     EXPECT_EQ ((*output) (i, 0).r, output_results[i * 2 + 0].r);
-     EXPECT_EQ ((*output) (i, 0).g, output_results[i * 2 + 0].g);
-     EXPECT_EQ ((*output) (i, 0).b, output_results[i * 2 + 0].b);
-     EXPECT_EQ ((*output) (i, 47).r, output_results[i * 2 + 1].r);
-     EXPECT_EQ ((*output) (i, 47).g, output_results[i * 2 + 1].g);
-     EXPECT_EQ ((*output) (i, 47).b, output_results[i * 2 + 1].b);
-+#endif
-   }
- }
- 
-diff --git a/test/io/test_tim_grabber.cpp b/test/io/test_tim_grabber.cpp
-index f245e0c..4c74315 100644
---- a/test/io/test_tim_grabber.cpp
-+++ b/test/io/test_tim_grabber.cpp
-@@ -89,7 +89,7 @@ TEST_F (TimGrabberTest, Test1)
-     for (std::size_t j = 0; j < correct_clouds_.at(i).size (); j++) {
-       PointT const& correct_point = correct_clouds_.at(i).at(j);
-       PointT const& answer_point = answer_cloud->at(j);
--      EXPECT_NEAR (correct_point.x, answer_point.x, 1.0e-3);
-+      EXPECT_NEAR (correct_point.x, answer_point.x, 1.0e-2);
-       EXPECT_NEAR (correct_point.y, answer_point.y, 1.0e-3);
-       EXPECT_NEAR (correct_point.z, answer_point.z, 1.0e-3);
-     }
-diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp
-index e150248..0b2a769 100644
---- a/test/octree/test_octree.cpp
-+++ b/test/octree/test_octree.cpp
-@@ -1538,7 +1538,7 @@ TEST (PCL, Octree_Pointcloud_Ray_Traversal)
-     {
-       pt = (*cloudIn)[i];
-       d = Eigen::Vector3f (pt.x, pt.y, pt.z) - o;
--      ASSERT_GE (d.norm (), min_dist);
-+      ASSERT_GE (d.norm (), 0.999 * min_dist);
-     }
-   }
- }
-diff --git a/test/sample_consensus/test_sample_consensus_plane_models.cpp b/test/sample_consensus/test_sample_consensus_plane_models.cpp
-index 82141b3..d4a8bb4 100644
---- a/test/sample_consensus/test_sample_consensus_plane_models.cpp
-+++ b/test/sample_consensus/test_sample_consensus_plane_models.cpp
-@@ -556,10 +556,12 @@ TEST (SampleConsensusModelPlane, OptimizeFarFromOrigin)
-   Eigen::VectorXf coeffs(4); // Doesn't have to be initialized, the function doesn't use them
-   Eigen::VectorXf optimized_coeffs(4);
-   model.optimizeModelCoefficients(inliers, coeffs, optimized_coeffs);
-+#ifndef __i386__
-   EXPECT_NEAR(optimized_coeffs[0], z[0], 5e-6);
-   EXPECT_NEAR(optimized_coeffs[1], z[1], 5e-6);
-   EXPECT_NEAR(optimized_coeffs[2], z[2], 5e-6);
-   EXPECT_NEAR(optimized_coeffs[3], -z.dot(center), 5e-2);
-+#endif
- }
- 
- int

diff --git a/debian/patches/0003-Use-newly-build-libs-when-testing.patch b/debian/patches/0003-Use-newly-build-libs-when-testing.patch
index 58e4ddb65b9925099c1d98fafbeaafa60d4ca037..fdfb3159965039db071ce5955566958770a92c8c 100644 (file)
--- a/debian/patches/0003-Use-newly-build-libs-when-testing.patch
+++ b/debian/patches/0003-Use-newly-build-libs-when-testing.patch
@@ -8,7 +8,7 @@ This exports the LD_LIBRARY_PATH so the newly build libs will be used.
  1 file changed, 1 insertion(+)
 
 diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake
-index 86d06d0..75c81e3 100644
+index 2da076c..a78551a 100644
 --- a/cmake/pcl_targets.cmake
 +++ b/cmake/pcl_targets.cmake
 @@ -415,6 +415,7 @@ macro(PCL_ADD_TEST _name _exename)

diff --git a/debian/patches/0004-Work-around-test-failing-on-i386.patch b/debian/patches/0004-Work-around-test-failing-on-i386.patch
index 9da14e05001029209bb49216314ec2de6f2b84b4..65afd78306d8651e3ceee5d879a787d33a1e1c64 100644 (file)
--- a/debian/patches/0004-Work-around-test-failing-on-i386.patch
+++ b/debian/patches/0004-Work-around-test-failing-on-i386.patch
@@ -8,20 +8,20 @@ Subject: Work around test failing on i386
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/test/common/test_eigen.cpp b/test/common/test_eigen.cpp
-index 1ecebc9..de44d90 100644
+index 6bcc4ae..ae42a58 100644
 --- a/test/common/test_eigen.cpp
 +++ b/test/common/test_eigen.cpp
 @@ -537,7 +537,7 @@ TEST (PCL, eigen22f)
    Eigen::Matrix<Scalar, 2, 2> c_result;
    Eigen::Matrix<Scalar, 2, 2> c_error;
  
--  const Scalar epsilon = 3.1e-5f;
-+  const Scalar epsilon = 3.1e-3f;
-   const unsigned iterations = 1000000;
+-  constexpr Scalar epsilon = 3.1e-5f;
++  constexpr Scalar epsilon = 3.1e-3f;
+   constexpr unsigned iterations = 1000000;
  
    // test floating point row-major : row-major
 diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp
-index 0b2a769..6059883 100644
+index 7fbd7bb..99e3346 100644
 --- a/test/octree/test_octree.cpp
 +++ b/test/octree/test_octree.cpp
 @@ -922,6 +922,7 @@ TEST (PCL, Octree_Pointcloud_Iterator_Test)

diff --git a/debian/patches/series b/debian/patches/series
index 99ad0aae599b9d97616597312dde9b6a36379b54..31deddb3e2a60ef31af5ec2e41ef48f16db539ef 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Fix-PCL_ROOT-path.patch
 0003-Use-newly-build-libs-when-testing.patch
-0003-Adopt-for-failing-tests-on-i386.patch
 0004-Work-around-test-failing-on-i386.patch