From 439c3574edf6e314599872cff4a2a01f0db18f5c Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 30 May 2013 11:11:40 +0400 Subject: [PATCH] renamed gpu_private.hpp to private.gpu.hpp --- .../include/opencv2/core/{gpu_private.hpp => private.gpu.hpp} | 4 ++-- modules/core/src/precomp.hpp | 2 +- modules/gpu/src/precomp.hpp | 2 +- modules/gpuarithm/src/precomp.hpp | 2 +- modules/gpubgsegm/src/precomp.hpp | 2 +- modules/gpucodec/src/cuvid_video_source.h | 2 +- modules/gpucodec/src/frame_queue.h | 2 +- modules/gpucodec/src/precomp.hpp | 2 +- modules/gpucodec/src/video_decoder.h | 2 +- modules/gpucodec/src/video_parser.h | 2 +- modules/gpufeatures2d/src/precomp.hpp | 2 +- modules/gpufilters/src/precomp.hpp | 2 +- modules/gpuimgproc/src/precomp.hpp | 2 +- modules/gpulegacy/include/opencv2/gpulegacy/private.hpp | 2 +- modules/gpulegacy/src/precomp.hpp | 2 +- modules/gpulegacy/test/test_precomp.hpp | 2 +- modules/gpuoptflow/src/precomp.hpp | 2 +- modules/gpustereo/src/precomp.hpp | 2 +- modules/gpuwarping/src/precomp.hpp | 2 +- modules/nonfree/src/precomp.hpp | 2 +- modules/photo/src/denoising_gpu.cpp | 2 +- modules/softcascade/src/precomp.hpp | 2 +- modules/superres/src/precomp.hpp | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) rename modules/core/include/opencv2/core/{gpu_private.hpp => private.gpu.hpp} (98%) diff --git a/modules/core/include/opencv2/core/gpu_private.hpp b/modules/core/include/opencv2/core/private.gpu.hpp similarity index 98% rename from modules/core/include/opencv2/core/gpu_private.hpp rename to modules/core/include/opencv2/core/private.gpu.hpp index cacc194b9..d26cd0017 100644 --- a/modules/core/include/opencv2/core/gpu_private.hpp +++ b/modules/core/include/opencv2/core/private.gpu.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_GPU_PRIVATE_HPP__ -#define __OPENCV_CORE_GPU_PRIVATE_HPP__ +#ifndef __OPENCV_CORE_PRIVATE_GPU_HPP__ +#define __OPENCV_CORE_PRIVATE_GPU_HPP__ #ifndef __OPENCV_BUILD # error this is a private header which should not be used from outside of the OpenCV library diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp index f86f466f2..1a59f6e7b 100644 --- a/modules/core/src/precomp.hpp +++ b/modules/core/src/precomp.hpp @@ -49,7 +49,7 @@ #include "opencv2/core/opengl.hpp" #include "opencv2/core/private.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include #include diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp index ceb560f93..cfd136aa3 100644 --- a/modules/gpu/src/precomp.hpp +++ b/modules/gpu/src/precomp.hpp @@ -49,7 +49,7 @@ #include "opencv2/calib3d.hpp" #include "opencv2/objdetect.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/gpuarithm/src/precomp.hpp b/modules/gpuarithm/src/precomp.hpp index 5dbef9981..6aab36a71 100644 --- a/modules/gpuarithm/src/precomp.hpp +++ b/modules/gpuarithm/src/precomp.hpp @@ -50,7 +50,7 @@ #include "opencv2/gpuarithm.hpp" #include "opencv2/core/utility.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/gpubgsegm/src/precomp.hpp b/modules/gpubgsegm/src/precomp.hpp index a381857af..5f120961b 100644 --- a/modules/gpubgsegm/src/precomp.hpp +++ b/modules/gpubgsegm/src/precomp.hpp @@ -50,6 +50,6 @@ #include "opencv2/gpufilters.hpp" #include "opencv2/gpuimgproc.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #endif /* __OPENCV_PRECOMP_H__ */ diff --git a/modules/gpucodec/src/cuvid_video_source.h b/modules/gpucodec/src/cuvid_video_source.h index a0b78222d..a4a0e8521 100644 --- a/modules/gpucodec/src/cuvid_video_source.h +++ b/modules/gpucodec/src/cuvid_video_source.h @@ -43,7 +43,7 @@ #ifndef __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 "thread.h" diff --git a/modules/gpucodec/src/frame_queue.h b/modules/gpucodec/src/frame_queue.h index 51e3bcedb..d9a4433b3 100644 --- a/modules/gpucodec/src/frame_queue.h +++ b/modules/gpucodec/src/frame_queue.h @@ -44,7 +44,7 @@ #define __FRAME_QUEUE_H__ #include "opencv2/core/utility.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include diff --git a/modules/gpucodec/src/precomp.hpp b/modules/gpucodec/src/precomp.hpp index 9db176e66..c8580c9fe 100644 --- a/modules/gpucodec/src/precomp.hpp +++ b/modules/gpucodec/src/precomp.hpp @@ -52,7 +52,7 @@ #include "opencv2/gpucodec.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #ifdef HAVE_NVCUVID #include diff --git a/modules/gpucodec/src/video_decoder.h b/modules/gpucodec/src/video_decoder.h index e31ec1a0d..7a36335cc 100644 --- a/modules/gpucodec/src/video_decoder.h +++ b/modules/gpucodec/src/video_decoder.h @@ -43,7 +43,7 @@ #ifndef __VIDEO_DECODER_H__ #define __VIDEO_DECODER_H__ -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/gpucodec.hpp" #include diff --git a/modules/gpucodec/src/video_parser.h b/modules/gpucodec/src/video_parser.h index a26dd3eb7..e11b7eff6 100644 --- a/modules/gpucodec/src/video_parser.h +++ b/modules/gpucodec/src/video_parser.h @@ -43,7 +43,7 @@ #ifndef __VIDEO_PARSER_H__ #define __VIDEO_PARSER_H__ -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/gpucodec.hpp" #include "frame_queue.h" #include "video_decoder.h" diff --git a/modules/gpufeatures2d/src/precomp.hpp b/modules/gpufeatures2d/src/precomp.hpp index 9fbecc71e..33c5aa7d3 100644 --- a/modules/gpufeatures2d/src/precomp.hpp +++ b/modules/gpufeatures2d/src/precomp.hpp @@ -52,6 +52,6 @@ #include "opencv2/gpuwarping.hpp" #include "opencv2/features2d.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #endif /* __OPENCV_PRECOMP_H__ */ diff --git a/modules/gpufilters/src/precomp.hpp b/modules/gpufilters/src/precomp.hpp index e8e46ffda..3add0f2af 100644 --- a/modules/gpufilters/src/precomp.hpp +++ b/modules/gpufilters/src/precomp.hpp @@ -48,7 +48,7 @@ #include "opencv2/gpufilters.hpp" #include "opencv2/imgproc.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/gpuimgproc/src/precomp.hpp b/modules/gpuimgproc/src/precomp.hpp index 00cca1701..1417c874b 100644 --- a/modules/gpuimgproc/src/precomp.hpp +++ b/modules/gpuimgproc/src/precomp.hpp @@ -47,7 +47,7 @@ #include "opencv2/gpufilters.hpp" #include "opencv2/core/private.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp b/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp index b8c9dd50a..26c76d4dd 100644 --- a/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp +++ b/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp @@ -48,7 +48,7 @@ # error this is a private header which should not be used from outside of the OpenCV library #endif -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #ifndef HAVE_CUDA # error gpulegacy module requires CUDA diff --git a/modules/gpulegacy/src/precomp.hpp b/modules/gpulegacy/src/precomp.hpp index c871296b2..85e6f88e7 100644 --- a/modules/gpulegacy/src/precomp.hpp +++ b/modules/gpulegacy/src/precomp.hpp @@ -56,7 +56,7 @@ # include "opencv2/objdetect.hpp" #endif -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/gpulegacy/private.hpp" #endif /* __OPENCV_PRECOMP_H__ */ diff --git a/modules/gpulegacy/test/test_precomp.hpp b/modules/gpulegacy/test/test_precomp.hpp index 90fc4d2fa..90485a90a 100644 --- a/modules/gpulegacy/test/test_precomp.hpp +++ b/modules/gpulegacy/test/test_precomp.hpp @@ -72,7 +72,7 @@ #include "opencv2/gpulegacy.hpp" #include "opencv2/highgui.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "NCVTest.hpp" #include "NCVAutoTestLister.hpp" diff --git a/modules/gpuoptflow/src/precomp.hpp b/modules/gpuoptflow/src/precomp.hpp index 27743b457..8a52a9ae9 100644 --- a/modules/gpuoptflow/src/precomp.hpp +++ b/modules/gpuoptflow/src/precomp.hpp @@ -51,7 +51,7 @@ #include "opencv2/gpuimgproc.hpp" #include "opencv2/video.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/gpustereo/src/precomp.hpp b/modules/gpustereo/src/precomp.hpp index a552d5ff3..963cb4d07 100644 --- a/modules/gpustereo/src/precomp.hpp +++ b/modules/gpustereo/src/precomp.hpp @@ -47,6 +47,6 @@ #include "opencv2/gpustereo.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #endif /* __OPENCV_PRECOMP_H__ */ diff --git a/modules/gpuwarping/src/precomp.hpp b/modules/gpuwarping/src/precomp.hpp index 52cc69a34..e19853712 100644 --- a/modules/gpuwarping/src/precomp.hpp +++ b/modules/gpuwarping/src/precomp.hpp @@ -45,7 +45,7 @@ #include "opencv2/gpuwarping.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp index f89e1566e..7563be228 100644 --- a/modules/nonfree/src/precomp.hpp +++ b/modules/nonfree/src/precomp.hpp @@ -50,7 +50,7 @@ #include "opencv2/core/private.hpp" #include "opencv2/nonfree/gpu.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/photo/src/denoising_gpu.cpp b/modules/photo/src/denoising_gpu.cpp index 954b1611b..2c1fabe14 100644 --- a/modules/photo/src/denoising_gpu.cpp +++ b/modules/photo/src/denoising_gpu.cpp @@ -43,7 +43,7 @@ #include "precomp.hpp" #include "opencv2/photo/gpu.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/softcascade/src/precomp.hpp b/modules/softcascade/src/precomp.hpp index 194aec56d..ac8eed4e4 100644 --- a/modules/softcascade/src/precomp.hpp +++ b/modules/softcascade/src/precomp.hpp @@ -47,7 +47,7 @@ #include "opencv2/imgproc.hpp" #include "opencv2/core/private.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" namespace cv { namespace softcascade { namespace internal { diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp index 300894ecf..f3c993e42 100644 --- a/modules/superres/src/precomp.hpp +++ b/modules/superres/src/precomp.hpp @@ -55,7 +55,7 @@ #include "opencv2/video/tracking.hpp" #include "opencv2/core/private.hpp" -#include "opencv2/core/gpu_private.hpp" +#include "opencv2/core/private.gpu.hpp" #ifdef HAVE_OPENCV_GPUARITHM # include "opencv2/gpuarithm.hpp"