Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed unused includes

Browse Source
pull/836/head
Vladislav Vinogradov 12 years ago
parent 623c7da747
commit 77aafc2984
5 changed files with 5 additions and 175 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      modules/gpu/include/opencv2/gpu.hpp
  2. 11
      modules/gpu/perf/perf_precomp.hpp
  3. 9
      modules/gpu/perf4au/main.cpp
  4. 35
      modules/gpu/src/precomp.hpp
  5. 22
      modules/gpu/test/test_precomp.hpp

103
modules/gpu/include/opencv2/gpu.hpp
Unescape View File

@ -43,12 +43,6 @@
#ifndef __OPENCV_GPU_HPP__
#define __OPENCV_GPU_HPP__
#ifndef SKIP_INCLUDES
#include <vector>
#include <memory>
#include <iosfwd>
#endif
#include "opencv2/core/gpumat.hpp"
#include "opencv2/gpuarithm.hpp"
#include "opencv2/gpufilters.hpp"
@ -58,100 +52,7 @@
#include "opencv2/gpucalib3d.hpp"
#include "opencv2/gpuobjdetect.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/objdetect.hpp"
#include "opencv2/features2d.hpp"
namespace cv { namespace gpu {
////////////////////////////// Image processing //////////////////////////////
///////////////////////////// Calibration 3D //////////////////////////////////
//////////////////////////////// Image Labeling ////////////////////////////////
////////////////////////////////// Histograms //////////////////////////////////
//////////////////////////////// StereoBM_GPU ////////////////////////////////
////////////////////////// StereoBeliefPropagation ///////////////////////////
/////////////////////////// StereoConstantSpaceBP ///////////////////////////
/////////////////////////// DisparityBilateralFilter ///////////////////////////
////////////////////////////////// BruteForceMatcher //////////////////////////////////
template <class Distance>
class CV_EXPORTS BruteForceMatcher_GPU;
template <typename T>
class CV_EXPORTS BruteForceMatcher_GPU< L1<T> > : public BFMatcher_GPU
{
public:
explicit BruteForceMatcher_GPU() : BFMatcher_GPU(NORM_L1) {}
explicit BruteForceMatcher_GPU(L1<T> /*d*/) : BFMatcher_GPU(NORM_L1) {}
};
template <typename T>
class CV_EXPORTS BruteForceMatcher_GPU< L2<T> > : public BFMatcher_GPU
{
public:
explicit BruteForceMatcher_GPU() : BFMatcher_GPU(NORM_L2) {}
explicit BruteForceMatcher_GPU(L2<T> /*d*/) : BFMatcher_GPU(NORM_L2) {}
};
template <> class CV_EXPORTS BruteForceMatcher_GPU< Hamming > : public BFMatcher_GPU
{
public:
explicit BruteForceMatcher_GPU() : BFMatcher_GPU(NORM_HAMMING) {}
explicit BruteForceMatcher_GPU(Hamming /*d*/) : BFMatcher_GPU(NORM_HAMMING) {}
};
////////////////////////////////// CascadeClassifier_GPU //////////////////////////////////////////
////////////////////////////////// FAST //////////////////////////////////////////
////////////////////////////////// ORB //////////////////////////////////////////
//! removes points (CV_32FC2, single row matrix) with zero mask value
CV_EXPORTS void compactPoints(GpuMat &points0, GpuMat &points1, const GpuMat &mask);
@ -160,8 +61,6 @@ CV_EXPORTS void calcWobbleSuppressionMaps(
int left, int idx, int right, Size size, const Mat &ml, const Mat &mr,
GpuMat &mapx, GpuMat &mapy);
} // namespace gpu
} // namespace cv
}} // namespace cv { namespace gpu {
#endif /* __OPENCV_GPU_HPP__ */

11
modules/gpu/perf/perf_precomp.hpp
Unescape View File

@ -51,21 +51,10 @@
#ifndef __OPENCV_PERF_PRECOMP_HPP__
#define __OPENCV_PERF_PRECOMP_HPP__
#include <cstdio>
#include <iostream>
#include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp"
#include "opencv2/core.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/gpu.hpp"
#include "opencv2/calib3d.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/video.hpp"
#include "opencv2/photo.hpp"
#include "opencv2/core/gpu_private.hpp"
#ifdef GTEST_CREATE_SHARED_LIBRARY
#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined

9
modules/gpu/perf4au/main.cpp
Unescape View File

@ -40,18 +40,13 @@
//
//M*/
#include <cstdio>
#include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp"
#ifdef HAVE_CVCONFIG_H
#include "cvconfig.h"
#endif
#include "opencv2/core.hpp"
#include "opencv2/gpu.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/video.hpp"
#include "opencv2/legacy.hpp"
#include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp"
int main(int argc, char* argv[])
{

35
modules/gpu/src/precomp.hpp
Unescape View File

@ -43,43 +43,8 @@
#ifndef __OPENCV_PRECOMP_H__
#define __OPENCV_PRECOMP_H__
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( disable: 4251 4710 4711 4514 4996 )
#endif
#include <cstring>
#include <iostream>
#include <limits>
#include <vector>
#include <algorithm>
#include <sstream>
#include <exception>
#include <iterator>
#include <functional>
#include <utility>
#include <deque>
#include <stdexcept>
#include <memory>
#include "opencv2/core.hpp"
#include "opencv2/core/utility.hpp"
#include "opencv2/gpu.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/calib3d.hpp"
#include "opencv2/video.hpp"
#include "opencv2/core/private.hpp"
#include "opencv2/core/gpu_private.hpp"
#ifdef HAVE_CUDA
#ifdef HAVE_CUFFT
#include <cufft.h>
#endif
#include "internal_shared.hpp"
#include "opencv2/core/stream_accessor.hpp"
#include "opencv2/gpunvidia.hpp"
#endif /* defined(HAVE_CUDA) */
#endif /* __OPENCV_PRECOMP_H__ */

22
modules/gpu/test/test_precomp.hpp
Unescape View File

@ -51,29 +51,11 @@
#ifndef __OPENCV_TEST_PRECOMP_HPP__
#define __OPENCV_TEST_PRECOMP_HPP__
#include <cmath>
#include <ctime>
#include <cstdio>
#include <iostream>
#include <fstream>
#include <functional>
#include <sstream>
#include <string>
#include <limits>
#include <algorithm>
#include <iterator>
#include <stdexcept>
#include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp"
#include "opencv2/core.hpp"
#include "opencv2/core/opengl.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/calib3d.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/video.hpp"
#include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp"
#include "opencv2/gpu.hpp"
#include "opencv2/core/gpu_private.hpp"
#endif

Write Preview
Loading…
Cancel
Save