From bd59bc3e4a2e28fb44917efeae34ba63d2608e8e Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Fri, 12 Apr 2013 12:25:54 +0400 Subject: [PATCH] Remove ifdef __cplusplus from nonfree headers --- .../nonfree/include/opencv2/nonfree/features2d.hpp | 24 ++++++++-------------- modules/nonfree/include/opencv2/nonfree/ocl.hpp | 2 +- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/modules/nonfree/include/opencv2/nonfree/features2d.hpp b/modules/nonfree/include/opencv2/nonfree/features2d.hpp index 57b9f1e..4acd747 100644 --- a/modules/nonfree/include/opencv2/nonfree/features2d.hpp +++ b/modules/nonfree/include/opencv2/nonfree/features2d.hpp @@ -45,8 +45,6 @@ #include "opencv2/features2d.hpp" -#ifdef __cplusplus - namespace cv { @@ -58,9 +56,9 @@ namespace cv class CV_EXPORTS_W SIFT : public Feature2D { public: - CV_WRAP explicit SIFT( int nfeatures=0, int nOctaveLayers=3, - double contrastThreshold=0.04, double edgeThreshold=10, - double sigma=1.6); + CV_WRAP explicit SIFT( int nfeatures = 0, int nOctaveLayers = 3, + double contrastThreshold = 0.04, double edgeThreshold = 10, + double sigma = 1.6); //! returns the descriptor size in floats (128) CV_WRAP int descriptorSize() const; @@ -76,7 +74,7 @@ public: void operator()(InputArray img, InputArray mask, std::vector& keypoints, OutputArray descriptors, - bool useProvidedKeypoints=false) const; + bool useProvidedKeypoints = false) const; AlgorithmInfo* info() const; @@ -86,7 +84,7 @@ public: std::vector& keypoints ) const; protected: - void detectImpl( const Mat& image, std::vector& keypoints, const Mat& mask=Mat() ) const; + void detectImpl( const Mat& image, std::vector& keypoints, const Mat& mask = Mat() ) const; void computeImpl( const Mat& image, std::vector& keypoints, Mat& descriptors ) const; CV_PROP_RW int nfeatures; @@ -111,8 +109,8 @@ public: CV_WRAP SURF(); //! the full constructor taking all the necessary parameters explicit CV_WRAP SURF(double hessianThreshold, - int nOctaves=4, int nOctaveLayers=2, - bool extended=true, bool upright=false); + int nOctaves = 4, int nOctaveLayers = 2, + bool extended = true, bool upright = false); //! returns the descriptor size in float's (64 or 128) CV_WRAP int descriptorSize() const; @@ -127,7 +125,7 @@ public: void operator()(InputArray img, InputArray mask, CV_OUT std::vector& keypoints, OutputArray descriptors, - bool useProvidedKeypoints=false) const; + bool useProvidedKeypoints = false) const; AlgorithmInfo* info() const; @@ -139,7 +137,7 @@ public: protected: - void detectImpl( const Mat& image, std::vector& keypoints, const Mat& mask=Mat() ) const; + void detectImpl( const Mat& image, std::vector& keypoints, const Mat& mask = Mat() ) const; void computeImpl( const Mat& image, std::vector& keypoints, Mat& descriptors ) const; }; @@ -148,8 +146,4 @@ typedef SURF SurfDescriptorExtractor; } /* namespace cv */ -#endif /* __cplusplus */ - #endif - -/* End of file. */ diff --git a/modules/nonfree/include/opencv2/nonfree/ocl.hpp b/modules/nonfree/include/opencv2/nonfree/ocl.hpp index 9ceb9c3..2b788ba 100644 --- a/modules/nonfree/include/opencv2/nonfree/ocl.hpp +++ b/modules/nonfree/include/opencv2/nonfree/ocl.hpp @@ -121,4 +121,4 @@ namespace cv } } -#endif //__OPENCV_NONFREE_OCL_HPP__ \ No newline at end of file +#endif //__OPENCV_NONFREE_OCL_HPP__ -- 2.7.4