projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dce629d
)
Fix cudafeatures2d and cudastereo with new 3.0 APIs for ORB and StereoBM
author
Michele Adduci
<adduci.michele@gmail.com>
Wed, 5 Nov 2014 09:42:02 +0000
(10:42 +0100)
committer
Michele Adduci
<adduci.michele@gmail.com>
Wed, 5 Nov 2014 09:42:02 +0000
(10:42 +0100)
modules/cudafeatures2d/perf/perf_features2d.cpp
patch
|
blob
|
history
modules/cudafeatures2d/test/test_features2d.cpp
patch
|
blob
|
history
modules/cudastereo/perf/perf_stereo.cpp
patch
|
blob
|
history
diff --git
a/modules/cudafeatures2d/perf/perf_features2d.cpp
b/modules/cudafeatures2d/perf/perf_features2d.cpp
index
542195e
..
b73aef0
100644
(file)
--- a/
modules/cudafeatures2d/perf/perf_features2d.cpp
+++ b/
modules/cudafeatures2d/perf/perf_features2d.cpp
@@
-128,12
+128,12
@@
PERF_TEST_P(Image_NFeatures, ORB,
}
else
{
}
else
{
- cv::
ORB orb(nFeatures)
;
+ cv::
Ptr<cv::ORB> orb
;
std::vector<cv::KeyPoint> cpu_keypoints;
cv::Mat cpu_descriptors;
std::vector<cv::KeyPoint> cpu_keypoints;
cv::Mat cpu_descriptors;
- TEST_CYCLE() orb(img, cv::noArray(), cpu_keypoints, cpu_descriptors);
+ TEST_CYCLE() orb
->detectAndCompute
(img, cv::noArray(), cpu_keypoints, cpu_descriptors);
SANITY_CHECK_KEYPOINTS(cpu_keypoints);
SANITY_CHECK(cpu_descriptors);
SANITY_CHECK_KEYPOINTS(cpu_keypoints);
SANITY_CHECK(cpu_descriptors);
diff --git
a/modules/cudafeatures2d/test/test_features2d.cpp
b/modules/cudafeatures2d/test/test_features2d.cpp
index
ae71a2e
..
8f29616
100644
(file)
--- a/
modules/cudafeatures2d/test/test_features2d.cpp
+++ b/
modules/cudafeatures2d/test/test_features2d.cpp
@@
-185,11
+185,11
@@
CUDA_TEST_P(ORB, Accuracy)
cv::cuda::GpuMat descriptors;
orb(loadMat(image), loadMat(mask), keypoints, descriptors);
cv::cuda::GpuMat descriptors;
orb(loadMat(image), loadMat(mask), keypoints, descriptors);
- cv::
ORB orb_gold(nFeatures, scaleFactor, nLevels, edgeThreshold, firstLevel, WTA_K, scoreType, patchSize)
;
+ cv::
Ptr<cv::ORB> orb_gold
;
std::vector<cv::KeyPoint> keypoints_gold;
cv::Mat descriptors_gold;
std::vector<cv::KeyPoint> keypoints_gold;
cv::Mat descriptors_gold;
- orb_gold(image, mask, keypoints_gold, descriptors_gold);
+ orb_gold
->detectAndCompute
(image, mask, keypoints_gold, descriptors_gold);
cv::BFMatcher matcher(cv::NORM_HAMMING);
std::vector<cv::DMatch> matches;
cv::BFMatcher matcher(cv::NORM_HAMMING);
std::vector<cv::DMatch> matches;
diff --git
a/modules/cudastereo/perf/perf_stereo.cpp
b/modules/cudastereo/perf/perf_stereo.cpp
index
68650cd
..
766bb16
100644
(file)
--- a/
modules/cudastereo/perf/perf_stereo.cpp
+++ b/
modules/cudastereo/perf/perf_stereo.cpp
@@
-79,7
+79,7
@@
PERF_TEST_P(ImagePair, StereoBM,
}
else
{
}
else
{
- cv::Ptr<cv::StereoBM> bm = cv::createStereoBM(ndisp);
+ cv::Ptr<cv::StereoBM> bm = cv::c
uda::c
reateStereoBM(ndisp);
cv::Mat dst;
cv::Mat dst;