[packages/pcl] - fix return type of non-void functions

baggins baggins at pld-linux.org
Thu Jan 26 23:15:17 CET 2017


commit eff1fda1eb0664a6d56f3d378d522e6073b3f0c1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 26 23:14:58 2017 +0100

    - fix return type of non-void functions

 fix-return-type.patch | 22 ++++++++++++++++++++++
 pcl.spec              |  2 ++
 2 files changed, 24 insertions(+)
---
diff --git a/pcl.spec b/pcl.spec
index fcc40ba..360b190 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -24,6 +24,7 @@ Patch3:		eigen-dependency.patch
 Patch4:		vtk7.patch
 Patch5:		vtk71.patch
 Patch6:		vtkOpenGL2.patch
+Patch7:		fix-return-type.patch
 URL:		http://pointclouds.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -118,6 +119,7 @@ Dokumentacja API oraz wprowadzenie do biblioteki PCL.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 mkdir build
diff --git a/fix-return-type.patch b/fix-return-type.patch
new file mode 100644
index 0000000..15ebdc3
--- /dev/null
+++ b/fix-return-type.patch
@@ -0,0 +1,22 @@
+--- pcl-pcl-1.7.2/registration/include/pcl/registration/correspondence_estimation_backprojection.h~	2014-09-10 23:22:57.000000000 +0200
++++ pcl-pcl-1.7.2/registration/include/pcl/registration/correspondence_estimation_backprojection.h	2017-01-26 23:11:14.970602304 +0100
+@@ -184,7 +184,7 @@
+           * cloud for computing correspondences. By default we use k = 10 nearest 
+           * neighbors.
+           */
+-        inline void
++        inline unsigned int
+         getKSearch () const { return (k_); }
+         
+         /** \brief Clone and cast to CorrespondenceEstimationBase */
+--- pcl-pcl-1.7.2/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h~	2014-09-10 23:22:57.000000000 +0200
++++ pcl-pcl-1.7.2/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h	2017-01-26 23:12:02.468654319 +0100
+@@ -180,7 +180,7 @@
+           * cloud for computing correspondences. By default we use k = 10 nearest 
+           * neighbors.
+           */
+-        inline void
++        inline unsigned int
+         getKSearch () const { return (k_); }
+ 
+         /** \brief Clone and cast to CorrespondenceEstimationBase */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pcl.git/commitdiff/eff1fda1eb0664a6d56f3d378d522e6073b3f0c1



More information about the pld-cvs-commit mailing list