bug-1495-surf.diff
b/modules/features2d/include/opencv2/features2d/features2d.hpp | ||
---|---|---|
259 | 259 |
* descriptors for the provided keypoints |
260 | 260 |
*/ |
261 | 261 |
CV_WRAP_AS(detectAndCompute) virtual void operator()( InputArray image, InputArray mask, |
262 |
CV_OUT vector<KeyPoint>& keypoints, |
|
262 |
CV_OUT CV_IN_OUT vector<KeyPoint>& keypoints,
|
|
263 | 263 |
OutputArray descriptors, |
264 | 264 |
bool useProvidedKeypoints=false ) const = 0; |
265 | 265 |
b/modules/nonfree/include/opencv2/nonfree/features2d.hpp | ||
---|---|---|
125 | 125 |
CV_OUT vector<KeyPoint>& keypoints) const; |
126 | 126 |
//! finds the keypoints and computes their descriptors. Optionally it can compute descriptors for the user-provided keypoints |
127 | 127 |
void operator()(InputArray img, InputArray mask, |
128 |
CV_OUT vector<KeyPoint>& keypoints, |
|
128 |
CV_OUT CV_IN_OUT vector<KeyPoint>& keypoints,
|
|
129 | 129 |
OutputArray descriptors, |
130 | 130 |
bool useProvidedKeypoints=false) const; |
131 | 131 |
|
132 |
- |