From: Jochen Sprickerhof Date: Sat, 9 Oct 2021 15:37:58 +0000 (+0200) Subject: Fix preprocessor syntax X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~58 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d04858fb54b3b3ccc73ac6b2f2d62c79c1d9fc78;p=pcl.git Fix preprocessor syntax --- 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 a46e0281..44a01472 100644 --- 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 bf11eeb..ced2425 100644 +index 435a50e..4a2e2c3 100644 --- a/cmake/pcl_targets.cmake +++ b/cmake/pcl_targets.cmake @@ -407,6 +407,7 @@ macro(PCL_ADD_TEST _name _exename) diff --git a/debian/patches/0005-Adopt-unit-test-for-i386.patch b/debian/patches/0005-Adopt-unit-test-for-i386.patch index dd48e150..ab3bbcf9 100644 --- a/debian/patches/0005-Adopt-unit-test-for-i386.patch +++ b/debian/patches/0005-Adopt-unit-test-for-i386.patch @@ -63,14 +63,14 @@ index 0b000cb..c8f8598 100644 } diff --git a/test/filters/test_convolution.cpp b/test/filters/test_convolution.cpp -index 26e5cbe..5c0c658 100644 +index 26e5cbe..f61a8f4 100644 --- a/test/filters/test_convolution.cpp +++ b/test/filters/test_convolution.cpp @@ -393,6 +393,7 @@ TEST (Convolution, convolveRowsXYZRGB) RGB(0, 0, 0), RGB(0, 0, 0), }; -+#ifndef (__i386__) ++#ifndef __i386__ // check result for (std::uint32_t i = 0; i < output->width ; ++i) { @@ -83,14 +83,14 @@ index 26e5cbe..5c0c658 100644 int diff --git a/test/filters/test_sampling.cpp b/test/filters/test_sampling.cpp -index d7e1070..484355b 100644 +index d7e1070..46d7cf8 100644 --- a/test/filters/test_sampling.cpp +++ b/test/filters/test_sampling.cpp @@ -86,16 +86,20 @@ TEST (CovarianceSampling, Filters) covariance_sampling.setNumberOfSamples (static_cast (cloud_turtle_normals->size ()) / 8); double cond_num_turtle = covariance_sampling.computeConditionNumber (); -+#ifndef (__i386__) ++#ifndef __i386__ // Conditioning number should be loosely close to the expected number. Adopting 10% of the reference value EXPECT_NEAR (cond_num_turtle, 20661.7663, 2e4); +#endif @@ -100,7 +100,7 @@ index d7e1070..484355b 100644 covariance_sampling.setIndices (turtle_indices); double cond_num_turtle_sampled = covariance_sampling.computeConditionNumber (); -+#ifndef (__i386__) ++#ifndef __i386__ // Conditioning number should be loosely close to the expected number. Adopting 10% of the reference value EXPECT_NEAR (cond_num_turtle_sampled, 5795.5057, 5e3); +#endif