Merged the trunk r8547:8574, r8587

This commit is contained in:
Andrey Kamaev
2012-06-15 08:36:35 +00:00
parent 4b1724aeb9
commit ab20da0f53
12 changed files with 133 additions and 33 deletions

View File

@@ -45,13 +45,13 @@
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "warpers.hpp"
#include "detail/matchers.hpp"
#include "detail/motion_estimators.hpp"
#include "detail/exposure_compensate.hpp"
#include "detail/seam_finders.hpp"
#include "detail/blenders.hpp"
#include "detail/camera.hpp"
#include "opencv2/stitching/warpers.hpp"
#include "opencv2/stitching/detail/matchers.hpp"
#include "opencv2/stitching/detail/motion_estimators.hpp"
#include "opencv2/stitching/detail/exposure_compensate.hpp"
#include "opencv2/stitching/detail/seam_finders.hpp"
#include "opencv2/stitching/detail/blenders.hpp"
#include "opencv2/stitching/detail/camera.hpp"
namespace cv {

View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_STITCHING_WARPER_CREATORS_HPP__
#define __OPENCV_STITCHING_WARPER_CREATORS_HPP__
#include "detail/warpers.hpp"
#include "opencv2/stitching/detail/warpers.hpp"
namespace cv {