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

implemented images pairwise matching via TBB (opencv_stitching), added procomp.hpp

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-05-23 11:31:02 +00:00
parent ae6d5252ab
commit 4827fbf326
19 changed files with 891 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
modules/stitching/main.cpp
View File

@@ -1,5 +1,45 @@
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
/*M///////////////////////////////////////////////////////////////////////////////////////
//
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
//
// By downloading, copying, installing or using the software you agree to this license.
// If you do not agree to this license, do not download, install,
// copy or use the software.
//
//
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// * Redistribution's of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// * Redistribution's in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// * The name of the copyright holders may not be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// This software is provided by the copyright holders and contributors "as is" and
// any express or implied warranties, including, but not limited to, the implied
// warranties of merchantability and fitness for a particular purpose are disclaimed.
// In no event shall the Intel Corporation or contributors be liable for any direct,
// indirect, incidental, special, exemplary, or consequential damages
// (including, but not limited to, procurement of substitute goods or services;
// loss of use, data, or profits; or business interruption) however caused
// and on any theory of liability, whether in contract, strict liability,
// or tort (including negligence or otherwise) arising in any way out of
// the use of this software, even if advised of the possibility of such damage.
//
//M*/
#include "precomp.hpp"
#include "util.hpp"
#include "warpers.hpp"
#include "blenders.hpp"
@@ -45,7 +85,7 @@ bool wave_correct = true;
int warp_type = Warper::SPHERICAL;
bool user_match_conf = false;
float match_conf = 0.6f;
int seam_find_type = SeamFinder::VORONOI;
int seam_find_type = SeamFinder::GRAPH_CUT;
int blend_type = Blender::MULTI_BAND;
int numbands = 5;
string result_name = "result.png";
@@ -212,7 +252,7 @@ int main(int argc, char* argv[])
double work_scale = 1, seam_scale = 1, compose_scale = 1;
bool is_work_scale_set = false, is_seam_scale_set = false, is_compose_scale_set = false;
LOGLN("Reading images and finding features...");
LOGLN("Finding features...");
int64 t = getTickCount();
vector<ImageFeatures> features(num_images);
@@ -262,7 +302,7 @@ int main(int argc, char* argv[])
full_img.release();
img.release();
LOGLN("Reading images and finding features, time: " << ((getTickCount() - t) / getTickFrequency()) << " sec");
LOGLN("Finding features, time: " << ((getTickCount() - t) / getTickFrequency()) << " sec");
LOGLN("Pairwise matching... ");
t = getTickCount();
@@ -301,7 +341,7 @@ int main(int argc, char* argv[])
Mat R;
cameras[i].R.convertTo(R, CV_32F);
cameras[i].R = R;
LOGLN("Initial focal length " << i << ": " << cameras[i].focal);
LOGLN("Initial focal length #" << i << ": " << cameras[i].focal);
}
LOGLN("Bundle adjustment... ");
@@ -327,7 +367,7 @@ int main(int argc, char* argv[])
vector<double> focals;
for (size_t i = 0; i < cameras.size(); ++i)
{
LOGLN("Camera focal length " << i << ": " << cameras[i].focal);
LOGLN("Camera #" << i << " focal length: " << cameras[i].focal);
focals.push_back(cameras[i].focal);
}
nth_element(focals.begin(), focals.end(), focals.begin() + focals.size() / 2);