generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed some more compile errors and test failures

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-10-17 14:22:02 +04:00
parent d36b546df8
commit 1176d4ef84
16 changed files with 165 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
View File

@@ -16,8 +16,8 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindF
Mat& mRgb = *(Mat*)addrRgba;
vector<KeyPoint> v;
FastFeatureDetector detector(50);
detector.detect(mGr, v);
Ptr<FeatureDetector> detector = FastFeatureDetector::create(50);
detector->detect(mGr, v);
for( unsigned int i = 0; i < v.size(); i++ )
{
const KeyPoint& kp = v[i];

4
samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp
View File

@@ -129,12 +129,12 @@ cv::Mat OcvImageProcessing::MainPage::ApplyFindFeaturesFilter(const cv::Mat& ima
{
cv::Mat result;
cv::Mat intermediateMat;
cv::FastFeatureDetector detector(50);
cv::Ptr<cv::FeatureDetector> detector = cv::FastFeatureDetector::create(50);
std::vector<cv::KeyPoint> features;
image.copyTo(result);
cv::cvtColor(image, intermediateMat, CV_RGBA2GRAY);
detector.detect(intermediateMat, features);
detector->detect(intermediateMat, features);
for( unsigned int i = 0; i < std::min(features.size(), (size_t)50); i++ )
{