Remove ifdef __cplusplus from nonfree headers

pull/803/head
Andrey Kamaev 12 years ago
parent 5e048d1fa5
commit bd59bc3e4a
  1. 24
      modules/nonfree/include/opencv2/nonfree/features2d.hpp

@ -45,8 +45,6 @@
#include "opencv2/features2d.hpp" #include "opencv2/features2d.hpp"
#ifdef __cplusplus
namespace cv namespace cv
{ {
@ -58,9 +56,9 @@ namespace cv
class CV_EXPORTS_W SIFT : public Feature2D class CV_EXPORTS_W SIFT : public Feature2D
{ {
public: public:
CV_WRAP explicit SIFT( int nfeatures=0, int nOctaveLayers=3, CV_WRAP explicit SIFT( int nfeatures = 0, int nOctaveLayers = 3,
double contrastThreshold=0.04, double edgeThreshold=10, double contrastThreshold = 0.04, double edgeThreshold = 10,
double sigma=1.6); double sigma = 1.6);
//! returns the descriptor size in floats (128) //! returns the descriptor size in floats (128)
CV_WRAP int descriptorSize() const; CV_WRAP int descriptorSize() const;
@ -76,7 +74,7 @@ public:
void operator()(InputArray img, InputArray mask, void operator()(InputArray img, InputArray mask,
std::vector<KeyPoint>& keypoints, std::vector<KeyPoint>& keypoints,
OutputArray descriptors, OutputArray descriptors,
bool useProvidedKeypoints=false) const; bool useProvidedKeypoints = false) const;
AlgorithmInfo* info() const; AlgorithmInfo* info() const;
@ -86,7 +84,7 @@ public:
std::vector<KeyPoint>& keypoints ) const; std::vector<KeyPoint>& keypoints ) const;
protected: protected:
void detectImpl( const Mat& image, std::vector<KeyPoint>& keypoints, const Mat& mask=Mat() ) const; void detectImpl( const Mat& image, std::vector<KeyPoint>& keypoints, const Mat& mask = Mat() ) const;
void computeImpl( const Mat& image, std::vector<KeyPoint>& keypoints, Mat& descriptors ) const; void computeImpl( const Mat& image, std::vector<KeyPoint>& keypoints, Mat& descriptors ) const;
CV_PROP_RW int nfeatures; CV_PROP_RW int nfeatures;
@ -111,8 +109,8 @@ public:
CV_WRAP SURF(); CV_WRAP SURF();
//! the full constructor taking all the necessary parameters //! the full constructor taking all the necessary parameters
explicit CV_WRAP SURF(double hessianThreshold, explicit CV_WRAP SURF(double hessianThreshold,
int nOctaves=4, int nOctaveLayers=2, int nOctaves = 4, int nOctaveLayers = 2,
bool extended=true, bool upright=false); bool extended = true, bool upright = false);
//! returns the descriptor size in float's (64 or 128) //! returns the descriptor size in float's (64 or 128)
CV_WRAP int descriptorSize() const; CV_WRAP int descriptorSize() const;
@ -127,7 +125,7 @@ public:
void operator()(InputArray img, InputArray mask, void operator()(InputArray img, InputArray mask,
CV_OUT std::vector<KeyPoint>& keypoints, CV_OUT std::vector<KeyPoint>& keypoints,
OutputArray descriptors, OutputArray descriptors,
bool useProvidedKeypoints=false) const; bool useProvidedKeypoints = false) const;
AlgorithmInfo* info() const; AlgorithmInfo* info() const;
@ -139,7 +137,7 @@ public:
protected: protected:
void detectImpl( const Mat& image, std::vector<KeyPoint>& keypoints, const Mat& mask=Mat() ) const; void detectImpl( const Mat& image, std::vector<KeyPoint>& keypoints, const Mat& mask = Mat() ) const;
void computeImpl( const Mat& image, std::vector<KeyPoint>& keypoints, Mat& descriptors ) const; void computeImpl( const Mat& image, std::vector<KeyPoint>& keypoints, Mat& descriptors ) const;
}; };
@ -148,8 +146,4 @@ typedef SURF SurfDescriptorExtractor;
} /* namespace cv */ } /* namespace cv */
#endif /* __cplusplus */
#endif #endif
/* End of file. */

Loading…
Cancel
Save