From ee18397f587a1479905ef31e514d5028bf8e62f4 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Mon, 15 Aug 2011 13:03:59 +0000 Subject: [PATCH] added CameraInfo class into opencv_stitching --- modules/stitching/camera.cpp | 31 +++++++++++++++++++ modules/stitching/camera.hpp | 58 ++++++++++++++++++++++++++++++++++++ modules/stitching/main.cpp | 1 + 3 files changed, 90 insertions(+) create mode 100644 modules/stitching/camera.cpp create mode 100644 modules/stitching/camera.hpp diff --git a/modules/stitching/camera.cpp b/modules/stitching/camera.cpp new file mode 100644 index 000000000..a81776adc --- /dev/null +++ b/modules/stitching/camera.cpp @@ -0,0 +1,31 @@ +#include +#include "camera.hpp" + +using namespace std; +using namespace cv; + + +CameraInfo CameraInfo::load(const string &path) +{ + FileStorage fs(path, FileStorage::READ); + CV_Assert(fs.isOpened()); + + CameraInfo cam; + if (!fs["R"].isNone()) + fs["R"] >> cam.R; + if (!fs["K"].isNone()) + fs["K"] >> cam.K; + return cam; +} + + +void CameraInfo::save(const string &path) +{ + FileStorage fs(path, FileStorage::WRITE); + CV_Assert(fs.isOpened()); + + if (!R.empty()) + fs << "R" << R; + if (!K.empty()) + fs << "K" << K; +} diff --git a/modules/stitching/camera.hpp b/modules/stitching/camera.hpp new file mode 100644 index 000000000..9d18a605a --- /dev/null +++ b/modules/stitching/camera.hpp @@ -0,0 +1,58 @@ +/*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*/ +#ifndef __OPENCV_CAMERA_HPP__ +#define __OPENCV_CAMERA_HPP__ + +#include "precomp.hpp" + + +class CameraInfo +{ +public: + static CameraInfo load(const std::string &path); + void save(const std::string &path); + + cv::Mat R; + cv::Mat K; +}; + +#endif // #ifndef __OPENCV_CAMERA_HPP__ diff --git a/modules/stitching/main.cpp b/modules/stitching/main.cpp index 1ebe774d3..ea4b33172 100644 --- a/modules/stitching/main.cpp +++ b/modules/stitching/main.cpp @@ -56,6 +56,7 @@ #include "seam_finders.hpp" #include "motion_estimators.hpp" #include "exposure_compensate.hpp" +#include "camera.hpp" using namespace std; using namespace cv;