Merge pull request #712 from apavlenko:fix-2912

db17382d · Andrey Kamaev · OpenCV Buildbot · 6c99b5c9 · bbf43e8b · db17382d
Commit db17382d authored Mar 27, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Mar 27, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

features2d_manual.hpp modules/java/generator/src/cpp/features2d_manual.hpp +2 -2

No files found.
--- a/modules/java/generator/src/cpp/features2d_manual.hpp
+++ b/modules/java/generator/src/cpp/features2d_manual.hpp
@@ -261,8 +261,8 @@ class CV_EXPORTS_AS(DescriptorExtractor) javaDescriptorExtractor : public Descri
 public:
 #if 0
    //DO NOT REMOVE! The block is required for sources parser
-    CV_WRAP void compute( const Mat& image, vector<KeyPoint>& keypoints, Mat& descriptors ) const;
-    CV_WRAP void compute( const vector<Mat>& images, vector<vector<KeyPoint> >& keypoints, CV_OUT vector<Mat>& descriptors ) const;
+    CV_WRAP void compute( const Mat& image, CV_IN_OUT vector<KeyPoint>& keypoints, Mat& descriptors ) const;
+    CV_WRAP void compute( const vector<Mat>& images, CV_IN_OUT vector<vector<KeyPoint> >& keypoints, CV_OUT vector<Mat>& descriptors ) const;
    CV_WRAP virtual int descriptorSize() const;
    CV_WRAP virtual int descriptorType() const;