From eb4c2cd59f889f19aff256de526e00a188c524d1 Mon Sep 17 00:00:00 2001 From: Konstantin Matskevich Date: Wed, 5 Feb 2014 10:55:26 +0400 Subject: [PATCH] removed CV_IN/OUT --- modules/features2d/include/opencv2/features2d.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/features2d/include/opencv2/features2d.hpp b/modules/features2d/include/opencv2/features2d.hpp index b67834448..eb380ceb4 100644 --- a/modules/features2d/include/opencv2/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d.hpp @@ -156,7 +156,7 @@ public: * keypoints The input keypoints. Keypoints for which a descriptor cannot be computed are removed. * descriptors Copmputed descriptors. Row i is the descriptor for keypoint i. */ - CV_WRAP void compute( InputArray image, CV_OUT CV_IN_OUT std::vector& keypoints, CV_OUT OutputArray descriptors ) const; + CV_WRAP void compute( InputArray image, CV_OUT CV_IN_OUT std::vector& keypoints, OutputArray descriptors ) const; /* * Compute the descriptors for a keypoints collection detected in image collection. @@ -207,7 +207,7 @@ public: OutputArray descriptors, bool useProvidedKeypoints=false ) const = 0; - CV_WRAP void compute( InputArray image, CV_OUT CV_IN_OUT std::vector& keypoints, CV_OUT OutputArray descriptors ) const; + CV_WRAP void compute( InputArray image, CV_OUT CV_IN_OUT std::vector& keypoints, OutputArray descriptors ) const; // Create feature detector and descriptor extractor by name. CV_WRAP static Ptr create( const String& name ); @@ -1411,19 +1411,19 @@ struct CV_EXPORTS DrawMatchesFlags }; // Draw keypoints. -CV_EXPORTS_W void drawKeypoints( InputArray image, const std::vector& keypoints, CV_OUT InputOutputArray outImage, +CV_EXPORTS_W void drawKeypoints( InputArray image, const std::vector& keypoints, InputOutputArray outImage, const Scalar& color=Scalar::all(-1), int flags=DrawMatchesFlags::DEFAULT ); // Draws matches of keypints from two images on output image. CV_EXPORTS_W void drawMatches( InputArray img1, const std::vector& keypoints1, InputArray img2, const std::vector& keypoints2, - const std::vector& matches1to2, CV_OUT InputOutputArray outImg, + const std::vector& matches1to2, InputOutputArray outImg, const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1), const std::vector& matchesMask=std::vector(), int flags=DrawMatchesFlags::DEFAULT ); CV_EXPORTS_AS(drawMatchesKnn) void drawMatches( InputArray img1, const std::vector& keypoints1, InputArray img2, const std::vector& keypoints2, - const std::vector >& matches1to2, CV_OUT InputOutputArray outImg, + const std::vector >& matches1to2, InputOutputArray outImg, const Scalar& matchColor=Scalar::all(-1), const Scalar& singlePointColor=Scalar::all(-1), const std::vector >& matchesMask=std::vector >(), int flags=DrawMatchesFlags::DEFAULT );