renamed gpu_private.hpp to private.gpu.hpp

This commit is contained in:
Vladislav Vinogradov 2013-05-30 11:11:40 +04:00
parent 0489489322
commit 439c3574ed
23 changed files with 24 additions and 24 deletions

View File

@ -41,8 +41,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_CORE_GPU_PRIVATE_HPP__ #ifndef __OPENCV_CORE_PRIVATE_GPU_HPP__
#define __OPENCV_CORE_GPU_PRIVATE_HPP__ #define __OPENCV_CORE_PRIVATE_GPU_HPP__
#ifndef __OPENCV_BUILD #ifndef __OPENCV_BUILD
# error this is a private header which should not be used from outside of the OpenCV library # error this is a private header which should not be used from outside of the OpenCV library

View File

@ -49,7 +49,7 @@
#include "opencv2/core/opengl.hpp" #include "opencv2/core/opengl.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>

View File

@ -49,7 +49,7 @@
#include "opencv2/calib3d.hpp" #include "opencv2/calib3d.hpp"
#include "opencv2/objdetect.hpp" #include "opencv2/objdetect.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -50,7 +50,7 @@
#include "opencv2/gpuarithm.hpp" #include "opencv2/gpuarithm.hpp"
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -50,6 +50,6 @@
#include "opencv2/gpufilters.hpp" #include "opencv2/gpufilters.hpp"
#include "opencv2/gpuimgproc.hpp" #include "opencv2/gpuimgproc.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#endif /* __OPENCV_PRECOMP_H__ */ #endif /* __OPENCV_PRECOMP_H__ */

View File

@ -43,7 +43,7 @@
#ifndef __CUVUD_VIDEO_SOURCE_H__ #ifndef __CUVUD_VIDEO_SOURCE_H__
#define __CUVUD_VIDEO_SOURCE_H__ #define __CUVUD_VIDEO_SOURCE_H__
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include "thread.h" #include "thread.h"

View File

@ -44,7 +44,7 @@
#define __FRAME_QUEUE_H__ #define __FRAME_QUEUE_H__
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include <nvcuvid.h> #include <nvcuvid.h>

View File

@ -52,7 +52,7 @@
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
#include <nvcuvid.h> #include <nvcuvid.h>

View File

@ -43,7 +43,7 @@
#ifndef __VIDEO_DECODER_H__ #ifndef __VIDEO_DECODER_H__
#define __VIDEO_DECODER_H__ #define __VIDEO_DECODER_H__
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include <nvcuvid.h> #include <nvcuvid.h>

View File

@ -43,7 +43,7 @@
#ifndef __VIDEO_PARSER_H__ #ifndef __VIDEO_PARSER_H__
#define __VIDEO_PARSER_H__ #define __VIDEO_PARSER_H__
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/gpucodec.hpp" #include "opencv2/gpucodec.hpp"
#include "frame_queue.h" #include "frame_queue.h"
#include "video_decoder.h" #include "video_decoder.h"

View File

@ -52,6 +52,6 @@
#include "opencv2/gpuwarping.hpp" #include "opencv2/gpuwarping.hpp"
#include "opencv2/features2d.hpp" #include "opencv2/features2d.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#endif /* __OPENCV_PRECOMP_H__ */ #endif /* __OPENCV_PRECOMP_H__ */

View File

@ -48,7 +48,7 @@
#include "opencv2/gpufilters.hpp" #include "opencv2/gpufilters.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -47,7 +47,7 @@
#include "opencv2/gpufilters.hpp" #include "opencv2/gpufilters.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -48,7 +48,7 @@
# error this is a private header which should not be used from outside of the OpenCV library # error this is a private header which should not be used from outside of the OpenCV library
#endif #endif
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#ifndef HAVE_CUDA #ifndef HAVE_CUDA
# error gpulegacy module requires CUDA # error gpulegacy module requires CUDA

View File

@ -56,7 +56,7 @@
# include "opencv2/objdetect.hpp" # include "opencv2/objdetect.hpp"
#endif #endif
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/gpulegacy/private.hpp" #include "opencv2/gpulegacy/private.hpp"
#endif /* __OPENCV_PRECOMP_H__ */ #endif /* __OPENCV_PRECOMP_H__ */

View File

@ -72,7 +72,7 @@
#include "opencv2/gpulegacy.hpp" #include "opencv2/gpulegacy.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "NCVTest.hpp" #include "NCVTest.hpp"
#include "NCVAutoTestLister.hpp" #include "NCVAutoTestLister.hpp"

View File

@ -51,7 +51,7 @@
#include "opencv2/gpuimgproc.hpp" #include "opencv2/gpuimgproc.hpp"
#include "opencv2/video.hpp" #include "opencv2/video.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -47,6 +47,6 @@
#include "opencv2/gpustereo.hpp" #include "opencv2/gpustereo.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#endif /* __OPENCV_PRECOMP_H__ */ #endif /* __OPENCV_PRECOMP_H__ */

View File

@ -45,7 +45,7 @@
#include "opencv2/gpuwarping.hpp" #include "opencv2/gpuwarping.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -50,7 +50,7 @@
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/gpu.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -43,7 +43,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/photo/gpu.hpp" #include "opencv2/photo/gpu.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

View File

@ -47,7 +47,7 @@
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
namespace cv { namespace softcascade { namespace internal namespace cv { namespace softcascade { namespace internal
{ {

View File

@ -55,7 +55,7 @@
#include "opencv2/video/tracking.hpp" #include "opencv2/video/tracking.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/core/gpu_private.hpp" #include "opencv2/core/private.gpu.hpp"
#ifdef HAVE_OPENCV_GPUARITHM #ifdef HAVE_OPENCV_GPUARITHM
# include "opencv2/gpuarithm.hpp" # include "opencv2/gpuarithm.hpp"