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

Merge pull request #645 from taka-no-me:bump_headers

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-14 11:42:22 +04:00
committed by OpenCV Buildbot
parent b076b69e68 a42a0f5fca
commit d9cd753835
281 changed files with 22107 additions and 21404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/src/matchers.cpp
View File

@@ -50,7 +50,7 @@ using namespace cv::gpu;
#endif
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/nonfree.hpp"
static bool makeUseOfNonfree = initModule_nonfree();
#endif

12
modules/stitching/src/precomp.hpp
View File

@@ -55,9 +55,9 @@
#include <functional>
#include <sstream>
#include <cmath>
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "opencv2/core/internal.hpp"
#include "opencv2/stitching/stitcher.hpp"
#include "opencv2/stitching.hpp"
#include "opencv2/stitching/detail/autocalib.hpp"
#include "opencv2/stitching/detail/blenders.hpp"
#include "opencv2/stitching/detail/camera.hpp"
@@ -67,11 +67,11 @@
#include "opencv2/stitching/detail/seam_finders.hpp"
#include "opencv2/stitching/detail/util.hpp"
#include "opencv2/stitching/detail/warpers.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/calib3d.hpp"
#ifdef HAVE_OPENCV_GPU
# include "opencv2/gpu/gpu.hpp"
# include "opencv2/gpu.hpp"
#endif
#include "../../imgproc/src/gcgraph.hpp"