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

refactored features finders in stitching module

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-09-07 12:48:48 +00:00
parent 6d09dd5cf7
commit cbb6ac0c34
5 changed files with 106 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/cpp/stitching_detailed.cpp
View File

@@ -326,10 +326,16 @@ int main(int argc, char* argv[])
LOGLN("Finding features...");
int64 t = getTickCount();
vector<ImageFeatures> features(num_images);
SurfFeaturesFinder finder(try_gpu);
Mat full_img, img;
Ptr<FeaturesFinder> finder;
#ifndef ANDROID
if (try_gpu && gpu::getCudaEnabledDeviceCount() > 0)
finder = new SurfFeaturesFinderGpu();
else
#endif
finder = new SurfFeaturesFinder();
Mat full_img, img;
vector<ImageFeatures> features(num_images);
vector<Mat> images(num_images);
vector<Size> full_img_sizes(num_images);
double seam_work_aspect = 1;
@@ -366,7 +372,7 @@ int main(int argc, char* argv[])
is_seam_scale_set = true;
}
finder(img, features[i]);
(*finder)(img, features[i]);
features[i].img_idx = i;
LOGLN("Features in image #" << i+1 << ": " << features[i].keypoints.size());
@@ -374,8 +380,7 @@ int main(int argc, char* argv[])
images[i] = img.clone();
}
finder.collectGarbage();
finder->collectGarbage();
full_img.release();
img.release();