From a34fbf7bb19a28863d4f1e7b2334663d61722d36 Mon Sep 17 00:00:00 2001 From: sourin Date: Fri, 30 Sep 2016 15:16:29 +0530 Subject: [PATCH] Fixed identifiers warns --- apps/traincascade/old_ml.hpp | 6 +++--- apps/traincascade/old_ml_precomp.hpp | 4 ++-- include/opencv/cv.h | 4 ++-- include/opencv/cv.hpp | 4 ++-- include/opencv/cvaux.h | 4 ++-- include/opencv/cvaux.hpp | 4 ++-- include/opencv/cvwimage.h | 4 ++-- include/opencv/cxcore.h | 4 ++-- include/opencv/cxcore.hpp | 4 ++-- include/opencv/cxeigen.hpp | 4 ++-- include/opencv/cxmisc.h | 4 ++-- include/opencv/highgui.h | 4 ++-- include/opencv/ml.h | 4 ++-- include/opencv2/opencv.hpp | 4 ++-- modules/calib3d/include/opencv2/calib3d.hpp | 4 ++-- modules/calib3d/include/opencv2/calib3d/calib3d_c.h | 6 +++--- modules/core/include/opencv2/core.hpp | 6 +++--- modules/core/include/opencv2/core/affine.hpp | 6 +++--- modules/core/include/opencv2/core/base.hpp | 6 +++--- modules/core/include/opencv2/core/bufferpool.hpp | 6 +++--- modules/core/include/opencv2/core/core_c.h | 4 ++-- modules/core/include/opencv2/core/cuda.hpp | 6 +++--- modules/core/include/opencv2/core/cuda.inl.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/block.hpp | 6 +++--- .../core/include/opencv2/core/cuda/border_interpolate.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/color.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/common.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/datamov_utils.hpp | 6 +++--- .../core/include/opencv2/core/cuda/detail/color_detail.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/detail/reduce.hpp | 6 +++--- .../include/opencv2/core/cuda/detail/reduce_key_val.hpp | 6 +++--- .../include/opencv2/core/cuda/detail/transform_detail.hpp | 6 +++--- .../include/opencv2/core/cuda/detail/type_traits_detail.hpp | 6 +++--- .../opencv2/core/cuda/detail/vec_distance_detail.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/dynamic_smem.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/filters.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/funcattrib.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/functional.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/limits.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/reduce.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/saturate_cast.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/scan.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/simd_functions.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/transform.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/type_traits.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/utility.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/vec_distance.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/vec_math.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/vec_traits.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/warp.hpp | 6 +++--- modules/core/include/opencv2/core/cuda/warp_shuffle.hpp | 6 +++--- modules/core/include/opencv2/core/cuda_stream_accessor.hpp | 6 +++--- modules/core/include/opencv2/core/cuda_types.hpp | 6 +++--- modules/core/include/opencv2/core/cvdef.h | 6 +++--- modules/core/include/opencv2/core/cvstd.hpp | 6 +++--- modules/core/include/opencv2/core/cvstd.inl.hpp | 6 +++--- modules/core/include/opencv2/core/directx.hpp | 6 +++--- modules/core/include/opencv2/core/eigen.hpp | 4 ++-- modules/core/include/opencv2/core/fast_math.hpp | 4 ++-- modules/core/include/opencv2/core/hal/hal.hpp | 6 +++--- modules/core/include/opencv2/core/hal/intrin.hpp | 4 ++-- modules/core/include/opencv2/core/hal/intrin_cpp.hpp | 4 ++-- modules/core/include/opencv2/core/hal/intrin_neon.hpp | 4 ++-- modules/core/include/opencv2/core/hal/intrin_sse.hpp | 4 ++-- modules/core/include/opencv2/core/ippasync.hpp | 4 ++-- modules/core/include/opencv2/core/mat.hpp | 6 +++--- modules/core/include/opencv2/core/mat.inl.hpp | 4 ++-- modules/core/include/opencv2/core/matx.hpp | 6 +++--- modules/core/include/opencv2/core/neon_utils.hpp | 6 +++--- modules/core/include/opencv2/core/ocl.hpp | 4 ++-- modules/core/include/opencv2/core/ocl_genbase.hpp | 4 ++-- modules/core/include/opencv2/core/opencl/opencl_svm.hpp | 6 +++--- .../core/opencl/runtime/autogenerated/opencl_clamdblas.hpp | 2 +- .../core/opencl/runtime/autogenerated/opencl_clamdfft.hpp | 2 +- .../core/opencl/runtime/autogenerated/opencl_core.hpp | 2 +- .../opencl/runtime/autogenerated/opencl_core_wrappers.hpp | 2 +- .../opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp | 2 +- .../opencl/runtime/autogenerated/opencl_gl_wrappers.hpp | 2 +- .../opencv2/core/opencl/runtime/opencl_clamdblas.hpp | 6 +++--- .../include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp | 6 +++--- .../include/opencv2/core/opencl/runtime/opencl_core.hpp | 6 +++--- .../opencv2/core/opencl/runtime/opencl_core_wrappers.hpp | 6 +++--- .../core/include/opencv2/core/opencl/runtime/opencl_gl.hpp | 6 +++--- .../opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp | 6 +++--- .../include/opencv2/core/opencl/runtime/opencl_svm_20.hpp | 6 +++--- .../opencv2/core/opencl/runtime/opencl_svm_definitions.hpp | 6 +++--- .../core/opencl/runtime/opencl_svm_hsa_extension.hpp | 6 +++--- modules/core/include/opencv2/core/opengl.hpp | 6 +++--- modules/core/include/opencv2/core/operations.hpp | 4 ++-- modules/core/include/opencv2/core/optim.hpp | 4 ++-- modules/core/include/opencv2/core/persistence.hpp | 6 +++--- modules/core/include/opencv2/core/private.cuda.hpp | 6 +++--- modules/core/include/opencv2/core/private.hpp | 6 +++--- modules/core/include/opencv2/core/ptr.inl.hpp | 6 +++--- modules/core/include/opencv2/core/saturate.hpp | 6 +++--- modules/core/include/opencv2/core/sse_utils.hpp | 6 +++--- modules/core/include/opencv2/core/traits.hpp | 6 +++--- modules/core/include/opencv2/core/types.hpp | 6 +++--- modules/core/include/opencv2/core/types_c.h | 6 +++--- modules/core/include/opencv2/core/utility.hpp | 6 +++--- modules/core/include/opencv2/core/va_intel.hpp | 6 +++--- modules/core/include/opencv2/core/version.hpp | 4 ++-- modules/core/include/opencv2/core/wimage.hpp | 4 ++-- modules/cudaarithm/include/opencv2/cudaarithm.hpp | 6 +++--- modules/cudabgsegm/include/opencv2/cudabgsegm.hpp | 6 +++--- modules/cudabgsegm/perf/perf_precomp.hpp | 4 ++-- modules/cudabgsegm/src/precomp.hpp | 6 +++--- modules/cudabgsegm/test/test_precomp.hpp | 4 ++-- modules/cudacodec/include/opencv2/cudacodec.hpp | 6 +++--- modules/cudacodec/perf/perf_precomp.hpp | 4 ++-- modules/cudacodec/src/precomp.hpp | 6 +++--- modules/cudacodec/test/test_precomp.hpp | 4 ++-- modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp | 6 +++--- modules/cudafilters/include/opencv2/cudafilters.hpp | 6 +++--- modules/cudaimgproc/include/opencv2/cudaimgproc.hpp | 6 +++--- modules/cudalegacy/include/opencv2/cudalegacy.hpp | 6 +++--- modules/cudalegacy/include/opencv2/cudalegacy/private.hpp | 6 +++--- modules/cudaobjdetect/include/opencv2/cudaobjdetect.hpp | 6 +++--- modules/cudaoptflow/include/opencv2/cudaoptflow.hpp | 6 +++--- modules/cudastereo/include/opencv2/cudastereo.hpp | 6 +++--- modules/cudawarping/include/opencv2/cudawarping.hpp | 6 +++--- modules/cudev/include/opencv2/cudev.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/block/block.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/block/detail/reduce.hpp | 4 ++-- .../include/opencv2/cudev/block/detail/reduce_key_val.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/block/dynamic_smem.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/block/reduce.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/block/scan.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/block/vec_distance.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/common.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/binary_func.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/binary_op.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/color.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/deriv.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/expr.hpp | 4 ++-- .../cudev/include/opencv2/cudev/expr/per_element_func.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/reduction.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/unary_func.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/unary_op.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/expr/warping.hpp | 4 ++-- .../cudev/include/opencv2/cudev/functional/color_cvt.hpp | 4 ++-- .../include/opencv2/cudev/functional/detail/color_cvt.hpp | 4 ++-- .../cudev/include/opencv2/cudev/functional/functional.hpp | 4 ++-- .../include/opencv2/cudev/functional/tuple_adapter.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/copy.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/detail/copy.hpp | 4 ++-- .../cudev/include/opencv2/cudev/grid/detail/histogram.hpp | 4 ++-- .../cudev/include/opencv2/cudev/grid/detail/integral.hpp | 4 ++-- .../cudev/include/opencv2/cudev/grid/detail/minmaxloc.hpp | 4 ++-- .../cudev/include/opencv2/cudev/grid/detail/pyr_down.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/detail/pyr_up.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp | 4 ++-- .../include/opencv2/cudev/grid/detail/reduce_to_column.hpp | 4 ++-- .../include/opencv2/cudev/grid/detail/reduce_to_row.hpp | 4 ++-- .../cudev/include/opencv2/cudev/grid/detail/split_merge.hpp | 4 ++-- .../cudev/include/opencv2/cudev/grid/detail/transform.hpp | 4 ++-- .../cudev/include/opencv2/cudev/grid/detail/transpose.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/histogram.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/integral.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/pyramids.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/reduce.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/reduce_to_vec.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/split_merge.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/transform.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/grid/transpose.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/constant.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/deriv.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/detail/gpumat.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/extrapolation.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/glob.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/gpumat.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/interpolation.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/lut.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/mask.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/remap.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/resize.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/texture.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/traits.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/transform.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/warping.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/ptr2d/zip.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/atomic.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/detail/tuple.hpp | 4 ++-- .../cudev/include/opencv2/cudev/util/detail/type_traits.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/limits.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/simd_functions.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/tuple.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/type_traits.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/vec_math.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/util/vec_traits.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/warp/detail/reduce.hpp | 4 ++-- .../include/opencv2/cudev/warp/detail/reduce_key_val.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/warp/reduce.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/warp/scan.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/warp/shuffle.hpp | 4 ++-- modules/cudev/include/opencv2/cudev/warp/warp.hpp | 4 ++-- modules/features2d/include/opencv2/features2d.hpp | 4 ++-- modules/flann/include/opencv2/flann.hpp | 4 ++-- modules/flann/include/opencv2/flann/miniflann.hpp | 4 ++-- modules/flann/src/precomp.hpp | 4 ++-- modules/flann/test/test_precomp.hpp | 4 ++-- modules/highgui/include/opencv2/highgui.hpp | 4 ++-- modules/highgui/include/opencv2/highgui/highgui_c.h | 4 ++-- modules/imgcodecs/include/opencv2/imgcodecs.hpp | 6 +++--- modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h | 6 +++--- modules/imgproc/include/opencv2/imgproc.hpp | 4 ++-- .../include/opencv2/imgproc/detail/distortion_model.hpp | 6 +++--- modules/imgproc/include/opencv2/imgproc/imgproc_c.h | 4 ++-- modules/imgproc/include/opencv2/imgproc/types_c.h | 4 ++-- modules/ml/include/opencv2/ml.hpp | 6 +++--- modules/objdetect/include/opencv2/objdetect.hpp | 4 ++-- .../include/opencv2/objdetect/detection_based_tracker.hpp | 4 ++-- modules/objdetect/include/opencv2/objdetect/objdetect_c.h | 6 +++--- modules/photo/include/opencv2/photo.hpp | 4 ++-- modules/photo/include/opencv2/photo/cuda.hpp | 6 +++--- modules/photo/include/opencv2/photo/photo_c.h | 6 +++--- modules/shape/include/opencv2/shape.hpp | 4 ++-- modules/shape/include/opencv2/shape/emdL1.hpp | 4 ++-- modules/shape/include/opencv2/shape/hist_cost.hpp | 4 ++-- modules/shape/include/opencv2/shape/shape_distance.hpp | 4 ++-- modules/shape/include/opencv2/shape/shape_transformer.hpp | 4 ++-- modules/stitching/include/opencv2/stitching.hpp | 6 +++--- .../include/opencv2/stitching/detail/autocalib.hpp | 6 +++--- .../stitching/include/opencv2/stitching/detail/blenders.hpp | 6 +++--- .../stitching/include/opencv2/stitching/detail/camera.hpp | 6 +++--- .../opencv2/stitching/detail/exposure_compensate.hpp | 6 +++--- .../stitching/include/opencv2/stitching/detail/matchers.hpp | 6 +++--- .../include/opencv2/stitching/detail/motion_estimators.hpp | 6 +++--- .../include/opencv2/stitching/detail/seam_finders.hpp | 6 +++--- .../include/opencv2/stitching/detail/timelapsers.hpp | 6 +++--- modules/stitching/include/opencv2/stitching/detail/util.hpp | 6 +++--- .../stitching/include/opencv2/stitching/detail/util_inl.hpp | 6 +++--- .../stitching/include/opencv2/stitching/detail/warpers.hpp | 6 +++--- .../include/opencv2/stitching/detail/warpers_inl.hpp | 6 +++--- modules/stitching/include/opencv2/stitching/warpers.hpp | 6 +++--- modules/superres/include/opencv2/superres.hpp | 6 +++--- modules/superres/include/opencv2/superres/optical_flow.hpp | 6 +++--- modules/ts/include/opencv2/ts.hpp | 4 ++-- modules/ts/include/opencv2/ts/cuda_perf.hpp | 6 +++--- modules/ts/include/opencv2/ts/cuda_test.hpp | 6 +++--- modules/ts/include/opencv2/ts/ocl_perf.hpp | 6 +++--- modules/ts/include/opencv2/ts/ocl_test.hpp | 6 +++--- modules/ts/include/opencv2/ts/ts_ext.hpp | 6 +++--- modules/ts/include/opencv2/ts/ts_perf.hpp | 6 +++--- modules/video/include/opencv2/video.hpp | 6 +++--- modules/video/include/opencv2/video/background_segm.hpp | 4 ++-- modules/video/include/opencv2/video/tracking.hpp | 4 ++-- modules/video/include/opencv2/video/tracking_c.h | 6 +++--- modules/videoio/include/opencv2/videoio.hpp | 6 +++--- modules/videoio/include/opencv2/videoio/videoio_c.h | 6 +++--- modules/videostab/include/opencv2/videostab.hpp | 4 ++-- modules/videostab/include/opencv2/videostab/deblurring.hpp | 4 ++-- .../videostab/include/opencv2/videostab/fast_marching.hpp | 4 ++-- .../include/opencv2/videostab/fast_marching_inl.hpp | 4 ++-- .../videostab/include/opencv2/videostab/frame_source.hpp | 4 ++-- .../videostab/include/opencv2/videostab/global_motion.hpp | 4 ++-- modules/videostab/include/opencv2/videostab/inpainting.hpp | 4 ++-- modules/videostab/include/opencv2/videostab/log.hpp | 4 ++-- modules/videostab/include/opencv2/videostab/motion_core.hpp | 4 ++-- .../include/opencv2/videostab/motion_stabilizing.hpp | 4 ++-- .../videostab/include/opencv2/videostab/optical_flow.hpp | 4 ++-- .../include/opencv2/videostab/outlier_rejection.hpp | 4 ++-- modules/videostab/include/opencv2/videostab/ring_buffer.hpp | 4 ++-- modules/videostab/include/opencv2/videostab/stabilizer.hpp | 4 ++-- .../include/opencv2/videostab/wobble_suppression.hpp | 4 ++-- modules/viz/include/opencv2/viz.hpp | 6 +++--- modules/viz/include/opencv2/viz/types.hpp | 4 ++-- modules/viz/include/opencv2/viz/viz3d.hpp | 4 ++-- modules/viz/include/opencv2/viz/vizcore.hpp | 6 +++--- modules/viz/include/opencv2/viz/widget_accessor.hpp | 4 ++-- modules/viz/include/opencv2/viz/widgets.hpp | 4 ++-- modules/world/include/opencv2/world.hpp | 4 ++-- 273 files changed, 657 insertions(+), 657 deletions(-) diff --git a/apps/traincascade/old_ml.hpp b/apps/traincascade/old_ml.hpp index bf0cd15f97..1fe8b1ae52 100644 --- a/apps/traincascade/old_ml.hpp +++ b/apps/traincascade/old_ml.hpp @@ -38,8 +38,8 @@ // //M*/ -#ifndef __OPENCV_ML_HPP__ -#define __OPENCV_ML_HPP__ +#ifndef OPENCV_ML_HPP +#define OPENCV_ML_HPP #ifdef __cplusplus # include "opencv2/core.hpp" @@ -2063,6 +2063,6 @@ template<> void DefaultDeleter::operator ()(CvDTreeSplit* obj) con } #endif // __cplusplus -#endif // __OPENCV_ML_HPP__ +#endif // OPENCV_ML_HPP /* End of file. */ diff --git a/apps/traincascade/old_ml_precomp.hpp b/apps/traincascade/old_ml_precomp.hpp index 32ae269818..003c1f7e40 100644 --- a/apps/traincascade/old_ml_precomp.hpp +++ b/apps/traincascade/old_ml_precomp.hpp @@ -38,8 +38,8 @@ // //M*/ -#ifndef __OPENCV_PRECOMP_H__ -#define __OPENCV_PRECOMP_H__ +#ifndef OPENCV_PRECOMP_H +#define OPENCV_PRECOMP_H #include "opencv2/core.hpp" #include "old_ml.hpp" diff --git a/include/opencv/cv.h b/include/opencv/cv.h index 0aefc6d277..19a74e297c 100644 --- a/include/opencv/cv.h +++ b/include/opencv/cv.h @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_OLD_CV_H__ -#define __OPENCV_OLD_CV_H__ +#ifndef OPENCV_OLD_CV_H +#define OPENCV_OLD_CV_H #if defined(_MSC_VER) #define CV_DO_PRAGMA(x) __pragma(x) diff --git a/include/opencv/cv.hpp b/include/opencv/cv.hpp index e498d7ac1a..867395644b 100644 --- a/include/opencv/cv.hpp +++ b/include/opencv/cv.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_OLD_CV_HPP__ -#define __OPENCV_OLD_CV_HPP__ +#ifndef OPENCV_OLD_CV_HPP +#define OPENCV_OLD_CV_HPP //#if defined(__GNUC__) //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" diff --git a/include/opencv/cvaux.h b/include/opencv/cvaux.h index fe86c5d98b..c0367cc25b 100644 --- a/include/opencv/cvaux.h +++ b/include/opencv/cvaux.h @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_OLD_AUX_H__ -#define __OPENCV_OLD_AUX_H__ +#ifndef OPENCV_OLD_AUX_H +#define OPENCV_OLD_AUX_H //#if defined(__GNUC__) //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" diff --git a/include/opencv/cvaux.hpp b/include/opencv/cvaux.hpp index b0e60a3038..4888eef282 100644 --- a/include/opencv/cvaux.hpp +++ b/include/opencv/cvaux.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_OLD_AUX_HPP__ -#define __OPENCV_OLD_AUX_HPP__ +#ifndef OPENCV_OLD_AUX_HPP +#define OPENCV_OLD_AUX_HPP //#if defined(__GNUC__) //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" diff --git a/include/opencv/cvwimage.h b/include/opencv/cvwimage.h index de89c9270b..ec0ab141d9 100644 --- a/include/opencv/cvwimage.h +++ b/include/opencv/cvwimage.h @@ -38,8 +38,8 @@ // the use of this software, even if advised of the possibility of such damage. -#ifndef __OPENCV_OLD_WIMAGE_HPP__ -#define __OPENCV_OLD_WIMAGE_HPP__ +#ifndef OPENCV_OLD_WIMAGE_HPP +#define OPENCV_OLD_WIMAGE_HPP #include "opencv2/core/wimage.hpp" diff --git a/include/opencv/cxcore.h b/include/opencv/cxcore.h index 0982bd7508..dc070c77d2 100644 --- a/include/opencv/cxcore.h +++ b/include/opencv/cxcore.h @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_OLD_CXCORE_H__ -#define __OPENCV_OLD_CXCORE_H__ +#ifndef OPENCV_OLD_CXCORE_H +#define OPENCV_OLD_CXCORE_H //#if defined(__GNUC__) //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" diff --git a/include/opencv/cxcore.hpp b/include/opencv/cxcore.hpp index 9af4ac7460..c371677c93 100644 --- a/include/opencv/cxcore.hpp +++ b/include/opencv/cxcore.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_OLD_CXCORE_HPP__ -#define __OPENCV_OLD_CXCORE_HPP__ +#ifndef OPENCV_OLD_CXCORE_HPP +#define OPENCV_OLD_CXCORE_HPP //#if defined(__GNUC__) //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module" diff --git a/include/opencv/cxeigen.hpp b/include/opencv/cxeigen.hpp index 1f04d1a3a2..1d3df914ac 100644 --- a/include/opencv/cxeigen.hpp +++ b/include/opencv/cxeigen.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_OLD_EIGEN_HPP__ -#define __OPENCV_OLD_EIGEN_HPP__ +#ifndef OPENCV_OLD_EIGEN_HPP +#define OPENCV_OLD_EIGEN_HPP #include "opencv2/core/eigen.hpp" diff --git a/include/opencv/cxmisc.h b/include/opencv/cxmisc.h index 6c93a0cce4..9b9bc8204b 100644 --- a/include/opencv/cxmisc.h +++ b/include/opencv/cxmisc.h @@ -1,5 +1,5 @@ -#ifndef __OPENCV_OLD_CXMISC_H__ -#define __OPENCV_OLD_CXMISC_H__ +#ifndef OPENCV_OLD_CXMISC_H +#define OPENCV_OLD_CXMISC_H #ifdef __cplusplus # include "opencv2/core/utility.hpp" diff --git a/include/opencv/highgui.h b/include/opencv/highgui.h index 0261029c09..69b394e08a 100644 --- a/include/opencv/highgui.h +++ b/include/opencv/highgui.h @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_OLD_HIGHGUI_H__ -#define __OPENCV_OLD_HIGHGUI_H__ +#ifndef OPENCV_OLD_HIGHGUI_H +#define OPENCV_OLD_HIGHGUI_H #include "opencv2/core/core_c.h" #include "opencv2/highgui/highgui_c.h" diff --git a/include/opencv/ml.h b/include/opencv/ml.h index d8e967f81b..0c376bacb9 100644 --- a/include/opencv/ml.h +++ b/include/opencv/ml.h @@ -38,8 +38,8 @@ // //M*/ -#ifndef __OPENCV_OLD_ML_H__ -#define __OPENCV_OLD_ML_H__ +#ifndef OPENCV_OLD_ML_H +#define OPENCV_OLD_ML_H #include "opencv2/core/core_c.h" #include "opencv2/ml.hpp" diff --git a/include/opencv2/opencv.hpp b/include/opencv2/opencv.hpp index 49b6a6691f..e43bb71a04 100644 --- a/include/opencv2/opencv.hpp +++ b/include/opencv2/opencv.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_ALL_HPP__ -#define __OPENCV_ALL_HPP__ +#ifndef OPENCV_ALL_HPP +#define OPENCV_ALL_HPP #include "opencv2/opencv_modules.hpp" diff --git a/modules/calib3d/include/opencv2/calib3d.hpp b/modules/calib3d/include/opencv2/calib3d.hpp index 6d1253fc36..2ec2094140 100644 --- a/modules/calib3d/include/opencv2/calib3d.hpp +++ b/modules/calib3d/include/opencv2/calib3d.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CALIB3D_HPP__ -#define __OPENCV_CALIB3D_HPP__ +#ifndef OPENCV_CALIB3D_HPP +#define OPENCV_CALIB3D_HPP #include "opencv2/core.hpp" #include "opencv2/features2d.hpp" diff --git a/modules/calib3d/include/opencv2/calib3d/calib3d_c.h b/modules/calib3d/include/opencv2/calib3d/calib3d_c.h index ebb9b523f6..1069b5845e 100644 --- a/modules/calib3d/include/opencv2/calib3d/calib3d_c.h +++ b/modules/calib3d/include/opencv2/calib3d/calib3d_c.h @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CALIB3D_C_H__ -#define __OPENCV_CALIB3D_C_H__ +#ifndef OPENCV_CALIB3D_C_H +#define OPENCV_CALIB3D_C_H #include "opencv2/core/core_c.h" @@ -423,4 +423,4 @@ public: #endif -#endif /* __OPENCV_CALIB3D_C_H__ */ +#endif /* OPENCV_CALIB3D_C_H */ diff --git a/modules/core/include/opencv2/core.hpp b/modules/core/include/opencv2/core.hpp index d875ce2d76..aa515b95e6 100644 --- a/modules/core/include/opencv2/core.hpp +++ b/modules/core/include/opencv2/core.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_HPP__ -#define __OPENCV_CORE_HPP__ +#ifndef OPENCV_CORE_HPP +#define OPENCV_CORE_HPP #ifndef __cplusplus # error core.hpp header must be compiled as C++ @@ -3186,4 +3186,4 @@ template<> struct ParamType #include "opencv2/core/utility.hpp" #include "opencv2/core/optim.hpp" -#endif /*__OPENCV_CORE_HPP__*/ +#endif /*OPENCV_CORE_HPP*/ diff --git a/modules/core/include/opencv2/core/affine.hpp b/modules/core/include/opencv2/core/affine.hpp index 7f8deb5d77..311ff62637 100644 --- a/modules/core/include/opencv2/core/affine.hpp +++ b/modules/core/include/opencv2/core/affine.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_AFFINE3_HPP__ -#define __OPENCV_CORE_AFFINE3_HPP__ +#ifndef OPENCV_CORE_AFFINE3_HPP +#define OPENCV_CORE_AFFINE3_HPP #ifdef __cplusplus @@ -514,4 +514,4 @@ cv::Affine3::operator Eigen::Transform() const #endif /* __cplusplus */ -#endif /* __OPENCV_CORE_AFFINE3_HPP__ */ +#endif /* OPENCV_CORE_AFFINE3_HPP */ diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index ed633f5dcc..afc574c9c8 100644 --- a/modules/core/include/opencv2/core/base.hpp +++ b/modules/core/include/opencv2/core/base.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_BASE_HPP__ -#define __OPENCV_CORE_BASE_HPP__ +#ifndef OPENCV_CORE_BASE_HPP +#define OPENCV_CORE_BASE_HPP #ifndef __cplusplus # error base.hpp header must be compiled as C++ @@ -686,4 +686,4 @@ CV_EXPORTS void setUseIPP(bool flag); #include "opencv2/core/neon_utils.hpp" -#endif //__OPENCV_CORE_BASE_HPP__ +#endif //OPENCV_CORE_BASE_HPP diff --git a/modules/core/include/opencv2/core/bufferpool.hpp b/modules/core/include/opencv2/core/bufferpool.hpp index 76df2d29fb..9e7b7c2b27 100644 --- a/modules/core/include/opencv2/core/bufferpool.hpp +++ b/modules/core/include/opencv2/core/bufferpool.hpp @@ -4,8 +4,8 @@ // // Copyright (C) 2014, Advanced Micro Devices, Inc., all rights reserved. -#ifndef __OPENCV_CORE_BUFFER_POOL_HPP__ -#define __OPENCV_CORE_BUFFER_POOL_HPP__ +#ifndef OPENCV_CORE_BUFFER_POOL_HPP +#define OPENCV_CORE_BUFFER_POOL_HPP namespace cv { @@ -28,4 +28,4 @@ public: } -#endif // __OPENCV_CORE_BUFFER_POOL_HPP__ +#endif // OPENCV_CORE_BUFFER_POOL_HPP diff --git a/modules/core/include/opencv2/core/core_c.h b/modules/core/include/opencv2/core/core_c.h index a0ed632642..002fc387b4 100644 --- a/modules/core/include/opencv2/core/core_c.h +++ b/modules/core/include/opencv2/core/core_c.h @@ -42,8 +42,8 @@ //M*/ -#ifndef __OPENCV_CORE_C_H__ -#define __OPENCV_CORE_C_H__ +#ifndef OPENCV_CORE_C_H +#define OPENCV_CORE_C_H #include "opencv2/core/types_c.h" diff --git a/modules/core/include/opencv2/core/cuda.hpp b/modules/core/include/opencv2/core/cuda.hpp index 64bc53ef51..acd4f9df3c 100644 --- a/modules/core/include/opencv2/core/cuda.hpp +++ b/modules/core/include/opencv2/core/cuda.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CUDA_HPP__ -#define __OPENCV_CORE_CUDA_HPP__ +#ifndef OPENCV_CORE_CUDA_HPP +#define OPENCV_CORE_CUDA_HPP #ifndef __cplusplus # error cuda.hpp header must be compiled as C++ @@ -843,4 +843,4 @@ CV_EXPORTS void printShortCudaDeviceInfo(int device); #include "opencv2/core/cuda.inl.hpp" -#endif /* __OPENCV_CORE_CUDA_HPP__ */ +#endif /* OPENCV_CORE_CUDA_HPP */ diff --git a/modules/core/include/opencv2/core/cuda.inl.hpp b/modules/core/include/opencv2/core/cuda.inl.hpp index 01dc6d7c0b..35ae2e49d7 100644 --- a/modules/core/include/opencv2/core/cuda.inl.hpp +++ b/modules/core/include/opencv2/core/cuda.inl.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CUDAINL_HPP__ -#define __OPENCV_CORE_CUDAINL_HPP__ +#ifndef OPENCV_CORE_CUDAINL_HPP +#define OPENCV_CORE_CUDAINL_HPP #include "opencv2/core/cuda.hpp" @@ -628,4 +628,4 @@ Mat::Mat(const cuda::GpuMat& m) //! @endcond -#endif // __OPENCV_CORE_CUDAINL_HPP__ +#endif // OPENCV_CORE_CUDAINL_HPP diff --git a/modules/core/include/opencv2/core/cuda/block.hpp b/modules/core/include/opencv2/core/cuda/block.hpp index 0c6f0636bb..330cf1d7bb 100644 --- a/modules/core/include/opencv2/core/cuda/block.hpp +++ b/modules/core/include/opencv2/core/cuda/block.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_DEVICE_BLOCK_HPP__ -#define __OPENCV_CUDA_DEVICE_BLOCK_HPP__ +#ifndef OPENCV_CUDA_DEVICE_BLOCK_HPP +#define OPENCV_CUDA_DEVICE_BLOCK_HPP /** @file * @deprecated Use @ref cudev instead. @@ -208,4 +208,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif /* __OPENCV_CUDA_DEVICE_BLOCK_HPP__ */ +#endif /* OPENCV_CUDA_DEVICE_BLOCK_HPP */ diff --git a/modules/core/include/opencv2/core/cuda/border_interpolate.hpp b/modules/core/include/opencv2/core/cuda/border_interpolate.hpp index a2041559a2..874f705baf 100644 --- a/modules/core/include/opencv2/core/cuda/border_interpolate.hpp +++ b/modules/core/include/opencv2/core/cuda/border_interpolate.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_BORDER_INTERPOLATE_HPP__ -#define __OPENCV_CUDA_BORDER_INTERPOLATE_HPP__ +#ifndef OPENCV_CUDA_BORDER_INTERPOLATE_HPP +#define OPENCV_CUDA_BORDER_INTERPOLATE_HPP #include "saturate_cast.hpp" #include "vec_traits.hpp" @@ -719,4 +719,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_BORDER_INTERPOLATE_HPP__ +#endif // OPENCV_CUDA_BORDER_INTERPOLATE_HPP diff --git a/modules/core/include/opencv2/core/cuda/color.hpp b/modules/core/include/opencv2/core/cuda/color.hpp index 6faf8c9c5c..5a3e330011 100644 --- a/modules/core/include/opencv2/core/cuda/color.hpp +++ b/modules/core/include/opencv2/core/cuda/color.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_COLOR_HPP__ -#define __OPENCV_CUDA_COLOR_HPP__ +#ifndef OPENCV_CUDA_COLOR_HPP +#define OPENCV_CUDA_COLOR_HPP #include "detail/color_detail.hpp" @@ -306,4 +306,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_BORDER_INTERPOLATE_HPP__ +#endif // OPENCV_CUDA_BORDER_INTERPOLATE_HPP diff --git a/modules/core/include/opencv2/core/cuda/common.hpp b/modules/core/include/opencv2/core/cuda/common.hpp index b93c3efdcc..14b1f3f5ae 100644 --- a/modules/core/include/opencv2/core/cuda/common.hpp +++ b/modules/core/include/opencv2/core/cuda/common.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_COMMON_HPP__ -#define __OPENCV_CUDA_COMMON_HPP__ +#ifndef OPENCV_CUDA_COMMON_HPP +#define OPENCV_CUDA_COMMON_HPP #include #include "opencv2/core/cuda_types.hpp" @@ -106,4 +106,4 @@ namespace cv { namespace cuda //! @endcond -#endif // __OPENCV_CUDA_COMMON_HPP__ +#endif // OPENCV_CUDA_COMMON_HPP diff --git a/modules/core/include/opencv2/core/cuda/datamov_utils.hpp b/modules/core/include/opencv2/core/cuda/datamov_utils.hpp index bb02cf92df..6820d0fd64 100644 --- a/modules/core/include/opencv2/core/cuda/datamov_utils.hpp +++ b/modules/core/include/opencv2/core/cuda/datamov_utils.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_DATAMOV_UTILS_HPP__ -#define __OPENCV_CUDA_DATAMOV_UTILS_HPP__ +#ifndef OPENCV_CUDA_DATAMOV_UTILS_HPP +#define OPENCV_CUDA_DATAMOV_UTILS_HPP #include "common.hpp" @@ -110,4 +110,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_DATAMOV_UTILS_HPP__ +#endif // OPENCV_CUDA_DATAMOV_UTILS_HPP diff --git a/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp index 1151806764..bfb40550dc 100644 --- a/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/color_detail.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_COLOR_DETAIL_HPP__ -#define __OPENCV_CUDA_COLOR_DETAIL_HPP__ +#ifndef OPENCV_CUDA_COLOR_DETAIL_HPP +#define OPENCV_CUDA_COLOR_DETAIL_HPP #include "../common.hpp" #include "../vec_traits.hpp" @@ -1977,4 +1977,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_COLOR_DETAIL_HPP__ +#endif // OPENCV_CUDA_COLOR_DETAIL_HPP diff --git a/modules/core/include/opencv2/core/cuda/detail/reduce.hpp b/modules/core/include/opencv2/core/cuda/detail/reduce.hpp index 44400c8e1d..ff82c3cc92 100644 --- a/modules/core/include/opencv2/core/cuda/detail/reduce.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/reduce.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_REDUCE_DETAIL_HPP__ -#define __OPENCV_CUDA_REDUCE_DETAIL_HPP__ +#ifndef OPENCV_CUDA_REDUCE_DETAIL_HPP +#define OPENCV_CUDA_REDUCE_DETAIL_HPP #include #include "../warp.hpp" @@ -362,4 +362,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_REDUCE_DETAIL_HPP__ +#endif // OPENCV_CUDA_REDUCE_DETAIL_HPP diff --git a/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp b/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp index bab85d70cd..1178936175 100644 --- a/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP__ -#define __OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP__ +#ifndef OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP_ +#define OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP_ #include #include "../warp.hpp" @@ -499,4 +499,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP__ +#endif // OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP_ diff --git a/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp index 96031c8cde..3b72b03dd6 100644 --- a/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_TRANSFORM_DETAIL_HPP__ -#define __OPENCV_CUDA_TRANSFORM_DETAIL_HPP__ +#ifndef OPENCV_CUDA_TRANSFORM_DETAIL_HPP +#define OPENCV_CUDA_TRANSFORM_DETAIL_HPP #include "../common.hpp" #include "../vec_traits.hpp" @@ -396,4 +396,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_TRANSFORM_DETAIL_HPP__ +#endif // OPENCV_CUDA_TRANSFORM_DETAIL_HPP diff --git a/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp index 3463c78fec..a78bd2c0d8 100644 --- a/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_TYPE_TRAITS_DETAIL_HPP__ -#define __OPENCV_CUDA_TYPE_TRAITS_DETAIL_HPP__ +#ifndef OPENCV_CUDA_TYPE_TRAITS_DETAIL_HPP +#define OPENCV_CUDA_TYPE_TRAITS_DETAIL_HPP #include "../common.hpp" #include "../vec_traits.hpp" @@ -188,4 +188,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_TYPE_TRAITS_DETAIL_HPP__ +#endif // OPENCV_CUDA_TYPE_TRAITS_DETAIL_HPP diff --git a/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp b/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp index 9ca85a539d..8283a99560 100644 --- a/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp +++ b/modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_VEC_DISTANCE_DETAIL_HPP__ -#define __OPENCV_CUDA_VEC_DISTANCE_DETAIL_HPP__ +#ifndef OPENCV_CUDA_VEC_DISTANCE_DETAIL_HPP +#define OPENCV_CUDA_VEC_DISTANCE_DETAIL_HPP #include "../datamov_utils.hpp" @@ -118,4 +118,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_VEC_DISTANCE_DETAIL_HPP__ +#endif // OPENCV_CUDA_VEC_DISTANCE_DETAIL_HPP diff --git a/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp b/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp index 34884638a9..42570c6830 100644 --- a/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp +++ b/modules/core/include/opencv2/core/cuda/dynamic_smem.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_DYNAMIC_SMEM_HPP__ -#define __OPENCV_CUDA_DYNAMIC_SMEM_HPP__ +#ifndef OPENCV_CUDA_DYNAMIC_SMEM_HPP +#define OPENCV_CUDA_DYNAMIC_SMEM_HPP /** @file * @deprecated Use @ref cudev instead. @@ -85,4 +85,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_DYNAMIC_SMEM_HPP__ +#endif // OPENCV_CUDA_DYNAMIC_SMEM_HPP diff --git a/modules/core/include/opencv2/core/cuda/filters.hpp b/modules/core/include/opencv2/core/cuda/filters.hpp index 9adc00c444..c2e24dd6c3 100644 --- a/modules/core/include/opencv2/core/cuda/filters.hpp +++ b/modules/core/include/opencv2/core/cuda/filters.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_FILTERS_HPP__ -#define __OPENCV_CUDA_FILTERS_HPP__ +#ifndef OPENCV_CUDA_FILTERS_HPP +#define OPENCV_CUDA_FILTERS_HPP #include "saturate_cast.hpp" #include "vec_traits.hpp" @@ -283,4 +283,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_FILTERS_HPP__ +#endif // OPENCV_CUDA_FILTERS_HPP diff --git a/modules/core/include/opencv2/core/cuda/funcattrib.hpp b/modules/core/include/opencv2/core/cuda/funcattrib.hpp index fbb236b9e6..f582080488 100644 --- a/modules/core/include/opencv2/core/cuda/funcattrib.hpp +++ b/modules/core/include/opencv2/core/cuda/funcattrib.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP_ -#define __OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP_ +#ifndef OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP +#define OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP #include @@ -76,4 +76,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif /* __OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP_ */ +#endif /* OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP */ diff --git a/modules/core/include/opencv2/core/cuda/functional.hpp b/modules/core/include/opencv2/core/cuda/functional.hpp index ed3943da45..5b8a7eb0ab 100644 --- a/modules/core/include/opencv2/core/cuda/functional.hpp +++ b/modules/core/include/opencv2/core/cuda/functional.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_FUNCTIONAL_HPP__ -#define __OPENCV_CUDA_FUNCTIONAL_HPP__ +#ifndef OPENCV_CUDA_FUNCTIONAL_HPP +#define OPENCV_CUDA_FUNCTIONAL_HPP #include #include "saturate_cast.hpp" @@ -794,4 +794,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_FUNCTIONAL_HPP__ +#endif // OPENCV_CUDA_FUNCTIONAL_HPP diff --git a/modules/core/include/opencv2/core/cuda/limits.hpp b/modules/core/include/opencv2/core/cuda/limits.hpp index b98bdf2294..7e15ed629a 100644 --- a/modules/core/include/opencv2/core/cuda/limits.hpp +++ b/modules/core/include/opencv2/core/cuda/limits.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_LIMITS_HPP__ -#define __OPENCV_CUDA_LIMITS_HPP__ +#ifndef OPENCV_CUDA_LIMITS_HPP +#define OPENCV_CUDA_LIMITS_HPP #include #include @@ -125,4 +125,4 @@ template <> struct numeric_limits //! @endcond -#endif // __OPENCV_CUDA_LIMITS_HPP__ +#endif // OPENCV_CUDA_LIMITS_HPP diff --git a/modules/core/include/opencv2/core/cuda/reduce.hpp b/modules/core/include/opencv2/core/cuda/reduce.hpp index 3133c9a89e..1c14a4dd26 100644 --- a/modules/core/include/opencv2/core/cuda/reduce.hpp +++ b/modules/core/include/opencv2/core/cuda/reduce.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_REDUCE_HPP__ -#define __OPENCV_CUDA_REDUCE_HPP__ +#ifndef OPENCV_CUDA_REDUCE_HPP +#define OPENCV_CUDA_REDUCE_HPP #include #include "detail/reduce.hpp" @@ -202,4 +202,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_UTILITY_HPP__ +#endif // OPENCV_CUDA_UTILITY_HPP diff --git a/modules/core/include/opencv2/core/cuda/saturate_cast.hpp b/modules/core/include/opencv2/core/cuda/saturate_cast.hpp index f55ae4f4a7..c3a3d1cb83 100644 --- a/modules/core/include/opencv2/core/cuda/saturate_cast.hpp +++ b/modules/core/include/opencv2/core/cuda/saturate_cast.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_SATURATE_CAST_HPP__ -#define __OPENCV_CUDA_SATURATE_CAST_HPP__ +#ifndef OPENCV_CUDA_SATURATE_CAST_HPP +#define OPENCV_CUDA_SATURATE_CAST_HPP #include "common.hpp" @@ -289,4 +289,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif /* __OPENCV_CUDA_SATURATE_CAST_HPP__ */ +#endif /* OPENCV_CUDA_SATURATE_CAST_HPP */ diff --git a/modules/core/include/opencv2/core/cuda/scan.hpp b/modules/core/include/opencv2/core/cuda/scan.hpp index 687abb508b..e07ee65373 100644 --- a/modules/core/include/opencv2/core/cuda/scan.hpp +++ b/modules/core/include/opencv2/core/cuda/scan.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_SCAN_HPP__ -#define __OPENCV_CUDA_SCAN_HPP__ +#ifndef OPENCV_CUDA_SCAN_HPP +#define OPENCV_CUDA_SCAN_HPP #include "opencv2/core/cuda/common.hpp" #include "opencv2/core/cuda/utility.hpp" @@ -255,4 +255,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_SCAN_HPP__ +#endif // OPENCV_CUDA_SCAN_HPP diff --git a/modules/core/include/opencv2/core/cuda/simd_functions.hpp b/modules/core/include/opencv2/core/cuda/simd_functions.hpp index b9e0041a0a..3d8c2e0d8e 100644 --- a/modules/core/include/opencv2/core/cuda/simd_functions.hpp +++ b/modules/core/include/opencv2/core/cuda/simd_functions.hpp @@ -70,8 +70,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __OPENCV_CUDA_SIMD_FUNCTIONS_HPP__ -#define __OPENCV_CUDA_SIMD_FUNCTIONS_HPP__ +#ifndef OPENCV_CUDA_SIMD_FUNCTIONS_HPP +#define OPENCV_CUDA_SIMD_FUNCTIONS_HPP #include "common.hpp" @@ -866,4 +866,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_SIMD_FUNCTIONS_HPP__ +#endif // OPENCV_CUDA_SIMD_FUNCTIONS_HPP diff --git a/modules/core/include/opencv2/core/cuda/transform.hpp b/modules/core/include/opencv2/core/cuda/transform.hpp index 08a313df36..42aa6ea170 100644 --- a/modules/core/include/opencv2/core/cuda/transform.hpp +++ b/modules/core/include/opencv2/core/cuda/transform.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_TRANSFORM_HPP__ -#define __OPENCV_CUDA_TRANSFORM_HPP__ +#ifndef OPENCV_CUDA_TRANSFORM_HPP +#define OPENCV_CUDA_TRANSFORM_HPP #include "common.hpp" #include "utility.hpp" @@ -72,4 +72,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_TRANSFORM_HPP__ +#endif // OPENCV_CUDA_TRANSFORM_HPP diff --git a/modules/core/include/opencv2/core/cuda/type_traits.hpp b/modules/core/include/opencv2/core/cuda/type_traits.hpp index f2471ebab0..b8c7ee0034 100644 --- a/modules/core/include/opencv2/core/cuda/type_traits.hpp +++ b/modules/core/include/opencv2/core/cuda/type_traits.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_TYPE_TRAITS_HPP__ -#define __OPENCV_CUDA_TYPE_TRAITS_HPP__ +#ifndef OPENCV_CUDA_REDUCE_DETAIL_HPP +#define OPENCV_CUDA_REDUCE_DETAIL_HPP #include "detail/type_traits_detail.hpp" @@ -87,4 +87,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_TYPE_TRAITS_HPP__ +#endif // OPENCV_CUDA_REDUCE_DETAIL_HPP diff --git a/modules/core/include/opencv2/core/cuda/utility.hpp b/modules/core/include/opencv2/core/cuda/utility.hpp index 5215a61d4c..7f5db48a50 100644 --- a/modules/core/include/opencv2/core/cuda/utility.hpp +++ b/modules/core/include/opencv2/core/cuda/utility.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_UTILITY_HPP__ -#define __OPENCV_CUDA_UTILITY_HPP__ +#ifndef OPENCV_CUDA_UTILITY_HPP +#define OPENCV_CUDA_UTILITY_HPP #include "saturate_cast.hpp" #include "datamov_utils.hpp" @@ -227,4 +227,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_UTILITY_HPP__ +#endif // OPENCV_CUDA_UTILITY_HPP diff --git a/modules/core/include/opencv2/core/cuda/vec_distance.hpp b/modules/core/include/opencv2/core/cuda/vec_distance.hpp index 013b747a4d..ef6e51087d 100644 --- a/modules/core/include/opencv2/core/cuda/vec_distance.hpp +++ b/modules/core/include/opencv2/core/cuda/vec_distance.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_VEC_DISTANCE_HPP__ -#define __OPENCV_CUDA_VEC_DISTANCE_HPP__ +#ifndef OPENCV_CUDA_VEC_DISTANCE_HPP +#define OPENCV_CUDA_VEC_DISTANCE_HPP #include "reduce.hpp" #include "functional.hpp" @@ -229,4 +229,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_VEC_DISTANCE_HPP__ +#endif // OPENCV_CUDA_VEC_DISTANCE_HPP diff --git a/modules/core/include/opencv2/core/cuda/vec_math.hpp b/modules/core/include/opencv2/core/cuda/vec_math.hpp index 8595fb8d0d..9085b92397 100644 --- a/modules/core/include/opencv2/core/cuda/vec_math.hpp +++ b/modules/core/include/opencv2/core/cuda/vec_math.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_VECMATH_HPP__ -#define __OPENCV_CUDA_VECMATH_HPP__ +#ifndef OPENCV_CUDA_VECMATH_HPP +#define OPENCV_CUDA_VECMATH_HPP #include "vec_traits.hpp" #include "saturate_cast.hpp" @@ -927,4 +927,4 @@ CV_CUDEV_IMPLEMENT_SCALAR_BINARY_FUNC(atan2, ::atan2, double, double, double) //! @endcond -#endif // __OPENCV_CUDA_VECMATH_HPP__ +#endif // OPENCV_CUDA_VECMATH_HPP diff --git a/modules/core/include/opencv2/core/cuda/vec_traits.hpp b/modules/core/include/opencv2/core/cuda/vec_traits.hpp index 905e37f582..b5ff281a0b 100644 --- a/modules/core/include/opencv2/core/cuda/vec_traits.hpp +++ b/modules/core/include/opencv2/core/cuda/vec_traits.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_VEC_TRAITS_HPP__ -#define __OPENCV_CUDA_VEC_TRAITS_HPP__ +#ifndef OPENCV_CUDA_VEC_TRAITS_HPP +#define OPENCV_CUDA_VEC_TRAITS_HPP #include "common.hpp" @@ -285,4 +285,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_VEC_TRAITS_HPP__ +#endif // OPENCV_CUDA_VEC_TRAITS_HPP diff --git a/modules/core/include/opencv2/core/cuda/warp.hpp b/modules/core/include/opencv2/core/cuda/warp.hpp index d93afe79c5..ae1f8ea5d2 100644 --- a/modules/core/include/opencv2/core/cuda/warp.hpp +++ b/modules/core/include/opencv2/core/cuda/warp.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_DEVICE_WARP_HPP__ -#define __OPENCV_CUDA_DEVICE_WARP_HPP__ +#ifndef OPENCV_CUDA_DEVICE_WARP_HPP +#define OPENCV_CUDA_DEVICE_WARP_HPP /** @file * @deprecated Use @ref cudev instead. @@ -136,4 +136,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif /* __OPENCV_CUDA_DEVICE_WARP_HPP__ */ +#endif /* OPENCV_CUDA_DEVICE_WARP_HPP */ diff --git a/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp b/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp index 256fc2a684..14a9a4d906 100644 --- a/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp +++ b/modules/core/include/opencv2/core/cuda/warp_shuffle.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_WARP_SHUFFLE_HPP__ -#define __OPENCV_CUDA_WARP_SHUFFLE_HPP__ +#ifndef OPENCV_CUDA_WARP_SHUFFLE_HPP +#define OPENCV_CUDA_WARP_SHUFFLE_HPP /** @file * @deprecated Use @ref cudev instead. @@ -150,4 +150,4 @@ namespace cv { namespace cuda { namespace device //! @endcond -#endif // __OPENCV_CUDA_WARP_SHUFFLE_HPP__ +#endif // OPENCV_CUDA_WARP_SHUFFLE_HPP diff --git a/modules/core/include/opencv2/core/cuda_stream_accessor.hpp b/modules/core/include/opencv2/core/cuda_stream_accessor.hpp index 0f8ee9b2d4..deaf356fff 100644 --- a/modules/core/include/opencv2/core/cuda_stream_accessor.hpp +++ b/modules/core/include/opencv2/core/cuda_stream_accessor.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CUDA_STREAM_ACCESSOR_HPP__ -#define __OPENCV_CORE_CUDA_STREAM_ACCESSOR_HPP__ +#ifndef OPENCV_CORE_CUDA_STREAM_ACCESSOR_HPP +#define OPENCV_CORE_CUDA_STREAM_ACCESSOR_HPP #ifndef __cplusplus # error cuda_stream_accessor.hpp header must be compiled as C++ @@ -83,4 +83,4 @@ namespace cv } } -#endif /* __OPENCV_CORE_CUDA_STREAM_ACCESSOR_HPP__ */ +#endif /* OPENCV_CORE_CUDA_STREAM_ACCESSOR_HPP */ diff --git a/modules/core/include/opencv2/core/cuda_types.hpp b/modules/core/include/opencv2/core/cuda_types.hpp index 8df816e8df..f13a847466 100644 --- a/modules/core/include/opencv2/core/cuda_types.hpp +++ b/modules/core/include/opencv2/core/cuda_types.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CUDA_TYPES_HPP__ -#define __OPENCV_CORE_CUDA_TYPES_HPP__ +#ifndef OPENCV_CORE_CUDA_TYPES_HPP +#define OPENCV_CORE_CUDA_TYPES_HPP #ifndef __cplusplus # error cuda_types.hpp header must be compiled as C++ @@ -132,4 +132,4 @@ namespace cv //! @endcond -#endif /* __OPENCV_CORE_CUDA_TYPES_HPP__ */ +#endif /* OPENCV_CORE_CUDA_TYPES_HPP */ diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index c005914190..64c7c8a513 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CVDEF_H__ -#define __OPENCV_CORE_CVDEF_H__ +#ifndef OPENCV_CORE_CVDEF_H +#define OPENCV_CORE_CVDEF_H //! @addtogroup core_utils //! @{ @@ -451,4 +451,4 @@ Cv64suf; //! @} -#endif // __OPENCV_CORE_CVDEF_H__ +#endif // OPENCV_CORE_CVDEF_H diff --git a/modules/core/include/opencv2/core/cvstd.hpp b/modules/core/include/opencv2/core/cvstd.hpp index f960e767cd..2d40bd069f 100644 --- a/modules/core/include/opencv2/core/cvstd.hpp +++ b/modules/core/include/opencv2/core/cvstd.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CVSTD_HPP__ -#define __OPENCV_CORE_CVSTD_HPP__ +#ifndef OPENCV_CORE_CVSTD_HPP +#define OPENCV_CORE_CVSTD_HPP #ifndef __cplusplus # error cvstd.hpp header must be compiled as C++ @@ -1063,4 +1063,4 @@ namespace cv #include "opencv2/core/ptr.inl.hpp" -#endif //__OPENCV_CORE_CVSTD_HPP__ +#endif //OPENCV_CORE_CVSTD_HPP diff --git a/modules/core/include/opencv2/core/cvstd.inl.hpp b/modules/core/include/opencv2/core/cvstd.inl.hpp index ad154061ef..876def8254 100644 --- a/modules/core/include/opencv2/core/cvstd.inl.hpp +++ b/modules/core/include/opencv2/core/cvstd.inl.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CVSTDINL_HPP__ -#define __OPENCV_CORE_CVSTDINL_HPP__ +#ifndef OPENCV_CORE_CVSTDINL_HPP +#define OPENCV_CORE_CVSTDINL_HPP #ifndef OPENCV_NOSTL # include @@ -264,4 +264,4 @@ std::ostream& operator << (std::ostream& out, const Rect_<_Tp>& rect) //! @endcond -#endif // __OPENCV_CORE_CVSTDINL_HPP__ +#endif // OPENCV_CORE_CVSTDINL_HPP diff --git a/modules/core/include/opencv2/core/directx.hpp b/modules/core/include/opencv2/core/directx.hpp index 764af74d77..056a85a1bc 100644 --- a/modules/core/include/opencv2/core/directx.hpp +++ b/modules/core/include/opencv2/core/directx.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_CORE_DIRECTX_HPP__ -#define __OPENCV_CORE_DIRECTX_HPP__ +#ifndef OPENCV_CORE_DIRECTX_HPP +#define OPENCV_CORE_DIRECTX_HPP #include "mat.hpp" #include "ocl.hpp" @@ -181,4 +181,4 @@ CV_EXPORTS int getTypeFromD3DFORMAT(const int iD3DFORMAT); // enum D3DTYPE for D } } // namespace cv::directx -#endif // __OPENCV_CORE_DIRECTX_HPP__ +#endif // OPENCV_CORE_DIRECTX_HPP diff --git a/modules/core/include/opencv2/core/eigen.hpp b/modules/core/include/opencv2/core/eigen.hpp index 44df04c506..c2f1ee6a83 100644 --- a/modules/core/include/opencv2/core/eigen.hpp +++ b/modules/core/include/opencv2/core/eigen.hpp @@ -42,8 +42,8 @@ //M*/ -#ifndef __OPENCV_CORE_EIGEN_HPP__ -#define __OPENCV_CORE_EIGEN_HPP__ +#ifndef OPENCV_CORE_EIGEN_HPP +#define OPENCV_CORE_EIGEN_HPP #include "opencv2/core.hpp" diff --git a/modules/core/include/opencv2/core/fast_math.hpp b/modules/core/include/opencv2/core/fast_math.hpp index b8b241b026..0b0baf7ca9 100644 --- a/modules/core/include/opencv2/core/fast_math.hpp +++ b/modules/core/include/opencv2/core/fast_math.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_FAST_MATH_HPP__ -#define __OPENCV_CORE_FAST_MATH_HPP__ +#ifndef OPENCV_CORE_FAST_MATH_HPP +#define OPENCV_CORE_FAST_MATH_HPP #include "opencv2/core/cvdef.h" diff --git a/modules/core/include/opencv2/core/hal/hal.hpp b/modules/core/include/opencv2/core/hal/hal.hpp index f254b58582..ca61ce1d15 100644 --- a/modules/core/include/opencv2/core/hal/hal.hpp +++ b/modules/core/include/opencv2/core/hal/hal.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_HAL_HPP__ -#define __OPENCV_HAL_HPP__ +#ifndef OPENCV_HAL_HPP +#define OPENCV_HAL_HPP #include "opencv2/core/cvdef.h" #include "opencv2/core/cvstd.hpp" @@ -245,4 +245,4 @@ CV_EXPORTS void invSqrt(const double* src, double* dst, int len); }} //cv::hal -#endif //__OPENCV_HAL_HPP__ +#endif //OPENCV_HAL_HPP diff --git a/modules/core/include/opencv2/core/hal/intrin.hpp b/modules/core/include/opencv2/core/hal/intrin.hpp index 6da8fdfd1d..34075e3830 100644 --- a/modules/core/include/opencv2/core/hal/intrin.hpp +++ b/modules/core/include/opencv2/core/hal/intrin.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_HAL_INTRIN_HPP__ -#define __OPENCV_HAL_INTRIN_HPP__ +#ifndef OPENCV_HAL_INTRIN_HPP +#define OPENCV_HAL_INTRIN_HPP #include #include diff --git a/modules/core/include/opencv2/core/hal/intrin_cpp.hpp b/modules/core/include/opencv2/core/hal/intrin_cpp.hpp index 04b1d928b2..790da39f82 100644 --- a/modules/core/include/opencv2/core/hal/intrin_cpp.hpp +++ b/modules/core/include/opencv2/core/hal/intrin_cpp.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_HAL_INTRIN_CPP_HPP__ -#define __OPENCV_HAL_INTRIN_CPP_HPP__ +#ifndef OPENCV_HAL_INTRIN_CPP_HPP +#define OPENCV_HAL_INTRIN_CPP_HPP #include #include diff --git a/modules/core/include/opencv2/core/hal/intrin_neon.hpp b/modules/core/include/opencv2/core/hal/intrin_neon.hpp index f3e47ca8ba..01cc2dab45 100644 --- a/modules/core/include/opencv2/core/hal/intrin_neon.hpp +++ b/modules/core/include/opencv2/core/hal/intrin_neon.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_HAL_INTRIN_NEON_HPP__ -#define __OPENCV_HAL_INTRIN_NEON_HPP__ +#ifndef OPENCV_HAL_INTRIN_NEON_HPP +#define OPENCV_HAL_INTRIN_NEON_HPP #include diff --git a/modules/core/include/opencv2/core/hal/intrin_sse.hpp b/modules/core/include/opencv2/core/hal/intrin_sse.hpp index 1840e0305d..db540c761d 100644 --- a/modules/core/include/opencv2/core/hal/intrin_sse.hpp +++ b/modules/core/include/opencv2/core/hal/intrin_sse.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_HAL_SSE_HPP__ -#define __OPENCV_HAL_SSE_HPP__ +#ifndef OPENCV_HAL_SSE_HPP +#define OPENCV_HAL_SSE_HPP #include diff --git a/modules/core/include/opencv2/core/ippasync.hpp b/modules/core/include/opencv2/core/ippasync.hpp index 4de8611dbe..0ed8264e14 100644 --- a/modules/core/include/opencv2/core/ippasync.hpp +++ b/modules/core/include/opencv2/core/ippasync.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_IPPASYNC_HPP__ -#define __OPENCV_CORE_IPPASYNC_HPP__ +#ifndef OPENCV_CORE_IPPASYNC_HPP +#define OPENCV_CORE_IPPASYNC_HPP #ifdef HAVE_IPP_A diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp index a0560a197e..8efe85e4ff 100644 --- a/modules/core/include/opencv2/core/mat.hpp +++ b/modules/core/include/opencv2/core/mat.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_MAT_HPP__ -#define __OPENCV_CORE_MAT_HPP__ +#ifndef OPENCV_CORE_MAT_HPP +#define OPENCV_CORE_MAT_HPP #ifndef __cplusplus # error mat.hpp header must be compiled as C++ @@ -3439,4 +3439,4 @@ CV_EXPORTS MatExpr abs(const MatExpr& e); #include "opencv2/core/mat.inl.hpp" -#endif // __OPENCV_CORE_MAT_HPP__ +#endif // OPENCV_CORE_MAT_HPP diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp index 2ba152f375..d0302139a1 100644 --- a/modules/core/include/opencv2/core/mat.inl.hpp +++ b/modules/core/include/opencv2/core/mat.inl.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_MATRIX_OPERATIONS_HPP__ -#define __OPENCV_CORE_MATRIX_OPERATIONS_HPP__ +#ifndef OPENCV_CORE_MATRIX_OPERATIONS_HPP +#define OPENCV_CORE_MATRIX_OPERATIONS_HPP #ifndef __cplusplus # error mat.inl.hpp header must be compiled as C++ diff --git a/modules/core/include/opencv2/core/matx.hpp b/modules/core/include/opencv2/core/matx.hpp index a4c0fbb115..0d07c3f98b 100644 --- a/modules/core/include/opencv2/core/matx.hpp +++ b/modules/core/include/opencv2/core/matx.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_MATX_HPP__ -#define __OPENCV_CORE_MATX_HPP__ +#ifndef OPENCV_CORE_MATX_HPP +#define OPENCV_CORE_MATX_HPP #ifndef __cplusplus # error matx.hpp header must be compiled as C++ @@ -1404,4 +1404,4 @@ template inline Vec<_Tp, 4>& operator *= (Vec<_Tp, 4>& v1, const V } // cv -#endif // __OPENCV_CORE_MATX_HPP__ +#endif // OPENCV_CORE_MATX_HPP diff --git a/modules/core/include/opencv2/core/neon_utils.hpp b/modules/core/include/opencv2/core/neon_utils.hpp index adb750fd43..573ba99ec3 100644 --- a/modules/core/include/opencv2/core/neon_utils.hpp +++ b/modules/core/include/opencv2/core/neon_utils.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_HAL_NEON_UTILS_HPP__ -#define __OPENCV_HAL_NEON_UTILS_HPP__ +#ifndef OPENCV_HAL_NEON_UTILS_HPP +#define OPENCV_HAL_NEON_UTILS_HPP #include "opencv2/core/cvdef.h" @@ -125,4 +125,4 @@ inline float32x2_t cv_vsqrt_f32(float32x2_t val) //! @} -#endif // __OPENCV_HAL_NEON_UTILS_HPP__ +#endif // OPENCV_HAL_NEON_UTILS_HPP diff --git a/modules/core/include/opencv2/core/ocl.hpp b/modules/core/include/opencv2/core/ocl.hpp index fbaebc7dc9..8bbead49d5 100644 --- a/modules/core/include/opencv2/core/ocl.hpp +++ b/modules/core/include/opencv2/core/ocl.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_OPENCL_HPP__ -#define __OPENCV_OPENCL_HPP__ +#ifndef OPENCV_OPENCL_HPP +#define OPENCV_OPENCL_HPP #include "opencv2/core.hpp" diff --git a/modules/core/include/opencv2/core/ocl_genbase.hpp b/modules/core/include/opencv2/core/ocl_genbase.hpp index d53bc1abb7..5408958bc9 100644 --- a/modules/core/include/opencv2/core/ocl_genbase.hpp +++ b/modules/core/include/opencv2/core/ocl_genbase.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_OPENCL_GENBASE_HPP__ -#define __OPENCV_OPENCL_GENBASE_HPP__ +#ifndef OPENCV_OPENCL_GENBASE_HPP +#define OPENCV_OPENCL_GENBASE_HPP namespace cv { diff --git a/modules/core/include/opencv2/core/opencl/opencl_svm.hpp b/modules/core/include/opencv2/core/opencl/opencl_svm.hpp index e9f7ba0232..7453082a67 100644 --- a/modules/core/include/opencv2/core/opencl/opencl_svm.hpp +++ b/modules/core/include/opencv2/core/opencl/opencl_svm.hpp @@ -1,7 +1,7 @@ /* See LICENSE file in the root OpenCV directory */ -#ifndef __OPENCV_CORE_OPENCL_SVM_HPP__ -#define __OPENCV_CORE_OPENCL_SVM_HPP__ +#ifndef OPENCV_CORE_OPENCL_SVM_HPP +#define OPENCV_CORE_OPENCL_SVM_HPP // // Internal usage only (binary compatibility is not guaranteed) @@ -77,5 +77,5 @@ CV_EXPORTS bool useSVM(UMatUsageFlags usageFlags); }}} //namespace cv::ocl::svm #endif -#endif // __OPENCV_CORE_OPENCL_SVM_HPP__ +#endif // OPENCV_CORE_OPENCL_SVM_HPP /* End of file. */ diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp index bb1e2f70c0..65c8493524 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp @@ -1,7 +1,7 @@ // // AUTOGENERATED, DO NOT EDIT // -#ifndef __OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP #error "Invalid usage" #endif diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp index 325145cab4..1457d7eb8d 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp @@ -1,7 +1,7 @@ // // AUTOGENERATED, DO NOT EDIT // -#ifndef __OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP #error "Invalid usage" #endif diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp index 801709e2c0..eb9521fdfe 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp @@ -1,7 +1,7 @@ // // AUTOGENERATED, DO NOT EDIT // -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP #error "Invalid usage" #endif diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp index cf64b08d69..216b22b8a8 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp @@ -1,7 +1,7 @@ // // AUTOGENERATED, DO NOT EDIT // -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP #error "Invalid usage" #endif diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp index 1ad4a6acc2..468f9691b5 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp @@ -1,7 +1,7 @@ // // AUTOGENERATED, DO NOT EDIT // -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP #error "Invalid usage" #endif diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp index 8338ac6817..12f342b2e4 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp @@ -1,7 +1,7 @@ // // AUTOGENERATED, DO NOT EDIT // -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP #error "Invalid usage" #endif diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp index b19f9114fc..039ea97ac3 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP +#define OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP #ifdef HAVE_CLAMDBLAS @@ -56,4 +56,4 @@ #endif // HAVE_CLAMDBLAS -#endif // __OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_CLAMDBLAS_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp index 0af9307f2e..94037e9e71 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP +#define OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP #ifdef HAVE_CLAMDFFT @@ -56,4 +56,4 @@ #endif // HAVE_CLAMDFFT -#endif // __OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_CLAMDFFT_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp index bd30f813d7..f86dfc0d8d 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP +#define OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP #ifdef HAVE_OPENCL @@ -92,4 +92,4 @@ #endif // HAVE_OPENCL -#endif // __OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_CORE_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp index 912429fb5d..38fcae9952 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp @@ -39,9 +39,9 @@ // //M*/ -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP +#define OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP #include "autogenerated/opencl_core_wrappers.hpp" -#endif // __OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_WRAPPERS_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_gl.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_gl.hpp index 7c7a82e9ea..47531654f3 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_gl.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_gl.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP +#define OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP #if defined HAVE_OPENCL && defined HAVE_OPENGL @@ -62,4 +62,4 @@ #endif // defined HAVE_OPENCL && defined HAVE_OPENGL -#endif // __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp index 9327d2ede6..9700004cae 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp @@ -39,9 +39,9 @@ // //M*/ -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP +#define OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP #include "autogenerated/opencl_gl_wrappers.hpp" -#endif // __OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_WRAPPERS_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp index 7f0ff91d12..29b78e032b 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp @@ -1,7 +1,7 @@ /* See LICENSE file in the root OpenCV directory */ -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_2_0_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_2_0_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_2_0_HPP +#define OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_2_0_HPP #if defined(HAVE_OPENCL_SVM) #include "opencl_core.hpp" @@ -49,4 +49,4 @@ extern CL_RUNTIME_EXPORT cl_int (CL_API_CALL *clEnqueueSVMUnmap)(cl_command_queu #endif // HAVE_OPENCL_SVM -#endif // __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_2_0_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_2_0_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp index a4fd5fc810..97c927b44d 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp @@ -1,7 +1,7 @@ /* See LICENSE file in the root OpenCV directory */ -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_DEFINITIONS_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_DEFINITIONS_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_DEFINITIONS_HPP +#define OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_DEFINITIONS_HPP #if defined(HAVE_OPENCL_SVM) #if defined(CL_VERSION_2_0) @@ -39,4 +39,4 @@ typedef cl_uint cl_kernel_exec_info; #endif // CL_VERSION_2_0 #endif // HAVE_OPENCL_SVM -#endif // __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_DEFINITIONS_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_DEFINITIONS_HPP diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp index 9e50408f06..497bc3de72 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp @@ -1,7 +1,7 @@ /* See LICENSE file in the root OpenCV directory */ -#ifndef __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_HSA_EXTENSION_HPP__ -#define __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_HSA_EXTENSION_HPP__ +#ifndef OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_HSA_EXTENSION_HPP +#define OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_HSA_EXTENSION_HPP #if defined(HAVE_OPENCL_SVM) #include "opencl_core.hpp" @@ -163,4 +163,4 @@ typedef CL_API_ENTRY cl_int #endif // HAVE_OPENCL_SVM -#endif // __OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_HSA_EXTENSION_HPP__ +#endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_HSA_EXTENSION_HPP diff --git a/modules/core/include/opencv2/core/opengl.hpp b/modules/core/include/opencv2/core/opengl.hpp index fd47c520e2..8b63d6c91f 100644 --- a/modules/core/include/opencv2/core/opengl.hpp +++ b/modules/core/include/opencv2/core/opengl.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CORE_OPENGL_HPP__ -#define __OPENCV_CORE_OPENGL_HPP__ +#ifndef OPENCV_CORE_OPENGL_HPP +#define OPENCV_CORE_OPENGL_HPP #ifndef __cplusplus # error opengl.hpp header must be compiled as C++ @@ -726,4 +726,4 @@ bool cv::ogl::Arrays::empty() const //! @endcond -#endif /* __OPENCV_CORE_OPENGL_HPP__ */ +#endif /* OPENCV_CORE_OPENGL_HPP */ diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp index bced1a7559..4a4ad9e182 100644 --- a/modules/core/include/opencv2/core/operations.hpp +++ b/modules/core/include/opencv2/core/operations.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_OPERATIONS_HPP__ -#define __OPENCV_CORE_OPERATIONS_HPP__ +#ifndef OPENCV_CORE_OPERATIONS_HPP +#define OPENCV_CORE_OPERATIONS_HPP #ifndef __cplusplus # error operations.hpp header must be compiled as C++ diff --git a/modules/core/include/opencv2/core/optim.hpp b/modules/core/include/opencv2/core/optim.hpp index 23e2155839..7249e0fe75 100644 --- a/modules/core/include/opencv2/core/optim.hpp +++ b/modules/core/include/opencv2/core/optim.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_OPTIM_HPP__ -#define __OPENCV_OPTIM_HPP__ +#ifndef OPENCV_OPTIM_HPP +#define OPENCV_OPTIM_HPP #include "opencv2/core.hpp" diff --git a/modules/core/include/opencv2/core/persistence.hpp b/modules/core/include/opencv2/core/persistence.hpp index 65a1ff4c4c..6a78ced730 100644 --- a/modules/core/include/opencv2/core/persistence.hpp +++ b/modules/core/include/opencv2/core/persistence.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_PERSISTENCE_HPP__ -#define __OPENCV_CORE_PERSISTENCE_HPP__ +#ifndef OPENCV_CORE_PERSISTENCE_HPP +#define OPENCV_CORE_PERSISTENCE_HPP #ifndef __cplusplus # error persistence.hpp header must be compiled as C++ @@ -1253,4 +1253,4 @@ CV_EXPORTS void cvWriteMatND_Base64(::CvFileStorage* fs, const char* name, const } // cv -#endif // __OPENCV_CORE_PERSISTENCE_HPP__ \ No newline at end of file +#endif // OPENCV_CORE_PERSISTENCE_HPP \ No newline at end of file diff --git a/modules/core/include/opencv2/core/private.cuda.hpp b/modules/core/include/opencv2/core/private.cuda.hpp index d676ce8506..e3370d65a4 100644 --- a/modules/core/include/opencv2/core/private.cuda.hpp +++ b/modules/core/include/opencv2/core/private.cuda.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_PRIVATE_CUDA_HPP__ -#define __OPENCV_CORE_PRIVATE_CUDA_HPP__ +#ifndef OPENCV_CORE_PRIVATE_CUDA_HPP +#define OPENCV_CORE_PRIVATE_CUDA_HPP #ifndef __OPENCV_BUILD # error this is a private header which should not be used from outside of the OpenCV library @@ -169,4 +169,4 @@ namespace cv { namespace cuda //! @endcond -#endif // __OPENCV_CORE_CUDA_PRIVATE_HPP__ +#endif // OPENCV_CORE_CUDA_PRIVATE_HPP diff --git a/modules/core/include/opencv2/core/private.hpp b/modules/core/include/opencv2/core/private.hpp index a5993a36a7..4ccbae9f17 100644 --- a/modules/core/include/opencv2/core/private.hpp +++ b/modules/core/include/opencv2/core/private.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_PRIVATE_HPP__ -#define __OPENCV_CORE_PRIVATE_HPP__ +#ifndef OPENCV_CORE_PRIVATE_HPP +#define OPENCV_CORE_PRIVATE_HPP #ifndef __OPENCV_BUILD # error this is a private header which should not be used from outside of the OpenCV library @@ -434,4 +434,4 @@ CV_EXPORTS void setUseTegra(bool flag); //! @endcond -#endif // __OPENCV_CORE_PRIVATE_HPP__ +#endif // OPENCV_CORE_PRIVATE_HPP diff --git a/modules/core/include/opencv2/core/ptr.inl.hpp b/modules/core/include/opencv2/core/ptr.inl.hpp index d33aca988b..e541d21a4b 100644 --- a/modules/core/include/opencv2/core/ptr.inl.hpp +++ b/modules/core/include/opencv2/core/ptr.inl.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_CORE_PTR_INL_HPP__ -#define __OPENCV_CORE_PTR_INL_HPP__ +#ifndef OPENCV_CORE_PTR_INL_HPP +#define OPENCV_CORE_PTR_INL_HPP #include @@ -365,4 +365,4 @@ Ptr makePtr(const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& //! @endcond -#endif // __OPENCV_CORE_PTR_INL_HPP__ +#endif // OPENCV_CORE_PTR_INL_HPP diff --git a/modules/core/include/opencv2/core/saturate.hpp b/modules/core/include/opencv2/core/saturate.hpp index 1442eab114..79a9a66a21 100644 --- a/modules/core/include/opencv2/core/saturate.hpp +++ b/modules/core/include/opencv2/core/saturate.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_SATURATE_HPP__ -#define __OPENCV_CORE_SATURATE_HPP__ +#ifndef OPENCV_CORE_SATURATE_HPP +#define OPENCV_CORE_SATURATE_HPP #include "opencv2/core/cvdef.h" #include "opencv2/core/fast_math.hpp" @@ -147,4 +147,4 @@ template<> inline unsigned saturate_cast(double v) { return cvRound(v) } // cv -#endif // __OPENCV_CORE_SATURATE_HPP__ +#endif // OPENCV_CORE_SATURATE_HPP diff --git a/modules/core/include/opencv2/core/sse_utils.hpp b/modules/core/include/opencv2/core/sse_utils.hpp index c87b029abd..69efffe41d 100644 --- a/modules/core/include/opencv2/core/sse_utils.hpp +++ b/modules/core/include/opencv2/core/sse_utils.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_CORE_SSE_UTILS_HPP__ -#define __OPENCV_CORE_SSE_UTILS_HPP__ +#ifndef OPENCV_CORE_SSE_UTILS_HPP +#define OPENCV_CORE_SSE_UTILS_HPP #ifndef __cplusplus # error sse_utils.hpp header must be compiled as C++ @@ -649,4 +649,4 @@ inline void _mm_interleave_ps(__m128 & v_r0, __m128 & v_r1, __m128 & v_g0, __m12 //! @} -#endif //__OPENCV_CORE_SSE_UTILS_HPP__ +#endif //OPENCV_CORE_SSE_UTILS_HPP diff --git a/modules/core/include/opencv2/core/traits.hpp b/modules/core/include/opencv2/core/traits.hpp index 49bc8440dd..f83b05f06d 100644 --- a/modules/core/include/opencv2/core/traits.hpp +++ b/modules/core/include/opencv2/core/traits.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_TRAITS_HPP__ -#define __OPENCV_CORE_TRAITS_HPP__ +#ifndef OPENCV_CORE_TRAITS_HPP +#define OPENCV_CORE_TRAITS_HPP #include "opencv2/core/cvdef.h" @@ -323,4 +323,4 @@ template<> class TypeDepth } // cv -#endif // __OPENCV_CORE_TRAITS_HPP__ +#endif // OPENCV_CORE_TRAITS_HPP diff --git a/modules/core/include/opencv2/core/types.hpp b/modules/core/include/opencv2/core/types.hpp index 2feedfcca8..b76ea38d95 100644 --- a/modules/core/include/opencv2/core/types.hpp +++ b/modules/core/include/opencv2/core/types.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_TYPES_HPP__ -#define __OPENCV_CORE_TYPES_HPP__ +#ifndef OPENCV_CORE_TYPES_HPP +#define OPENCV_CORE_TYPES_HPP #ifndef __cplusplus # error types.hpp header must be compiled as C++ @@ -2237,4 +2237,4 @@ TermCriteria::TermCriteria(int _type, int _maxCount, double _epsilon) } // cv -#endif //__OPENCV_CORE_TYPES_HPP__ +#endif //OPENCV_CORE_TYPES_HPP diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h index cb39587a9a..fba0d74dec 100644 --- a/modules/core/include/opencv2/core/types_c.h +++ b/modules/core/include/opencv2/core/types_c.h @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_TYPES_H__ -#define __OPENCV_CORE_TYPES_H__ +#ifndef OPENCV_CORE_TYPES_H +#define OPENCV_CORE_TYPES_H #ifdef HAVE_IPL # ifndef __IPL_H__ @@ -1829,6 +1829,6 @@ CvModuleInfo; /** @} */ -#endif /*__OPENCV_CORE_TYPES_H__*/ +#endif /*OPENCV_CORE_TYPES_H*/ /* End of file. */ diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp index 7e7a8b2b51..ba822d5d48 100644 --- a/modules/core/include/opencv2/core/utility.hpp +++ b/modules/core/include/opencv2/core/utility.hpp @@ -42,8 +42,8 @@ // //M*/ -#ifndef __OPENCV_CORE_UTILITY_H__ -#define __OPENCV_CORE_UTILITY_H__ +#ifndef OPENCV_CORE_UTILITY_H +#define OPENCV_CORE_UTILITY_H #ifndef __cplusplus # error utility.hpp header must be compiled as C++ @@ -890,4 +890,4 @@ template<> inline std::string CommandLineParser::get(const String& #include "opencv2/core/core_c.h" #endif -#endif //__OPENCV_CORE_UTILITY_H__ +#endif //OPENCV_CORE_UTILITY_H diff --git a/modules/core/include/opencv2/core/va_intel.hpp b/modules/core/include/opencv2/core/va_intel.hpp index f4bb8a6507..33258484de 100644 --- a/modules/core/include/opencv2/core/va_intel.hpp +++ b/modules/core/include/opencv2/core/va_intel.hpp @@ -5,8 +5,8 @@ // Copyright (C) 2015, Itseez, Inc., all rights reserved. // Third party copyrights are property of their respective owners. -#ifndef __OPENCV_CORE_VA_INTEL_HPP__ -#define __OPENCV_CORE_VA_INTEL_HPP__ +#ifndef OPENCV_CORE_VA_INTEL_HPP +#define OPENCV_CORE_VA_INTEL_HPP #ifndef __cplusplus # error va_intel.hpp header must be compiled as C++ @@ -74,4 +74,4 @@ CV_EXPORTS void convertFromVASurface(VADisplay display, VASurfaceID surface, Siz }} // namespace cv::va_intel -#endif /* __OPENCV_CORE_VA_INTEL_HPP__ */ +#endif /* OPENCV_CORE_VA_INTEL_HPP */ diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index a69d42fcb1..7886b762ce 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -47,8 +47,8 @@ Usefull to test in user programs */ -#ifndef __OPENCV_VERSION_HPP__ -#define __OPENCV_VERSION_HPP__ +#ifndef OPENCV_VERSION_HPP +#define OPENCV_VERSION_HPP #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 1 diff --git a/modules/core/include/opencv2/core/wimage.hpp b/modules/core/include/opencv2/core/wimage.hpp index ef9d39833a..b246c89d34 100644 --- a/modules/core/include/opencv2/core/wimage.hpp +++ b/modules/core/include/opencv2/core/wimage.hpp @@ -39,8 +39,8 @@ ///////////////////////////////////////////////////////////////////////////////// //M*/ -#ifndef __OPENCV_CORE_WIMAGE_HPP__ -#define __OPENCV_CORE_WIMAGE_HPP__ +#ifndef OPENCV_CORE_WIMAGE_HPP +#define OPENCV_CORE_WIMAGE_HPP #include "opencv2/core/core_c.h" diff --git a/modules/cudaarithm/include/opencv2/cudaarithm.hpp b/modules/cudaarithm/include/opencv2/cudaarithm.hpp index d377a70e7a..3406acc8ac 100644 --- a/modules/cudaarithm/include/opencv2/cudaarithm.hpp +++ b/modules/cudaarithm/include/opencv2/cudaarithm.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDAARITHM_HPP__ -#define __OPENCV_CUDAARITHM_HPP__ +#ifndef OPENCV_CUDAARITHM_HPP +#define OPENCV_CUDAARITHM_HPP #ifndef __cplusplus # error cudaarithm.hpp header must be compiled as C++ @@ -841,4 +841,4 @@ CV_EXPORTS Ptr createConvolution(Size user_block_size = Size()); }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDAARITHM_HPP__ */ +#endif /* OPENCV_CUDAARITHM_HPP */ diff --git a/modules/cudabgsegm/include/opencv2/cudabgsegm.hpp b/modules/cudabgsegm/include/opencv2/cudabgsegm.hpp index 32ea7c17e0..6149a5cf44 100644 --- a/modules/cudabgsegm/include/opencv2/cudabgsegm.hpp +++ b/modules/cudabgsegm/include/opencv2/cudabgsegm.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDABGSEGM_HPP__ -#define __OPENCV_CUDABGSEGM_HPP__ +#ifndef OPENCV_CUDABGSEGM_HPP +#define OPENCV_CUDABGSEGM_HPP #ifndef __cplusplus # error cudabgsegm.hpp header must be compiled as C++ @@ -151,4 +151,4 @@ CV_EXPORTS Ptr }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDABGSEGM_HPP__ */ +#endif /* OPENCV_CUDABGSEGM_HPP */ diff --git a/modules/cudabgsegm/perf/perf_precomp.hpp b/modules/cudabgsegm/perf/perf_precomp.hpp index e52fe92a5e..4a230f2416 100644 --- a/modules/cudabgsegm/perf/perf_precomp.hpp +++ b/modules/cudabgsegm/perf/perf_precomp.hpp @@ -48,8 +48,8 @@ # endif #endif -#ifndef __OPENCV_PERF_PRECOMP_HPP__ -#define __OPENCV_PERF_PRECOMP_HPP__ +#ifndef OPENCV_PERF_PRECOMP_HPP +#define OPENCV_PERF_PRECOMP_HPP #include "opencv2/ts.hpp" #include "opencv2/ts/cuda_perf.hpp" diff --git a/modules/cudabgsegm/src/precomp.hpp b/modules/cudabgsegm/src/precomp.hpp index e8d627e675..12429c2416 100644 --- a/modules/cudabgsegm/src/precomp.hpp +++ b/modules/cudabgsegm/src/precomp.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_PRECOMP_H__ -#define __OPENCV_PRECOMP_H__ +#ifndef OPENCV_PRECOMP_H +#define OPENCV_PRECOMP_H #include @@ -51,4 +51,4 @@ #include "opencv2/opencv_modules.hpp" -#endif /* __OPENCV_PRECOMP_H__ */ +#endif /* OPENCV_PRECOMP_H */ diff --git a/modules/cudabgsegm/test/test_precomp.hpp b/modules/cudabgsegm/test/test_precomp.hpp index 4d21dfc7ae..5067465734 100644 --- a/modules/cudabgsegm/test/test_precomp.hpp +++ b/modules/cudabgsegm/test/test_precomp.hpp @@ -48,8 +48,8 @@ # endif #endif -#ifndef __OPENCV_TEST_PRECOMP_HPP__ -#define __OPENCV_TEST_PRECOMP_HPP__ +#ifndef OPENCV_TEST_PRECOMP_HPP +#define OPENCV_TEST_PRECOMP_HPP #include diff --git a/modules/cudacodec/include/opencv2/cudacodec.hpp b/modules/cudacodec/include/opencv2/cudacodec.hpp index 610ecf607f..a379edc3ca 100644 --- a/modules/cudacodec/include/opencv2/cudacodec.hpp +++ b/modules/cudacodec/include/opencv2/cudacodec.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CUDACODEC_HPP__ -#define __OPENCV_CUDACODEC_HPP__ +#ifndef OPENCV_CUDACODEC_HPP +#define OPENCV_CUDACODEC_HPP #ifndef __cplusplus # error cudacodec.hpp header must be compiled as C++ @@ -339,4 +339,4 @@ CV_EXPORTS Ptr createVideoReader(const Ptr& source) }} // namespace cv { namespace cudacodec { -#endif /* __OPENCV_CUDACODEC_HPP__ */ +#endif /* OPENCV_CUDACODEC_HPP */ diff --git a/modules/cudacodec/perf/perf_precomp.hpp b/modules/cudacodec/perf/perf_precomp.hpp index 593c84d555..def2462b28 100644 --- a/modules/cudacodec/perf/perf_precomp.hpp +++ b/modules/cudacodec/perf/perf_precomp.hpp @@ -48,8 +48,8 @@ # endif #endif -#ifndef __OPENCV_PERF_PRECOMP_HPP__ -#define __OPENCV_PERF_PRECOMP_HPP__ +#ifndef OPENCV_PERF_PRECOMP_HPP +#define OPENCV_PERF_PRECOMP_HPP #include "opencv2/ts.hpp" #include "opencv2/ts/cuda_perf.hpp" diff --git a/modules/cudacodec/src/precomp.hpp b/modules/cudacodec/src/precomp.hpp index 59504c2c49..0abd7b00be 100644 --- a/modules/cudacodec/src/precomp.hpp +++ b/modules/cudacodec/src/precomp.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_PRECOMP_H__ -#define __OPENCV_PRECOMP_H__ +#ifndef OPENCV_PRECOMP_H +#define OPENCV_PRECOMP_H #include #include @@ -80,4 +80,4 @@ #include "../src/cap_ffmpeg_api.hpp" #endif -#endif /* __OPENCV_PRECOMP_H__ */ +#endif /* OPENCV_PRECOMP_H */ diff --git a/modules/cudacodec/test/test_precomp.hpp b/modules/cudacodec/test/test_precomp.hpp index 5c5a1422e2..a8fb71381d 100644 --- a/modules/cudacodec/test/test_precomp.hpp +++ b/modules/cudacodec/test/test_precomp.hpp @@ -48,8 +48,8 @@ # endif #endif -#ifndef __OPENCV_TEST_PRECOMP_HPP__ -#define __OPENCV_TEST_PRECOMP_HPP__ +#ifndef OPENCV_TEST_PRECOMP_HPP +#define OPENCV_TEST_PRECOMP_HPP #include "opencv2/ts.hpp" #include "opencv2/ts/cuda_test.hpp" diff --git a/modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp b/modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp index 1d7f4e4e43..27a0ddd308 100644 --- a/modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp +++ b/modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDAFEATURES2D_HPP__ -#define __OPENCV_CUDAFEATURES2D_HPP__ +#ifndef OPENCV_CUDAFEATURES2D_HPP +#define OPENCV_CUDAFEATURES2D_HPP #ifndef __cplusplus # error cudafeatures2d.hpp header must be compiled as C++ @@ -486,4 +486,4 @@ public: }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDAFEATURES2D_HPP__ */ +#endif /* OPENCV_CUDAFEATURES2D_HPP */ diff --git a/modules/cudafilters/include/opencv2/cudafilters.hpp b/modules/cudafilters/include/opencv2/cudafilters.hpp index 6769f06f1c..a67a6ee62c 100644 --- a/modules/cudafilters/include/opencv2/cudafilters.hpp +++ b/modules/cudafilters/include/opencv2/cudafilters.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDAFILTERS_HPP__ -#define __OPENCV_CUDAFILTERS_HPP__ +#ifndef OPENCV_CUDAFILTERS_HPP +#define OPENCV_CUDAFILTERS_HPP #ifndef __cplusplus # error cudafilters.hpp header must be compiled as C++ @@ -328,4 +328,4 @@ CV_EXPORTS Ptr createMedianFilter(int srcType, int windowSize, int parti }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDAFILTERS_HPP__ */ +#endif /*OPENCV_CUDAFILTERS_HPP */ diff --git a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp index b4a05eecd8..dc876b744b 100644 --- a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp +++ b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDAIMGPROC_HPP__ -#define __OPENCV_CUDAIMGPROC_HPP__ +#ifndef OPENCV_CUDAIMGPROC_HPP +#define OPENCV_CUDAIMGPROC_HPP #ifndef __cplusplus # error cudaimgproc.hpp header must be compiled as C++ @@ -726,4 +726,4 @@ CV_EXPORTS void blendLinear(InputArray img1, InputArray img2, InputArray weights }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDAIMGPROC_HPP__ */ +#endif /* OPENCV_CUDAIMGPROC_HPP */ diff --git a/modules/cudalegacy/include/opencv2/cudalegacy.hpp b/modules/cudalegacy/include/opencv2/cudalegacy.hpp index c27a1161f5..ace8548e35 100644 --- a/modules/cudalegacy/include/opencv2/cudalegacy.hpp +++ b/modules/cudalegacy/include/opencv2/cudalegacy.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDALEGACY_HPP__ -#define __OPENCV_CUDALEGACY_HPP__ +#ifndef OPENCV_CUDALEGACY_HPP +#define OPENCV_CUDALEGACY_HPP #include "opencv2/core/cuda.hpp" #include "opencv2/cudalegacy/NCV.hpp" @@ -287,4 +287,4 @@ CV_EXPORTS void solvePnPRansac(const Mat& object, const Mat& image, const Mat& c }} -#endif /* __OPENCV_CUDALEGACY_HPP__ */ +#endif /* OPENCV_CUDALEGACY_HPP */ diff --git a/modules/cudalegacy/include/opencv2/cudalegacy/private.hpp b/modules/cudalegacy/include/opencv2/cudalegacy/private.hpp index 721748099c..79f9e635bf 100644 --- a/modules/cudalegacy/include/opencv2/cudalegacy/private.hpp +++ b/modules/cudalegacy/include/opencv2/cudalegacy/private.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_CORE_CUDALEGACY_PRIVATE_HPP__ -#define __OPENCV_CORE_CUDALEGACY_PRIVATE_HPP__ +#ifndef OPENCV_CORE_CUDALEGACY_PRIVATE_HPP +#define OPENCV_CORE_CUDALEGACY_PRIVATE_HPP #ifndef __OPENCV_BUILD # error this is a private header which should not be used from outside of the OpenCV library @@ -93,4 +93,4 @@ namespace cv { namespace cuda //! @endcond -#endif // __OPENCV_CORE_CUDALEGACY_PRIVATE_HPP__ +#endif // OPENCV_CORE_CUDALEGACY_PRIVATE_HPP diff --git a/modules/cudaobjdetect/include/opencv2/cudaobjdetect.hpp b/modules/cudaobjdetect/include/opencv2/cudaobjdetect.hpp index f29ed53677..7c07428c3e 100644 --- a/modules/cudaobjdetect/include/opencv2/cudaobjdetect.hpp +++ b/modules/cudaobjdetect/include/opencv2/cudaobjdetect.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDAOBJDETECT_HPP__ -#define __OPENCV_CUDAOBJDETECT_HPP__ +#ifndef OPENCV_CUDAOBJDETECT_HPP +#define OPENCV_CUDAOBJDETECT_HPP #ifndef __cplusplus # error cudaobjdetect.hpp header must be compiled as C++ @@ -285,4 +285,4 @@ public: }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDAOBJDETECT_HPP__ */ +#endif /* OPENCV_CUDAOBJDETECT_HPP */ diff --git a/modules/cudaoptflow/include/opencv2/cudaoptflow.hpp b/modules/cudaoptflow/include/opencv2/cudaoptflow.hpp index 6ea75594d2..576164b111 100644 --- a/modules/cudaoptflow/include/opencv2/cudaoptflow.hpp +++ b/modules/cudaoptflow/include/opencv2/cudaoptflow.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDAOPTFLOW_HPP__ -#define __OPENCV_CUDAOPTFLOW_HPP__ +#ifndef OPENCV_CUDAOPTFLOW_HPP +#define OPENCV_CUDAOPTFLOW_HPP #ifndef __cplusplus # error cudaoptflow.hpp header must be compiled as C++ @@ -346,4 +346,4 @@ public: }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDAOPTFLOW_HPP__ */ +#endif /* OPENCV_CUDAOPTFLOW_HPP */ diff --git a/modules/cudastereo/include/opencv2/cudastereo.hpp b/modules/cudastereo/include/opencv2/cudastereo.hpp index c734f5cca3..c9afd479fb 100644 --- a/modules/cudastereo/include/opencv2/cudastereo.hpp +++ b/modules/cudastereo/include/opencv2/cudastereo.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDASTEREO_HPP__ -#define __OPENCV_CUDASTEREO_HPP__ +#ifndef OPENCV_CUDASTEREO_HPP +#define OPENCV_CUDASTEREO_HPP #ifndef __cplusplus # error cudastereo.hpp header must be compiled as C++ @@ -330,4 +330,4 @@ CV_EXPORTS void drawColorDisp(InputArray src_disp, OutputArray dst_disp, int ndi }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDASTEREO_HPP__ */ +#endif /* OPENCV_CUDASTEREO_HPP */ diff --git a/modules/cudawarping/include/opencv2/cudawarping.hpp b/modules/cudawarping/include/opencv2/cudawarping.hpp index 66c41ccefb..ca2357a624 100644 --- a/modules/cudawarping/include/opencv2/cudawarping.hpp +++ b/modules/cudawarping/include/opencv2/cudawarping.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDAWARPING_HPP__ -#define __OPENCV_CUDAWARPING_HPP__ +#ifndef OPENCV_CUDAWARPING_HPP +#define OPENCV_CUDAWARPING_HPP #ifndef __cplusplus # error cudawarping.hpp header must be compiled as C++ @@ -213,4 +213,4 @@ CV_EXPORTS void pyrUp(InputArray src, OutputArray dst, Stream& stream = Stream:: }} // namespace cv { namespace cuda { -#endif /* __OPENCV_CUDAWARPING_HPP__ */ +#endif /* OPENCV_CUDAWARPING_HPP */ diff --git a/modules/cudev/include/opencv2/cudev.hpp b/modules/cudev/include/opencv2/cudev.hpp index 565efa1c6a..1f435c2b6a 100644 --- a/modules/cudev/include/opencv2/cudev.hpp +++ b/modules/cudev/include/opencv2/cudev.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_HPP__ -#define __OPENCV_CUDEV_HPP__ +#ifndef OPENCV_CUDEV_HPP +#define OPENCV_CUDEV_HPP #include "cudev/common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/block/block.hpp b/modules/cudev/include/opencv2/cudev/block/block.hpp index e8d59bb20b..7c502aa898 100644 --- a/modules/cudev/include/opencv2/cudev/block/block.hpp +++ b/modules/cudev/include/opencv2/cudev/block/block.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_BLOCK_BLOCK_HPP__ -#define __OPENCV_CUDEV_BLOCK_BLOCK_HPP__ +#ifndef OPENCV_CUDEV_BLOCK_BLOCK_HPP +#define OPENCV_CUDEV_BLOCK_BLOCK_HPP #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/block/detail/reduce.hpp b/modules/cudev/include/opencv2/cudev/block/detail/reduce.hpp index 02803b003a..ca10772d2e 100644 --- a/modules/cudev/include/opencv2/cudev/block/detail/reduce.hpp +++ b/modules/cudev/include/opencv2/cudev/block/detail/reduce.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_BLOCK_REDUCE_DETAIL_HPP__ -#define __OPENCV_CUDEV_BLOCK_REDUCE_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_BLOCK_REDUCE_DETAIL_HPP +#define OPENCV_CUDEV_BLOCK_REDUCE_DETAIL_HPP #include "../../common.hpp" #include "../../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/block/detail/reduce_key_val.hpp b/modules/cudev/include/opencv2/cudev/block/detail/reduce_key_val.hpp index edbe8a586b..4af834a446 100644 --- a/modules/cudev/include/opencv2/cudev/block/detail/reduce_key_val.hpp +++ b/modules/cudev/include/opencv2/cudev/block/detail/reduce_key_val.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_BLOCK_REDUCE_KEY_VAL_DETAIL_HPP__ -#define __OPENCV_CUDEV_BLOCK_REDUCE_KEY_VAL_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_BLOCK_REDUCE_KEY_VAL_DETAIL_HPP +#define OPENCV_CUDEV_BLOCK_REDUCE_KEY_VAL_DETAIL_HPP #include "../../common.hpp" #include "../../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/block/dynamic_smem.hpp b/modules/cudev/include/opencv2/cudev/block/dynamic_smem.hpp index e52f829bf6..610de3023d 100644 --- a/modules/cudev/include/opencv2/cudev/block/dynamic_smem.hpp +++ b/modules/cudev/include/opencv2/cudev/block/dynamic_smem.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_BLOCK_DYNAMIC_SMEM_HPP__ -#define __OPENCV_CUDEV_BLOCK_DYNAMIC_SMEM_HPP__ +#ifndef OPENCV_CUDEV_BLOCK_DYNAMIC_SMEM_HPP +#define OPENCV_CUDEV_BLOCK_DYNAMIC_SMEM_HPP #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/block/reduce.hpp b/modules/cudev/include/opencv2/cudev/block/reduce.hpp index 74c8fcac77..06f59a16ae 100644 --- a/modules/cudev/include/opencv2/cudev/block/reduce.hpp +++ b/modules/cudev/include/opencv2/cudev/block/reduce.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_BLOCK_REDUCE_HPP__ -#define __OPENCV_CUDEV_BLOCK_REDUCE_HPP__ +#ifndef OPENCV_CUDEV_BLOCK_REDUCE_HPP +#define OPENCV_CUDEV_BLOCK_REDUCE_HPP #include "../common.hpp" #include "../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/block/scan.hpp b/modules/cudev/include/opencv2/cudev/block/scan.hpp index 3369cff987..cd75a3e197 100644 --- a/modules/cudev/include/opencv2/cudev/block/scan.hpp +++ b/modules/cudev/include/opencv2/cudev/block/scan.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_BLOCK_SCAN_HPP__ -#define __OPENCV_CUDEV_BLOCK_SCAN_HPP__ +#ifndef OPENCV_CUDEV_BLOCK_SCAN_HPP +#define OPENCV_CUDEV_BLOCK_SCAN_HPP #include "../common.hpp" #include "../warp/scan.hpp" diff --git a/modules/cudev/include/opencv2/cudev/block/vec_distance.hpp b/modules/cudev/include/opencv2/cudev/block/vec_distance.hpp index 767d32a466..3dc3875727 100644 --- a/modules/cudev/include/opencv2/cudev/block/vec_distance.hpp +++ b/modules/cudev/include/opencv2/cudev/block/vec_distance.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_BLOCK_VEC_DISTANCE_HPP__ -#define __OPENCV_CUDEV_BLOCK_VEC_DISTANCE_HPP__ +#ifndef OPENCV_CUDEV_BLOCK_VEC_DISTANCE_HPP +#define OPENCV_CUDEV_BLOCK_VEC_DISTANCE_HPP #include "../common.hpp" #include "../functional/functional.hpp" diff --git a/modules/cudev/include/opencv2/cudev/common.hpp b/modules/cudev/include/opencv2/cudev/common.hpp index f475e20b68..b4439f5515 100644 --- a/modules/cudev/include/opencv2/cudev/common.hpp +++ b/modules/cudev/include/opencv2/cudev/common.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_COMMON_HPP__ -#define __OPENCV_CUDEV_COMMON_HPP__ +#ifndef OPENCV_CUDEV_COMMON_HPP +#define OPENCV_CUDEV_COMMON_HPP #include #include "opencv2/core/cuda.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/binary_func.hpp b/modules/cudev/include/opencv2/cudev/expr/binary_func.hpp index 2777a1e185..3e5c009517 100644 --- a/modules/cudev/include/opencv2/cudev/expr/binary_func.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/binary_func.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_BINARY_FUNC_HPP__ -#define __OPENCV_CUDEV_EXPR_BINARY_FUNC_HPP__ +#ifndef OPENCV_CUDEV_EXPR_BINARY_FUNC_HPP +#define OPENCV_CUDEV_EXPR_BINARY_FUNC_HPP #include "../common.hpp" #include "../util/type_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/binary_op.hpp b/modules/cudev/include/opencv2/cudev/expr/binary_op.hpp index 7533946fcc..e3c9ebbc89 100644 --- a/modules/cudev/include/opencv2/cudev/expr/binary_op.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/binary_op.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_BINARY_OP_HPP__ -#define __OPENCV_CUDEV_EXPR_BINARY_OP_HPP__ +#ifndef OPENCV_CUDEV_EXPR_BINARY_OP_HPP +#define OPENCV_CUDEV_EXPR_BINARY_OP_HPP #include "../common.hpp" #include "../util/type_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/color.hpp b/modules/cudev/include/opencv2/cudev/expr/color.hpp index f53de78b3c..ca487a270f 100644 --- a/modules/cudev/include/opencv2/cudev/expr/color.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/color.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_COLOR_HPP__ -#define __OPENCV_CUDEV_EXPR_COLOR_HPP__ +#ifndef OPENCV_CUDEV_EXPR_COLOR_HPP +#define OPENCV_CUDEV_EXPR_COLOR_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/deriv.hpp b/modules/cudev/include/opencv2/cudev/expr/deriv.hpp index da51cc711f..d1b06155de 100644 --- a/modules/cudev/include/opencv2/cudev/expr/deriv.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/deriv.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_DERIV_HPP__ -#define __OPENCV_CUDEV_EXPR_DERIV_HPP__ +#ifndef OPENCV_CUDEV_EXPR_DERIV_HPP +#define OPENCV_CUDEV_EXPR_DERIV_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/expr.hpp b/modules/cudev/include/opencv2/cudev/expr/expr.hpp index cdc8612173..5f4a49111f 100644 --- a/modules/cudev/include/opencv2/cudev/expr/expr.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/expr.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_EXPR_HPP__ -#define __OPENCV_CUDEV_EXPR_EXPR_HPP__ +#ifndef OPENCV_CUDEV_EXPR_EXPR_HPP +#define OPENCV_CUDEV_EXPR_EXPR_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/per_element_func.hpp b/modules/cudev/include/opencv2/cudev/expr/per_element_func.hpp index d7ecd3bb06..9eac3331b3 100644 --- a/modules/cudev/include/opencv2/cudev/expr/per_element_func.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/per_element_func.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_PER_ELEMENT_FUNC_HPP__ -#define __OPENCV_CUDEV_EXPR_PER_ELEMENT_FUNC_HPP__ +#ifndef OPENCV_CUDEV_EXPR_PER_ELEMENT_FUNC_HPP +#define OPENCV_CUDEV_EXPR_PER_ELEMENT_FUNC_HPP #include "../common.hpp" #include "../util/type_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/reduction.hpp b/modules/cudev/include/opencv2/cudev/expr/reduction.hpp index 598fb4f86c..aa772d0348 100644 --- a/modules/cudev/include/opencv2/cudev/expr/reduction.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/reduction.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_REDUCTION_HPP__ -#define __OPENCV_CUDEV_EXPR_REDUCTION_HPP__ +#ifndef OPENCV_CUDEV_EXPR_REDUCTION_HPP +#define OPENCV_CUDEV_EXPR_REDUCTION_HPP #include "../common.hpp" #include "../grid/reduce.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/unary_func.hpp b/modules/cudev/include/opencv2/cudev/expr/unary_func.hpp index b19cec8272..567e15c41a 100644 --- a/modules/cudev/include/opencv2/cudev/expr/unary_func.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/unary_func.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_UNARY_FUNC_HPP__ -#define __OPENCV_CUDEV_EXPR_UNARY_FUNC_HPP__ +#ifndef OPENCV_CUDEV_EXPR_UNARY_FUNC_HPP +#define OPENCV_CUDEV_EXPR_UNARY_FUNC_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/unary_op.hpp b/modules/cudev/include/opencv2/cudev/expr/unary_op.hpp index c5fabe4ac9..4e067fe915 100644 --- a/modules/cudev/include/opencv2/cudev/expr/unary_op.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/unary_op.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_UNARY_OP_HPP__ -#define __OPENCV_CUDEV_EXPR_UNARY_OP_HPP__ +#ifndef OPENCV_CUDEV_EXPR_UNARY_OP_HPP +#define OPENCV_CUDEV_EXPR_UNARY_OP_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/expr/warping.hpp b/modules/cudev/include/opencv2/cudev/expr/warping.hpp index e1f78b9689..ca04b4dd0a 100644 --- a/modules/cudev/include/opencv2/cudev/expr/warping.hpp +++ b/modules/cudev/include/opencv2/cudev/expr/warping.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_EXPR_WARPING_HPP__ -#define __OPENCV_CUDEV_EXPR_WARPING_HPP__ +#ifndef OPENCV_CUDEV_EXPR_WARPING_HPP +#define OPENCV_CUDEV_EXPR_WARPING_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/functional/color_cvt.hpp b/modules/cudev/include/opencv2/cudev/functional/color_cvt.hpp index 5134d04ed9..2681030ae0 100644 --- a/modules/cudev/include/opencv2/cudev/functional/color_cvt.hpp +++ b/modules/cudev/include/opencv2/cudev/functional/color_cvt.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_HPP__ -#define __OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_HPP__ +#ifndef OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_HPP +#define OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_HPP #include "../common.hpp" #include "detail/color_cvt.hpp" diff --git a/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp b/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp index 49d1d2ce3b..59472142f9 100644 --- a/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp +++ b/modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_DETAIL_HPP__ -#define __OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_DETAIL_HPP +#define OPENCV_CUDEV_FUNCTIONAL_COLOR_CVT_DETAIL_HPP #include "../../common.hpp" #include "../../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/functional/functional.hpp b/modules/cudev/include/opencv2/cudev/functional/functional.hpp index 125b66f07a..0c12351ad0 100644 --- a/modules/cudev/include/opencv2/cudev/functional/functional.hpp +++ b/modules/cudev/include/opencv2/cudev/functional/functional.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_FUNCTIONAL_FUNCTIONAL_HPP__ -#define __OPENCV_CUDEV_FUNCTIONAL_FUNCTIONAL_HPP__ +#ifndef OPENCV_CUDEV_FUNCTIONAL_FUNCTIONAL_HPP +#define OPENCV_CUDEV_FUNCTIONAL_FUNCTIONAL_HPP #include "../common.hpp" #include "../util/saturate_cast.hpp" diff --git a/modules/cudev/include/opencv2/cudev/functional/tuple_adapter.hpp b/modules/cudev/include/opencv2/cudev/functional/tuple_adapter.hpp index ff075dc2b3..15331818b1 100644 --- a/modules/cudev/include/opencv2/cudev/functional/tuple_adapter.hpp +++ b/modules/cudev/include/opencv2/cudev/functional/tuple_adapter.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_FUNCTIONAL_TUPLE_ADAPTER_HPP__ -#define __OPENCV_CUDEV_FUNCTIONAL_TUPLE_ADAPTER_HPP__ +#ifndef OPENCV_CUDEV_FUNCTIONAL_TUPLE_ADAPTER_HPP +#define OPENCV_CUDEV_FUNCTIONAL_TUPLE_ADAPTER_HPP #include "../common.hpp" #include "../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/copy.hpp b/modules/cudev/include/opencv2/cudev/grid/copy.hpp index 1d30f99763..cbaca84039 100644 --- a/modules/cudev/include/opencv2/cudev/grid/copy.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/copy.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_COPY_HPP__ -#define __OPENCV_CUDEV_GRID_COPY_HPP__ +#ifndef OPENCV_CUDEV_GRID_COPY_HPP +#define OPENCV_CUDEV_GRID_COPY_HPP #include "../common.hpp" #include "../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/copy.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/copy.hpp index 707b842f9f..b6fce94548 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/copy.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/copy.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_COPY_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_COPY_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_COPY_DETAIL_HPP +#define OPENCV_CUDEV_GRID_COPY_DETAIL_HPP #include "../../common.hpp" #include "../../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/histogram.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/histogram.hpp index a27955d5de..8b6164e930 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/histogram.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/histogram.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_HISTOGRAM_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_HISTOGRAM_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_HISTOGRAM_DETAIL_HPP +#define OPENCV_CUDEV_GRID_HISTOGRAM_DETAIL_HPP #include "../../common.hpp" #include "../../util/atomic.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp index 7af52650c0..0475ebd1b5 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_INTEGRAL_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_INTEGRAL_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_INTEGRAL_DETAIL_HPP +#define OPENCV_CUDEV_GRID_INTEGRAL_DETAIL_HPP #include "../../common.hpp" #include "../../warp/shuffle.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/minmaxloc.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/minmaxloc.hpp index eb34d7f487..9e4f348e1a 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/minmaxloc.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/minmaxloc.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_MINMAXLOC_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_MINMAXLOC_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_MINMAXLOC_DETAIL_HPP +#define OPENCV_CUDEV_GRID_MINMAXLOC_DETAIL_HPP #include "../../common.hpp" #include "../../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/pyr_down.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/pyr_down.hpp index b14792cf4e..51cdf1bfb9 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/pyr_down.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/pyr_down.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_PYR_DOWN_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_PYR_DOWN_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_PYR_DOWN_DETAIL_HPP +#define OPENCV_CUDEV_GRID_PYR_DOWN_DETAIL_HPP #include "../../common.hpp" #include "../../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/pyr_up.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/pyr_up.hpp index 16c8b2091e..b5543ae026 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/pyr_up.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/pyr_up.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_PYR_UP_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_PYR_UP_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_PYR_UP_DETAIL_HPP +#define OPENCV_CUDEV_GRID_PYR_UP_DETAIL_HPP #include "../../common.hpp" #include "../../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp index 7ccdd05f8a..2c8dfb36ec 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_REDUCE_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_REDUCE_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_REDUCE_DETAIL_HPP +#define OPENCV_CUDEV_GRID_REDUCE_DETAIL_HPP #include "../../common.hpp" #include "../../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_column.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_column.hpp index c4852949e6..e1c8a3bc7a 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_column.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_column.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_REDUCE_TO_COLUMN_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_REDUCE_TO_COLUMN_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_REDUCE_TO_COLUMN_DETAIL_HPP +#define OPENCV_CUDEV_GRID_REDUCE_TO_COLUMN_DETAIL_HPP #include "../../common.hpp" #include "../../util/saturate_cast.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_row.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_row.hpp index 154004f6e4..8d3c7e4049 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_row.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_row.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_REDUCE_TO_ROW_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_REDUCE_TO_ROW_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_REDUCE_TO_ROW_DETAIL_HPP +#define OPENCV_CUDEV_GRID_REDUCE_TO_ROW_DETAIL_HPP #include "../../common.hpp" #include "../../util/saturate_cast.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/split_merge.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/split_merge.hpp index 0bd76ac464..3f51206016 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/split_merge.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/split_merge.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_SPLIT_MERGE_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_SPLIT_MERGE_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_SPLIT_MERGE_DETAIL_HPP +#define OPENCV_CUDEV_GRID_SPLIT_MERGE_DETAIL_HPP #include "../../common.hpp" #include "../../util/saturate_cast.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/transform.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/transform.hpp index d13585398b..dd39fe94a6 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/transform.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/transform.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_TRANSFORM_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_TRANSFORM_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_TRANSFORM_DETAIL_HPP +#define OPENCV_CUDEV_GRID_TRANSFORM_DETAIL_HPP #include "../../common.hpp" #include "../../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/transpose.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/transpose.hpp index 83ee96b790..1236d4bce3 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/transpose.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/transpose.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_TRANSPOSE_DETAIL_HPP__ -#define __OPENCV_CUDEV_GRID_TRANSPOSE_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_GRID_TRANSPOSE_DETAIL_HPP +#define OPENCV_CUDEV_GRID_TRANSPOSE_DETAIL_HPP #include "../../common.hpp" #include "../../util/saturate_cast.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/histogram.hpp b/modules/cudev/include/opencv2/cudev/grid/histogram.hpp index 154f73771b..1ceee9fdd5 100644 --- a/modules/cudev/include/opencv2/cudev/grid/histogram.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/histogram.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_HISTOGRAM_HPP__ -#define __OPENCV_CUDEV_GRID_HISTOGRAM_HPP__ +#ifndef OPENCV_CUDEV_GRID_HISTOGRAM_HPP +#define OPENCV_CUDEV_GRID_HISTOGRAM_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/integral.hpp b/modules/cudev/include/opencv2/cudev/grid/integral.hpp index 6312f44772..3e680b1a19 100644 --- a/modules/cudev/include/opencv2/cudev/grid/integral.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/integral.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_INTEGRAL_HPP__ -#define __OPENCV_CUDEV_GRID_INTEGRAL_HPP__ +#ifndef OPENCV_CUDEV_GRID_INTEGRAL_HPP +#define OPENCV_CUDEV_GRID_INTEGRAL_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/pyramids.hpp b/modules/cudev/include/opencv2/cudev/grid/pyramids.hpp index 22eafe69fb..6482657825 100644 --- a/modules/cudev/include/opencv2/cudev/grid/pyramids.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/pyramids.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_PYRAMIDS_HPP__ -#define __OPENCV_CUDEV_GRID_PYRAMIDS_HPP__ +#ifndef OPENCV_CUDEV_GRID_PYRAMIDS_HPP +#define OPENCV_CUDEV_GRID_PYRAMIDS_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/reduce.hpp b/modules/cudev/include/opencv2/cudev/grid/reduce.hpp index 4551bc886b..e9e42b27fd 100644 --- a/modules/cudev/include/opencv2/cudev/grid/reduce.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/reduce.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_REDUCE_HPP__ -#define __OPENCV_CUDEV_GRID_REDUCE_HPP__ +#ifndef OPENCV_CUDEV_GRID_REDUCE_HPP +#define OPENCV_CUDEV_GRID_REDUCE_HPP #include #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/reduce_to_vec.hpp b/modules/cudev/include/opencv2/cudev/grid/reduce_to_vec.hpp index 599c2514e5..5955ceeaa5 100644 --- a/modules/cudev/include/opencv2/cudev/grid/reduce_to_vec.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/reduce_to_vec.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_REDUCE_TO_VEC_HPP__ -#define __OPENCV_CUDEV_GRID_REDUCE_TO_VEC_HPP__ +#ifndef OPENCV_CUDEV_GRID_REDUCE_TO_VEC_HPP +#define OPENCV_CUDEV_GRID_REDUCE_TO_VEC_HPP #include "../common.hpp" #include "../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/split_merge.hpp b/modules/cudev/include/opencv2/cudev/grid/split_merge.hpp index 1a7134793b..5c92a813ed 100644 --- a/modules/cudev/include/opencv2/cudev/grid/split_merge.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/split_merge.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_SPLIT_MERGE_HPP__ -#define __OPENCV_CUDEV_GRID_SPLIT_MERGE_HPP__ +#ifndef OPENCV_CUDEV_GRID_SPLIT_MERGE_HPP +#define OPENCV_CUDEV_GRID_SPLIT_MERGE_HPP #include "../common.hpp" #include "../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/transform.hpp b/modules/cudev/include/opencv2/cudev/grid/transform.hpp index 2f16f7d392..4f7d191e64 100644 --- a/modules/cudev/include/opencv2/cudev/grid/transform.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/transform.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_TRANSFORM_HPP__ -#define __OPENCV_CUDEV_GRID_TRANSFORM_HPP__ +#ifndef OPENCV_CUDEV_GRID_TRANSFORM_HPP +#define OPENCV_CUDEV_GRID_TRANSFORM_HPP #include "../common.hpp" #include "../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/grid/transpose.hpp b/modules/cudev/include/opencv2/cudev/grid/transpose.hpp index 0d7a19573d..72ab7267ff 100644 --- a/modules/cudev/include/opencv2/cudev/grid/transpose.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/transpose.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_GRID_TRANSPOSE_HPP__ -#define __OPENCV_CUDEV_GRID_TRANSPOSE_HPP__ +#ifndef OPENCV_CUDEV_GRID_TRANSPOSE_HPP +#define OPENCV_CUDEV_GRID_TRANSPOSE_HPP #include "../common.hpp" #include "../ptr2d/traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/constant.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/constant.hpp index b3c5f5f23b..eb96290b4e 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/constant.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/constant.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_CONSTANT_HPP__ -#define __OPENCV_CUDEV_PTR2D_CONSTANT_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_CONSTANT_HPP +#define OPENCV_CUDEV_PTR2D_CONSTANT_HPP #include "../common.hpp" #include "traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/deriv.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/deriv.hpp index 95088177f4..fe30d3e7af 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/deriv.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/deriv.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_DERIV_HPP__ -#define __OPENCV_CUDEV_PTR2D_DERIV_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_DERIV_HPP +#define OPENCV_CUDEV_PTR2D_DERIV_HPP #include "../common.hpp" #include "../grid/copy.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/detail/gpumat.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/detail/gpumat.hpp index 665840ec03..968d78e832 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/detail/gpumat.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/detail/gpumat.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_GPUMAT_DETAIL_HPP__ -#define __OPENCV_CUDEV_PTR2D_GPUMAT_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_GPUMAT_DETAIL_HPP +#define OPENCV_CUDEV_PTR2D_GPUMAT_DETAIL_HPP #include "../gpumat.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/extrapolation.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/extrapolation.hpp index e06058f55b..14bb305ebb 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/extrapolation.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/extrapolation.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_EXTRAPOLATION_HPP__ -#define __OPENCV_CUDEV_PTR2D_EXTRAPOLATION_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_EXTRAPOLATION_HPP +#define OPENCV_CUDEV_PTR2D_EXTRAPOLATION_HPP #include "../common.hpp" #include "../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/glob.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/glob.hpp index 4296dd44bc..2024a7e01a 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/glob.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/glob.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_GLOB_HPP__ -#define __OPENCV_CUDEV_PTR2D_GLOB_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_GLOB_HPP +#define OPENCV_CUDEV_PTR2D_GLOB_HPP #include "../common.hpp" #include "traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/gpumat.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/gpumat.hpp index 983652c53c..eac4fb6c89 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/gpumat.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/gpumat.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_GPUMAT_HPP__ -#define __OPENCV_CUDEV_PTR2D_GPUMAT_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_GPUMAT_HPP +#define OPENCV_CUDEV_PTR2D_GPUMAT_HPP #include "../common.hpp" #include "../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/interpolation.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/interpolation.hpp index 256d4fd00a..c416140f05 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/interpolation.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/interpolation.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_INTERPOLATION_HPP__ -#define __OPENCV_CUDEV_PTR2D_INTERPOLATION_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_INTERPOLATION_HPP +#define OPENCV_CUDEV_PTR2D_INTERPOLATION_HPP #include "../common.hpp" #include "../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/lut.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/lut.hpp index 26a3725c08..221732c0ec 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/lut.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/lut.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_LUT_HPP__ -#define __OPENCV_CUDEV_PTR2D_LUT_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_LUT_HPP +#define OPENCV_CUDEV_PTR2D_LUT_HPP #include "../common.hpp" #include "../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/mask.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/mask.hpp index bbd2f1ae08..46f518cca9 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/mask.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/mask.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_MASK_HPP__ -#define __OPENCV_CUDEV_PTR2D_MASK_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_MASK_HPP +#define OPENCV_CUDEV_PTR2D_MASK_HPP #include "../common.hpp" #include "traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/remap.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/remap.hpp index 9d8745f94e..cb21da48cf 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/remap.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/remap.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_REMAP_HPP__ -#define __OPENCV_CUDEV_PTR2D_REMAP_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_REMAP_HPP +#define OPENCV_CUDEV_PTR2D_REMAP_HPP #include "opencv2/core/base.hpp" #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/resize.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/resize.hpp index 63ae7eb8a1..d026b7031a 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/resize.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/resize.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_RESIZE_HPP__ -#define __OPENCV_CUDEV_PTR2D_RESIZE_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_RESIZE_HPP +#define OPENCV_CUDEV_PTR2D_RESIZE_HPP #include "opencv2/core/base.hpp" #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/texture.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/texture.hpp index 6fa83e631e..a209d007db 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/texture.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/texture.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_TEXTURE_HPP__ -#define __OPENCV_CUDEV_PTR2D_TEXTURE_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_TEXTURE_HPP +#define OPENCV_CUDEV_PTR2D_TEXTURE_HPP #include #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/traits.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/traits.hpp index f1552cafe8..f0d1cad7a2 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/traits.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/traits.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_TRAITS_HPP__ -#define __OPENCV_CUDEV_PTR2D_TRAITS_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_TRAITS_HPP +#define OPENCV_CUDEV_PTR2D_TRAITS_HPP #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/transform.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/transform.hpp index b6edb913d1..21d50757d3 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/transform.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/transform.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_TRANSFORM_HPP__ -#define __OPENCV_CUDEV_PTR2D_TRANSFORM_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_TRANSFORM_HPP +#define OPENCV_CUDEV_PTR2D_TRANSFORM_HPP #include "../common.hpp" #include "../grid/copy.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/warping.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/warping.hpp index c9d00833ff..02df07f824 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/warping.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/warping.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_WARPING_HPP__ -#define __OPENCV_CUDEV_PTR2D_WARPING_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_WARPING_HPP +#define OPENCV_CUDEV_PTR2D_WARPING_HPP #include "../common.hpp" #include "traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/ptr2d/zip.hpp b/modules/cudev/include/opencv2/cudev/ptr2d/zip.hpp index 368848248c..e68f4cf61f 100644 --- a/modules/cudev/include/opencv2/cudev/ptr2d/zip.hpp +++ b/modules/cudev/include/opencv2/cudev/ptr2d/zip.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_PTR2D_ZIP_HPP__ -#define __OPENCV_CUDEV_PTR2D_ZIP_HPP__ +#ifndef OPENCV_CUDEV_PTR2D_ZIP_HPP +#define OPENCV_CUDEV_PTR2D_ZIP_HPP #include "../common.hpp" #include "../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/atomic.hpp b/modules/cudev/include/opencv2/cudev/util/atomic.hpp index a88cd99b36..b05fff933b 100644 --- a/modules/cudev/include/opencv2/cudev/util/atomic.hpp +++ b/modules/cudev/include/opencv2/cudev/util/atomic.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_ATOMIC_HPP__ -#define __OPENCV_CUDEV_UTIL_ATOMIC_HPP__ +#ifndef OPENCV_CUDEV_UTIL_ATOMIC_HPP +#define OPENCV_CUDEV_UTIL_ATOMIC_HPP #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/detail/tuple.hpp b/modules/cudev/include/opencv2/cudev/util/detail/tuple.hpp index 2fc84946bb..248306149e 100644 --- a/modules/cudev/include/opencv2/cudev/util/detail/tuple.hpp +++ b/modules/cudev/include/opencv2/cudev/util/detail/tuple.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_TUPLE_DETAIL_HPP__ -#define __OPENCV_CUDEV_UTIL_TUPLE_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_UTIL_TUPLE_DETAIL_HPP +#define OPENCV_CUDEV_UTIL_TUPLE_DETAIL_HPP #include diff --git a/modules/cudev/include/opencv2/cudev/util/detail/type_traits.hpp b/modules/cudev/include/opencv2/cudev/util/detail/type_traits.hpp index d711642836..91e47362f9 100644 --- a/modules/cudev/include/opencv2/cudev/util/detail/type_traits.hpp +++ b/modules/cudev/include/opencv2/cudev/util/detail/type_traits.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_TYPE_TRAITS_DETAIL_HPP__ -#define __OPENCV_CUDEV_UTIL_TYPE_TRAITS_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_UTIL_TYPE_TRAITS_DETAIL_HPP +#define OPENCV_CUDEV_UTIL_TYPE_TRAITS_DETAIL_HPP #include "../../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/limits.hpp b/modules/cudev/include/opencv2/cudev/util/limits.hpp index 71e7faa779..753fd91878 100644 --- a/modules/cudev/include/opencv2/cudev/util/limits.hpp +++ b/modules/cudev/include/opencv2/cudev/util/limits.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_LIMITS_HPP__ -#define __OPENCV_CUDEV_UTIL_LIMITS_HPP__ +#ifndef OPENCV_CUDEV_UTIL_LIMITS_HPP +#define OPENCV_CUDEV_UTIL_LIMITS_HPP #include #include diff --git a/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp b/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp index 3176542d2c..cf413284ac 100644 --- a/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp +++ b/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_SATURATE_CAST_HPP__ -#define __OPENCV_CUDEV_UTIL_SATURATE_CAST_HPP__ +#ifndef OPENCV_CUDEV_UTIL_SATURATE_CAST_HPP +#define OPENCV_CUDEV_UTIL_SATURATE_CAST_HPP #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/simd_functions.hpp b/modules/cudev/include/opencv2/cudev/util/simd_functions.hpp index 2dd6f12ace..ed6efa6a2b 100644 --- a/modules/cudev/include/opencv2/cudev/util/simd_functions.hpp +++ b/modules/cudev/include/opencv2/cudev/util/simd_functions.hpp @@ -73,8 +73,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_SIMD_FUNCTIONS_HPP__ -#define __OPENCV_CUDEV_UTIL_SIMD_FUNCTIONS_HPP__ +#ifndef OPENCV_CUDEV_UTIL_SIMD_FUNCTIONS_HPP +#define OPENCV_CUDEV_UTIL_SIMD_FUNCTIONS_HPP #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/tuple.hpp b/modules/cudev/include/opencv2/cudev/util/tuple.hpp index 70d0424bdb..b28bb4df03 100644 --- a/modules/cudev/include/opencv2/cudev/util/tuple.hpp +++ b/modules/cudev/include/opencv2/cudev/util/tuple.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_TUPLE_HPP__ -#define __OPENCV_CUDEV_UTIL_TUPLE_HPP__ +#ifndef OPENCV_CUDEV_UTIL_TUPLE_HPP +#define OPENCV_CUDEV_UTIL_TUPLE_HPP #include "../common.hpp" #include "detail/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/type_traits.hpp b/modules/cudev/include/opencv2/cudev/util/type_traits.hpp index acd1d3ba23..cad1f006f3 100644 --- a/modules/cudev/include/opencv2/cudev/util/type_traits.hpp +++ b/modules/cudev/include/opencv2/cudev/util/type_traits.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_TYPE_TRAITS_HPP__ -#define __OPENCV_CUDEV_UTIL_TYPE_TRAITS_HPP__ +#ifndef OPENCV_CUDEV_UTIL_TYPE_TRAITS_HPP +#define OPENCV_CUDEV_UTIL_TYPE_TRAITS_HPP #include "../common.hpp" #include "vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/vec_math.hpp b/modules/cudev/include/opencv2/cudev/util/vec_math.hpp index 82fa06e9c9..f6d8d2cda4 100644 --- a/modules/cudev/include/opencv2/cudev/util/vec_math.hpp +++ b/modules/cudev/include/opencv2/cudev/util/vec_math.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_VEC_MATH_HPP__ -#define __OPENCV_CUDEV_UTIL_VEC_MATH_HPP__ +#ifndef OPENCV_CUDEV_UTIL_VEC_MATH_HPP +#define OPENCV_CUDEV_UTIL_VEC_MATH_HPP #include "vec_traits.hpp" #include "saturate_cast.hpp" diff --git a/modules/cudev/include/opencv2/cudev/util/vec_traits.hpp b/modules/cudev/include/opencv2/cudev/util/vec_traits.hpp index 9bb5678e6f..bff3744ef7 100644 --- a/modules/cudev/include/opencv2/cudev/util/vec_traits.hpp +++ b/modules/cudev/include/opencv2/cudev/util/vec_traits.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_UTIL_VEC_TRAITS_HPP__ -#define __OPENCV_CUDEV_UTIL_VEC_TRAITS_HPP__ +#ifndef OPENCV_CUDEV_UTIL_VEC_TRAITS_HPP +#define OPENCV_CUDEV_UTIL_VEC_TRAITS_HPP #include "../common.hpp" diff --git a/modules/cudev/include/opencv2/cudev/warp/detail/reduce.hpp b/modules/cudev/include/opencv2/cudev/warp/detail/reduce.hpp index 7f9faf9cac..2848889f11 100644 --- a/modules/cudev/include/opencv2/cudev/warp/detail/reduce.hpp +++ b/modules/cudev/include/opencv2/cudev/warp/detail/reduce.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_WARP_REDUCE_DETAIL_HPP__ -#define __OPENCV_CUDEV_WARP_REDUCE_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_WARP_REDUCE_DETAIL_HPP +#define OPENCV_CUDEV_WARP_REDUCE_DETAIL_HPP #include "../../common.hpp" #include "../../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/warp/detail/reduce_key_val.hpp b/modules/cudev/include/opencv2/cudev/warp/detail/reduce_key_val.hpp index 7701795757..c6deb3ace1 100644 --- a/modules/cudev/include/opencv2/cudev/warp/detail/reduce_key_val.hpp +++ b/modules/cudev/include/opencv2/cudev/warp/detail/reduce_key_val.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_WARP_REDUCE_KEY_VAL_DETAIL_HPP__ -#define __OPENCV_CUDEV_WARP_REDUCE_KEY_VAL_DETAIL_HPP__ +#ifndef OPENCV_CUDEV_WARP_REDUCE_KEY_VAL_DETAIL_HPP +#define OPENCV_CUDEV_WARP_REDUCE_KEY_VAL_DETAIL_HPP #include "../../common.hpp" #include "../../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/warp/reduce.hpp b/modules/cudev/include/opencv2/cudev/warp/reduce.hpp index f3919c2feb..46826033fe 100644 --- a/modules/cudev/include/opencv2/cudev/warp/reduce.hpp +++ b/modules/cudev/include/opencv2/cudev/warp/reduce.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_WARP_REDUCE_HPP__ -#define __OPENCV_CUDEV_WARP_REDUCE_HPP__ +#ifndef OPENCV_CUDEV_WARP_REDUCE_HPP +#define OPENCV_CUDEV_WARP_REDUCE_HPP #include "../common.hpp" #include "../util/tuple.hpp" diff --git a/modules/cudev/include/opencv2/cudev/warp/scan.hpp b/modules/cudev/include/opencv2/cudev/warp/scan.hpp index a4402986dc..f76376ea4e 100644 --- a/modules/cudev/include/opencv2/cudev/warp/scan.hpp +++ b/modules/cudev/include/opencv2/cudev/warp/scan.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_WARP_SCAN_HPP__ -#define __OPENCV_CUDEV_WARP_SCAN_HPP__ +#ifndef OPENCV_CUDEV_WARP_SCAN_HPP +#define OPENCV_CUDEV_WARP_SCAN_HPP #include "../common.hpp" #include "warp.hpp" diff --git a/modules/cudev/include/opencv2/cudev/warp/shuffle.hpp b/modules/cudev/include/opencv2/cudev/warp/shuffle.hpp index 97af06972e..94e5879fa7 100644 --- a/modules/cudev/include/opencv2/cudev/warp/shuffle.hpp +++ b/modules/cudev/include/opencv2/cudev/warp/shuffle.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_WARP_SHUFFLE_HPP__ -#define __OPENCV_CUDEV_WARP_SHUFFLE_HPP__ +#ifndef OPENCV_CUDEV_WARP_SHUFFLE_HPP +#define OPENCV_CUDEV_WARP_SHUFFLE_HPP #include "../common.hpp" #include "../util/vec_traits.hpp" diff --git a/modules/cudev/include/opencv2/cudev/warp/warp.hpp b/modules/cudev/include/opencv2/cudev/warp/warp.hpp index 61caea259e..6860ccf4af 100644 --- a/modules/cudev/include/opencv2/cudev/warp/warp.hpp +++ b/modules/cudev/include/opencv2/cudev/warp/warp.hpp @@ -43,8 +43,8 @@ #pragma once -#ifndef __OPENCV_CUDEV_WARP_WARP_HPP__ -#define __OPENCV_CUDEV_WARP_WARP_HPP__ +#ifndef OPENCV_CUDEV_WARP_WARP_HPP +#define OPENCV_CUDEV_WARP_WARP_HPP #include "../common.hpp" diff --git a/modules/features2d/include/opencv2/features2d.hpp b/modules/features2d/include/opencv2/features2d.hpp index 32fdabd8a4..80aed264d6 100644 --- a/modules/features2d/include/opencv2/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_FEATURES_2D_HPP__ -#define __OPENCV_FEATURES_2D_HPP__ +#ifndef OPENCV_FEATURES_2D_HPP +#define OPENCV_FEATURES_2D_HPP #include "opencv2/core.hpp" #include "opencv2/flann/miniflann.hpp" diff --git a/modules/flann/include/opencv2/flann.hpp b/modules/flann/include/opencv2/flann.hpp index 4f92d57e3e..16914793db 100644 --- a/modules/flann/include/opencv2/flann.hpp +++ b/modules/flann/include/opencv2/flann.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef _OPENCV_FLANN_HPP_ -#define _OPENCV_FLANN_HPP_ +#ifndef OPENCV_FLANN_HPP +#define OPENCV_FLANN_HPP #include "opencv2/core.hpp" #include "opencv2/flann/miniflann.hpp" diff --git a/modules/flann/include/opencv2/flann/miniflann.hpp b/modules/flann/include/opencv2/flann/miniflann.hpp index 02fa236d3a..5d25f5e538 100644 --- a/modules/flann/include/opencv2/flann/miniflann.hpp +++ b/modules/flann/include/opencv2/flann/miniflann.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef _OPENCV_MINIFLANN_HPP_ -#define _OPENCV_MINIFLANN_HPP_ +#ifndef OPENCV_MINIFLANN_HPP +#define OPENCV_MINIFLANN_HPP #include "opencv2/core.hpp" #include "opencv2/flann/defines.h" diff --git a/modules/flann/src/precomp.hpp b/modules/flann/src/precomp.hpp index 1c41542857..bcd8889d58 100644 --- a/modules/flann/src/precomp.hpp +++ b/modules/flann/src/precomp.hpp @@ -1,5 +1,5 @@ -#ifndef _OPENCV_FLANN_PRECOMP_HPP_ -#define _OPENCV_FLANN_PRECOMP_HPP_ +#ifndef OPENCV_FLANN_PRECOMP_HPP +#define OPENCV_FLANN_PRECOMP_HPP #include #include diff --git a/modules/flann/test/test_precomp.hpp b/modules/flann/test/test_precomp.hpp index cbee8957fd..4a19d2a0f2 100644 --- a/modules/flann/test/test_precomp.hpp +++ b/modules/flann/test/test_precomp.hpp @@ -6,8 +6,8 @@ # endif #endif -#ifndef __OPENCV_TEST_PRECOMP_HPP__ -#define __OPENCV_TEST_PRECOMP_HPP__ +#ifndef OPENCV_TEST_PRECOMP_HPP +#define OPENCV_TEST_PRECOMP_HPP #include "opencv2/ts.hpp" #include "opencv2/flann.hpp" diff --git a/modules/highgui/include/opencv2/highgui.hpp b/modules/highgui/include/opencv2/highgui.hpp index a515c15b33..3f53e8955e 100644 --- a/modules/highgui/include/opencv2/highgui.hpp +++ b/modules/highgui/include/opencv2/highgui.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_HIGHGUI_HPP__ -#define __OPENCV_HIGHGUI_HPP__ +#ifndef OPENCV_HIGHGUI_HPP +#define OPENCV_HIGHGUI_HPP #include "opencv2/core.hpp" #include "opencv2/imgcodecs.hpp" diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h index 47fdb84a4e..f05f5a986b 100644 --- a/modules/highgui/include/opencv2/highgui/highgui_c.h +++ b/modules/highgui/include/opencv2/highgui/highgui_c.h @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_HIGHGUI_H__ -#define __OPENCV_HIGHGUI_H__ +#ifndef OPENCV_HIGHGUI_H +#define OPENCV_HIGHGUI_H #include "opencv2/core/core_c.h" #include "opencv2/imgproc/imgproc_c.h" diff --git a/modules/imgcodecs/include/opencv2/imgcodecs.hpp b/modules/imgcodecs/include/opencv2/imgcodecs.hpp index ce827a7e0f..7c9f815dde 100644 --- a/modules/imgcodecs/include/opencv2/imgcodecs.hpp +++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_IMGCODECS_HPP__ -#define __OPENCV_IMGCODECS_HPP__ +#ifndef OPENCV_IMGCODECS_HPP +#define OPENCV_IMGCODECS_HPP #include "opencv2/core.hpp" @@ -264,4 +264,4 @@ CV_EXPORTS_W bool imencode( const String& ext, InputArray img, } // cv -#endif //__OPENCV_IMGCODECS_HPP__ +#endif //OPENCV_IMGCODECS_HPP diff --git a/modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h b/modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h index ad793cc94a..58b74a5d74 100644 --- a/modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h +++ b/modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_IMGCODECS_H__ -#define __OPENCV_IMGCODECS_H__ +#ifndef OPENCV_IMGCODECS_H +#define OPENCV_IMGCODECS_H #include "opencv2/core/core_c.h" @@ -134,4 +134,4 @@ CVAPI(int) cvHaveImageWriter(const char* filename); } #endif -#endif // __OPENCV_IMGCODECS_H__ +#endif // OPENCV_IMGCODECS_H diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index 346c8e44f1..e0b72b389d 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_IMGPROC_HPP__ -#define __OPENCV_IMGPROC_HPP__ +#ifndef OPENCV_IMGPROC_HPP +#define OPENCV_IMGPROC_HPP #include "opencv2/core.hpp" diff --git a/modules/imgproc/include/opencv2/imgproc/detail/distortion_model.hpp b/modules/imgproc/include/opencv2/imgproc/detail/distortion_model.hpp index ca293040e4..a9c3ddec8a 100644 --- a/modules/imgproc/include/opencv2/imgproc/detail/distortion_model.hpp +++ b/modules/imgproc/include/opencv2/imgproc/detail/distortion_model.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_IMGPROC_DETAIL_DISTORTION_MODEL_HPP__ -#define __OPENCV_IMGPROC_DETAIL_DISTORTION_MODEL_HPP__ +#ifndef OPENCV_IMGPROC_DETAIL_DISTORTION_MODEL_HPP +#define OPENCV_IMGPROC_DETAIL_DISTORTION_MODEL_HPP //! @cond IGNORED @@ -120,4 +120,4 @@ void computeTiltProjectionMatrix(FLOAT tauX, //! @endcond -#endif // __OPENCV_IMGPROC_DETAIL_DISTORTION_MODEL_HPP__ +#endif // OPENCV_IMGPROC_DETAIL_DISTORTION_MODEL_HPP diff --git a/modules/imgproc/include/opencv2/imgproc/imgproc_c.h b/modules/imgproc/include/opencv2/imgproc/imgproc_c.h index 87518d72e5..d11db4b258 100644 --- a/modules/imgproc/include/opencv2/imgproc/imgproc_c.h +++ b/modules/imgproc/include/opencv2/imgproc/imgproc_c.h @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_IMGPROC_IMGPROC_C_H__ -#define __OPENCV_IMGPROC_IMGPROC_C_H__ +#ifndef OPENCV_IMGPROC_IMGPROC_C_H +#define OPENCV_IMGPROC_IMGPROC_C_H #include "opencv2/imgproc/types_c.h" diff --git a/modules/imgproc/include/opencv2/imgproc/types_c.h b/modules/imgproc/include/opencv2/imgproc/types_c.h index 5ecb460782..eacba02f96 100644 --- a/modules/imgproc/include/opencv2/imgproc/types_c.h +++ b/modules/imgproc/include/opencv2/imgproc/types_c.h @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_IMGPROC_TYPES_C_H__ -#define __OPENCV_IMGPROC_TYPES_C_H__ +#ifndef OPENCV_IMGPROC_TYPES_C_H +#define OPENCV_IMGPROC_TYPES_C_H #include "opencv2/core/core_c.h" diff --git a/modules/ml/include/opencv2/ml.hpp b/modules/ml/include/opencv2/ml.hpp index cea8aec48c..cc730509b9 100644 --- a/modules/ml/include/opencv2/ml.hpp +++ b/modules/ml/include/opencv2/ml.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_ML_HPP__ -#define __OPENCV_ML_HPP__ +#ifndef OPENCV_ML_HPP +#define OPENCV_ML_HPP #ifdef __cplusplus # include "opencv2/core.hpp" @@ -1681,6 +1681,6 @@ CV_EXPORTS void createConcentricSpheresTestSet( int nsamples, int nfeatures, int } #endif // __cplusplus -#endif // __OPENCV_ML_HPP__ +#endif // OPENCV_ML_HPP /* End of file. */ diff --git a/modules/objdetect/include/opencv2/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect.hpp index 6587b3d77a..b5edeb3523 100644 --- a/modules/objdetect/include/opencv2/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_OBJDETECT_HPP__ -#define __OPENCV_OBJDETECT_HPP__ +#ifndef OPENCV_OBJDETECT_HPP +#define OPENCV_OBJDETECT_HPP #include "opencv2/core.hpp" diff --git a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp index 1f5f1d3676..080ae1b7e5 100644 --- a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp +++ b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_OBJDETECT_DBT_HPP__ -#define __OPENCV_OBJDETECT_DBT_HPP__ +#ifndef OPENCV_OBJDETECT_DBT_HPP +#define OPENCV_OBJDETECT_DBT_HPP // After this condition removal update blacklist for bindings: modules/python/common.cmake #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \ diff --git a/modules/objdetect/include/opencv2/objdetect/objdetect_c.h b/modules/objdetect/include/opencv2/objdetect/objdetect_c.h index 632a438625..b3ee7f411c 100644 --- a/modules/objdetect/include/opencv2/objdetect/objdetect_c.h +++ b/modules/objdetect/include/opencv2/objdetect/objdetect_c.h @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_OBJDETECT_C_H__ -#define __OPENCV_OBJDETECT_C_H__ +#ifndef OPENCV_OBJDETECT_C_H +#define OPENCV_OBJDETECT_C_H #include "opencv2/core/core_c.h" @@ -162,4 +162,4 @@ CV_EXPORTS CvSeq* cvHaarDetectObjectsForROC( const CvArr* image, #endif -#endif /* __OPENCV_OBJDETECT_C_H__ */ +#endif /* OPENCV_OBJDETECT_C_H */ diff --git a/modules/photo/include/opencv2/photo.hpp b/modules/photo/include/opencv2/photo.hpp index c093f65521..a445dd3b03 100644 --- a/modules/photo/include/opencv2/photo.hpp +++ b/modules/photo/include/opencv2/photo.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_PHOTO_HPP__ -#define __OPENCV_PHOTO_HPP__ +#ifndef OPENCV_PHOTO_HPP +#define OPENCV_PHOTO_HPP #include "opencv2/core.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/photo/include/opencv2/photo/cuda.hpp b/modules/photo/include/opencv2/photo/cuda.hpp index aeac1fa861..a2f38167e6 100644 --- a/modules/photo/include/opencv2/photo/cuda.hpp +++ b/modules/photo/include/opencv2/photo/cuda.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_PHOTO_CUDA_HPP__ -#define __OPENCV_PHOTO_CUDA_HPP__ +#ifndef OPENCV_PHOTO_CUDA_HPP +#define OPENCV_PHOTO_CUDA_HPP #include "opencv2/core/cuda.hpp" @@ -129,4 +129,4 @@ CV_EXPORTS void fastNlMeansDenoisingColored(InputArray src, OutputArray dst, }} // namespace cv { namespace cuda { -#endif /* __OPENCV_PHOTO_CUDA_HPP__ */ +#endif /* OPENCV_PHOTO_CUDA_HPP */ diff --git a/modules/photo/include/opencv2/photo/photo_c.h b/modules/photo/include/opencv2/photo/photo_c.h index 07ca9b370a..cd623c1913 100644 --- a/modules/photo/include/opencv2/photo/photo_c.h +++ b/modules/photo/include/opencv2/photo/photo_c.h @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_PHOTO_C_H__ -#define __OPENCV_PHOTO_C_H__ +#ifndef OPENCV_PHOTO_C_H +#define OPENCV_PHOTO_C_H #include "opencv2/core/core_c.h" @@ -71,4 +71,4 @@ CVAPI(void) cvInpaint( const CvArr* src, const CvArr* inpaint_mask, } //extern "C" #endif -#endif //__OPENCV_PHOTO_C_H__ +#endif //OPENCV_PHOTO_C_H diff --git a/modules/shape/include/opencv2/shape.hpp b/modules/shape/include/opencv2/shape.hpp index 6999476a7d..f302b6bbc0 100644 --- a/modules/shape/include/opencv2/shape.hpp +++ b/modules/shape/include/opencv2/shape.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_SHAPE_HPP__ -#define __OPENCV_SHAPE_HPP__ +#ifndef OPENCV_SHAPE_HPP +#define OPENCV_SHAPE_HPP #include "opencv2/shape/emdL1.hpp" #include "opencv2/shape/shape_transformer.hpp" diff --git a/modules/shape/include/opencv2/shape/emdL1.hpp b/modules/shape/include/opencv2/shape/emdL1.hpp index 1dfa7581a6..a15d68c222 100644 --- a/modules/shape/include/opencv2/shape/emdL1.hpp +++ b/modules/shape/include/opencv2/shape/emdL1.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_EMD_L1_HPP__ -#define __OPENCV_EMD_L1_HPP__ +#ifndef OPENCV_EMD_L1_HPP +#define OPENCV_EMD_L1_HPP #include "opencv2/core.hpp" diff --git a/modules/shape/include/opencv2/shape/hist_cost.hpp b/modules/shape/include/opencv2/shape/hist_cost.hpp index 15c0a87c7b..21d0d6807b 100644 --- a/modules/shape/include/opencv2/shape/hist_cost.hpp +++ b/modules/shape/include/opencv2/shape/hist_cost.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_HIST_COST_HPP__ -#define __OPENCV_HIST_COST_HPP__ +#ifndef OPENCV_HIST_COST_HPP +#define OPENCV_HIST_COST_HPP #include "opencv2/imgproc.hpp" diff --git a/modules/shape/include/opencv2/shape/shape_distance.hpp b/modules/shape/include/opencv2/shape/shape_distance.hpp index 4b0c3b5f6b..e4c3a87197 100644 --- a/modules/shape/include/opencv2/shape/shape_distance.hpp +++ b/modules/shape/include/opencv2/shape/shape_distance.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_SHAPE_SHAPE_DISTANCE_HPP__ -#define __OPENCV_SHAPE_SHAPE_DISTANCE_HPP__ +#ifndef OPENCV_SHAPE_SHAPE_DISTANCE_HPP +#define OPENCV_SHAPE_SHAPE_DISTANCE_HPP #include "opencv2/core.hpp" #include "opencv2/shape/hist_cost.hpp" #include "opencv2/shape/shape_transformer.hpp" diff --git a/modules/shape/include/opencv2/shape/shape_transformer.hpp b/modules/shape/include/opencv2/shape/shape_transformer.hpp index 2180613670..ace104eddd 100644 --- a/modules/shape/include/opencv2/shape/shape_transformer.hpp +++ b/modules/shape/include/opencv2/shape/shape_transformer.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_SHAPE_SHAPE_TRANSFORM_HPP__ -#define __OPENCV_SHAPE_SHAPE_TRANSFORM_HPP__ +#ifndef OPENCV_SHAPE_SHAPE_TRANSFORM_HPP +#define OPENCV_SHAPE_SHAPE_TRANSFORM_HPP #include #include "opencv2/core.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/stitching/include/opencv2/stitching.hpp b/modules/stitching/include/opencv2/stitching.hpp index 96cde14010..a2e1f82ddc 100644 --- a/modules/stitching/include/opencv2/stitching.hpp +++ b/modules/stitching/include/opencv2/stitching.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_STITCHER_HPP__ -#define __OPENCV_STITCHING_STITCHER_HPP__ +#ifndef OPENCV_STITCHING_STITCHER_HPP +#define OPENCV_STITCHING_STITCHER_HPP #include "opencv2/core.hpp" #include "opencv2/features2d.hpp" @@ -254,4 +254,4 @@ CV_EXPORTS_W Ptr createStitcher(bool try_use_gpu = false); } // namespace cv -#endif // __OPENCV_STITCHING_STITCHER_HPP__ +#endif // OPENCV_STITCHING_STITCHER_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/autocalib.hpp b/modules/stitching/include/opencv2/stitching/detail/autocalib.hpp index ccc0aa179e..19705e27a6 100644 --- a/modules/stitching/include/opencv2/stitching/detail/autocalib.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/autocalib.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_AUTOCALIB_HPP__ -#define __OPENCV_STITCHING_AUTOCALIB_HPP__ +#ifndef OPENCV_STITCHING_AUTOCALIB_HPP +#define OPENCV_STITCHING_AUTOCALIB_HPP #include "opencv2/core.hpp" #include "matchers.hpp" @@ -83,4 +83,4 @@ bool CV_EXPORTS calibrateRotatingCamera(const std::vector &Hs, Mat &K); } // namespace detail } // namespace cv -#endif // __OPENCV_STITCHING_AUTOCALIB_HPP__ +#endif // OPENCV_STITCHING_AUTOCALIB_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/blenders.hpp b/modules/stitching/include/opencv2/stitching/detail/blenders.hpp index 3d20036ea1..4ccaa70e1c 100644 --- a/modules/stitching/include/opencv2/stitching/detail/blenders.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/blenders.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_BLENDERS_HPP__ -#define __OPENCV_STITCHING_BLENDERS_HPP__ +#ifndef OPENCV_STITCHING_BLENDERS_HPP +#define OPENCV_STITCHING_BLENDERS_HPP #if defined(NO) # warning Detected Apple 'NO' macro definition, it can cause build conflicts. Please, include this header before any Apple headers. @@ -164,4 +164,4 @@ void CV_EXPORTS restoreImageFromLaplacePyrGpu(std::vector& pyr); } // namespace detail } // namespace cv -#endif // __OPENCV_STITCHING_BLENDERS_HPP__ +#endif // OPENCV_STITCHING_BLENDERS_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/camera.hpp b/modules/stitching/include/opencv2/stitching/detail/camera.hpp index c231ba5ed6..7013747da5 100644 --- a/modules/stitching/include/opencv2/stitching/detail/camera.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/camera.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_CAMERA_HPP__ -#define __OPENCV_STITCHING_CAMERA_HPP__ +#ifndef OPENCV_STITCHING_CAMERA_HPP +#define OPENCV_STITCHING_CAMERA_HPP #include "opencv2/core.hpp" @@ -75,4 +75,4 @@ struct CV_EXPORTS CameraParams } // namespace detail } // namespace cv -#endif // #ifndef __OPENCV_STITCHING_CAMERA_HPP__ +#endif // #ifndef OPENCV_STITCHING_CAMERA_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp b/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp index 7855956a63..f5a8122b95 100644 --- a/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__ -#define __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__ +#ifndef OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP +#define OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP #if defined(NO) # warning Detected Apple 'NO' macro definition, it can cause build conflicts. Please, include this header before any Apple headers. @@ -133,4 +133,4 @@ private: } // namespace detail } // namespace cv -#endif // __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__ +#endif // OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp index 8f34bd23a3..eccc41172a 100644 --- a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_MATCHERS_HPP__ -#define __OPENCV_STITCHING_MATCHERS_HPP__ +#ifndef OPENCV_STITCHING_MATCHERS_HPP +#define OPENCV_STITCHING_MATCHERS_HPP #include "opencv2/core.hpp" #include "opencv2/features2d.hpp" @@ -272,4 +272,4 @@ protected: } // namespace detail } // namespace cv -#endif // __OPENCV_STITCHING_MATCHERS_HPP__ +#endif // OPENCV_STITCHING_MATCHERS_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp b/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp index 2c86e6335c..9f7b8bde1a 100644 --- a/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_MOTION_ESTIMATORS_HPP__ -#define __OPENCV_STITCHING_MOTION_ESTIMATORS_HPP__ +#ifndef OPENCV_STITCHING_MOTION_ESTIMATORS_HPP +#define OPENCV_STITCHING_MOTION_ESTIMATORS_HPP #include "opencv2/core.hpp" #include "matchers.hpp" @@ -271,4 +271,4 @@ void CV_EXPORTS findMaxSpanningTree( } // namespace detail } // namespace cv -#endif // __OPENCV_STITCHING_MOTION_ESTIMATORS_HPP__ +#endif // OPENCV_STITCHING_MOTION_ESTIMATORS_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp b/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp index 4ff22c40c0..a251f48351 100644 --- a/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_SEAM_FINDERS_HPP__ -#define __OPENCV_STITCHING_SEAM_FINDERS_HPP__ +#ifndef OPENCV_STITCHING_SEAM_FINDERS_HPP +#define OPENCV_STITCHING_SEAM_FINDERS_HPP #include #include "opencv2/core.hpp" @@ -282,4 +282,4 @@ private: } // namespace detail } // namespace cv -#endif // __OPENCV_STITCHING_SEAM_FINDERS_HPP__ +#endif // OPENCV_STITCHING_SEAM_FINDERS_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/timelapsers.hpp b/modules/stitching/include/opencv2/stitching/detail/timelapsers.hpp index d64c03c27d..ae37b03b75 100644 --- a/modules/stitching/include/opencv2/stitching/detail/timelapsers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/timelapsers.hpp @@ -41,8 +41,8 @@ //M*/ -#ifndef __OPENCV_STITCHING_TIMELAPSERS_HPP__ -#define __OPENCV_STITCHING_TIMELAPSERS_HPP__ +#ifndef OPENCV_STITCHING_TIMELAPSERS_HPP +#define OPENCV_STITCHING_TIMELAPSERS_HPP #include "opencv2/core.hpp" @@ -88,4 +88,4 @@ public: } // namespace detail } // namespace cv -#endif // __OPENCV_STITCHING_TIMELAPSERS_HPP__ +#endif // OPENCV_STITCHING_TIMELAPSERS_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/util.hpp b/modules/stitching/include/opencv2/stitching/detail/util.hpp index 3845ba59ea..62f6925ddc 100644 --- a/modules/stitching/include/opencv2/stitching/detail/util.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/util.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_UTIL_HPP__ -#define __OPENCV_STITCHING_UTIL_HPP__ +#ifndef OPENCV_STITCHING_UTIL_HPP +#define OPENCV_STITCHING_UTIL_HPP #include #include "opencv2/core.hpp" @@ -168,4 +168,4 @@ CV_EXPORTS int& stitchingLogLevel(); #include "util_inl.hpp" -#endif // __OPENCV_STITCHING_UTIL_HPP__ +#endif // OPENCV_STITCHING_UTIL_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/util_inl.hpp b/modules/stitching/include/opencv2/stitching/detail/util_inl.hpp index 6ac6f8ecc6..dafab8b811 100644 --- a/modules/stitching/include/opencv2/stitching/detail/util_inl.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/util_inl.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_UTIL_INL_HPP__ -#define __OPENCV_STITCHING_UTIL_INL_HPP__ +#ifndef OPENCV_STITCHING_UTIL_INL_HPP +#define OPENCV_STITCHING_UTIL_INL_HPP #include #include "opencv2/core.hpp" @@ -128,4 +128,4 @@ static inline double sqr(double x) { return x * x; } //! @endcond -#endif // __OPENCV_STITCHING_UTIL_INL_HPP__ +#endif // OPENCV_STITCHING_UTIL_INL_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp index 0cb9e42e87..f848c49360 100644 --- a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_WARPERS_HPP__ -#define __OPENCV_STITCHING_WARPERS_HPP__ +#ifndef OPENCV_STITCHING_WARPERS_HPP +#define OPENCV_STITCHING_WARPERS_HPP #include "opencv2/core.hpp" #include "opencv2/core/cuda.hpp" @@ -585,4 +585,4 @@ protected: #include "warpers_inl.hpp" -#endif // __OPENCV_STITCHING_WARPERS_HPP__ +#endif // OPENCV_STITCHING_WARPERS_HPP diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp index 0416ecb5ee..fee6c543c5 100644 --- a/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_WARPERS_INL_HPP__ -#define __OPENCV_STITCHING_WARPERS_INL_HPP__ +#ifndef OPENCV_STITCHING_WARPERS_INL_HPP +#define OPENCV_STITCHING_WARPERS_INL_HPP #include "opencv2/core.hpp" #include "warpers.hpp" // Make your IDE see declarations @@ -771,4 +771,4 @@ void PlanePortraitProjector::mapBackward(float u0, float v0, float &x, float &y) //! @endcond -#endif // __OPENCV_STITCHING_WARPERS_INL_HPP__ +#endif // OPENCV_STITCHING_WARPERS_INL_HPP diff --git a/modules/stitching/include/opencv2/stitching/warpers.hpp b/modules/stitching/include/opencv2/stitching/warpers.hpp index 7e570d30c4..23f69516ac 100644 --- a/modules/stitching/include/opencv2/stitching/warpers.hpp +++ b/modules/stitching/include/opencv2/stitching/warpers.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_STITCHING_WARPER_CREATORS_HPP__ -#define __OPENCV_STITCHING_WARPER_CREATORS_HPP__ +#ifndef OPENCV_STITCHING_WARPER_CREATORS_HPP +#define OPENCV_STITCHING_WARPER_CREATORS_HPP #include "opencv2/stitching/detail/warpers.hpp" @@ -180,4 +180,4 @@ public: } // namespace cv -#endif // __OPENCV_STITCHING_WARPER_CREATORS_HPP__ +#endif // OPENCV_STITCHING_WARPER_CREATORS_HPP diff --git a/modules/superres/include/opencv2/superres.hpp b/modules/superres/include/opencv2/superres.hpp index dec8e4eda8..60d4faa6e6 100644 --- a/modules/superres/include/opencv2/superres.hpp +++ b/modules/superres/include/opencv2/superres.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_SUPERRES_HPP__ -#define __OPENCV_SUPERRES_HPP__ +#ifndef OPENCV_SUPERRES_HPP +#define OPENCV_SUPERRES_HPP #include "opencv2/core.hpp" #include "opencv2/superres/optical_flow.hpp" @@ -204,4 +204,4 @@ namespace cv } } -#endif // __OPENCV_SUPERRES_HPP__ +#endif // OPENCV_SUPERRES_HPP diff --git a/modules/superres/include/opencv2/superres/optical_flow.hpp b/modules/superres/include/opencv2/superres/optical_flow.hpp index d2f29a39bd..07e7ca9c9e 100644 --- a/modules/superres/include/opencv2/superres/optical_flow.hpp +++ b/modules/superres/include/opencv2/superres/optical_flow.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_SUPERRES_OPTICAL_FLOW_HPP__ -#define __OPENCV_SUPERRES_OPTICAL_FLOW_HPP__ +#ifndef OPENCV_SUPERRES_OPTICAL_FLOW_HPP +#define OPENCV_SUPERRES_OPTICAL_FLOW_HPP #include "opencv2/core.hpp" @@ -200,4 +200,4 @@ namespace cv } } -#endif // __OPENCV_SUPERRES_OPTICAL_FLOW_HPP__ +#endif // OPENCV_SUPERRES_OPTICAL_FLOW_HPP diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp index 5f153f457f..5f5dec65a2 100644 --- a/modules/ts/include/opencv2/ts.hpp +++ b/modules/ts/include/opencv2/ts.hpp @@ -1,5 +1,5 @@ -#ifndef __OPENCV_GTESTCV_HPP__ -#define __OPENCV_GTESTCV_HPP__ +#ifndef OPENCV_GTESTCV_HPP +#define OPENCV_GTESTCV_HPP #include "opencv2/core/cvdef.h" #include // for va_list diff --git a/modules/ts/include/opencv2/ts/cuda_perf.hpp b/modules/ts/include/opencv2/ts/cuda_perf.hpp index c179b72499..672b9ff1b4 100644 --- a/modules/ts/include/opencv2/ts/cuda_perf.hpp +++ b/modules/ts/include/opencv2/ts/cuda_perf.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_PERF_UTILITY_HPP__ -#define __OPENCV_CUDA_PERF_UTILITY_HPP__ +#ifndef OPENCV_CUDA_PERF_UTILITY_HPP +#define OPENCV_CUDA_PERF_UTILITY_HPP #include "opencv2/core.hpp" #include "opencv2/imgcodecs.hpp" @@ -125,4 +125,4 @@ namespace perf #endif } -#endif // __OPENCV_CUDA_PERF_UTILITY_HPP__ +#endif // OPENCV_CUDA_PERF_UTILITY_HPP diff --git a/modules/ts/include/opencv2/ts/cuda_test.hpp b/modules/ts/include/opencv2/ts/cuda_test.hpp index 64b7eb90c0..b7470a49fb 100644 --- a/modules/ts/include/opencv2/ts/cuda_test.hpp +++ b/modules/ts/include/opencv2/ts/cuda_test.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_CUDA_TEST_UTILITY_HPP__ -#define __OPENCV_CUDA_TEST_UTILITY_HPP__ +#ifndef OPENCV_CUDA_TEST_UTILITY_HPP +#define OPENCV_CUDA_TEST_UTILITY_HPP #include #include "cvconfig.h" @@ -363,4 +363,4 @@ namespace cv { namespace cuda #endif // HAVE_CUDA -#endif // __OPENCV_CUDA_TEST_UTILITY_HPP__ +#endif // OPENCV_CUDA_TEST_UTILITY_HPP diff --git a/modules/ts/include/opencv2/ts/ocl_perf.hpp b/modules/ts/include/opencv2/ts/ocl_perf.hpp index c2e860067b..7d7a51dc97 100644 --- a/modules/ts/include/opencv2/ts/ocl_perf.hpp +++ b/modules/ts/include/opencv2/ts/ocl_perf.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_TS_OCL_PERF_HPP__ -#define __OPENCV_TS_OCL_PERF_HPP__ +#ifndef OPENCV_TS_OCL_PERF_HPP +#define OPENCV_TS_OCL_PERF_HPP #include "ocl_test.hpp" #include "ts_perf.hpp" @@ -128,4 +128,4 @@ using namespace perf; } // namespace cvtest::ocl } // namespace cvtest -#endif // __OPENCV_TS_OCL_PERF_HPP__ +#endif // OPENCV_TS_OCL_PERF_HPP diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp index 2dac2110e9..0e2d3dd75e 100644 --- a/modules/ts/include/opencv2/ts/ocl_test.hpp +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_TS_OCL_TEST_HPP__ -#define __OPENCV_TS_OCL_TEST_HPP__ +#ifndef OPENCV_TS_OCL_TEST_HPP +#define OPENCV_TS_OCL_TEST_HPP #include "opencv2/opencv_modules.hpp" @@ -364,4 +364,4 @@ CV_ENUM(BorderType, BORDER_CONSTANT, BORDER_REPLICATE, BORDER_REFLECT, BORDER_WR } } // namespace cvtest::ocl -#endif // __OPENCV_TS_OCL_TEST_HPP__ +#endif // OPENCV_TS_OCL_TEST_HPP diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp index 08039baded..7bf5e50553 100644 --- a/modules/ts/include/opencv2/ts/ts_ext.hpp +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp @@ -5,8 +5,8 @@ // Copyright (C) 2014, Intel, Inc., all rights reserved. // Third party copyrights are property of their respective owners. -#ifndef __OPENCV_TS_EXT_HPP__ -#define __OPENCV_TS_EXT_HPP__ +#ifndef OPENCV_TS_EXT_HPP +#define OPENCV_TS_EXT_HPP void checkIppStatus(); @@ -89,4 +89,4 @@ void checkIppStatus(); void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() { cv::ipp::setIppStatus(0); Body(); checkIppStatus(); } \ void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::Body() -#endif // __OPENCV_TS_EXT_HPP__ +#endif // OPENCV_TS_EXT_HPP diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp index c8bddf3fcd..e0d1494df9 100644 --- a/modules/ts/include/opencv2/ts/ts_perf.hpp +++ b/modules/ts/include/opencv2/ts/ts_perf.hpp @@ -1,5 +1,5 @@ -#ifndef __OPENCV_TS_PERF_HPP__ -#define __OPENCV_TS_PERF_HPP__ +#ifndef OPENCV_TS_PERF_HPP +#define OPENCV_TS_PERF_HPP #include "opencv2/core.hpp" #include "ts_gtest.h" @@ -691,4 +691,4 @@ struct CV_EXPORTS KeypointGreater : void CV_EXPORTS sort(std::vector& pts, cv::InputOutputArray descriptors); } //namespace perf -#endif //__OPENCV_TS_PERF_HPP__ +#endif //OPENCV_TS_PERF_HPP diff --git a/modules/video/include/opencv2/video.hpp b/modules/video/include/opencv2/video.hpp index a5938154ae..aa644a937a 100644 --- a/modules/video/include/opencv2/video.hpp +++ b/modules/video/include/opencv2/video.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_VIDEO_HPP__ -#define __OPENCV_VIDEO_HPP__ +#ifndef OPENCV_VIDEO_HPP +#define OPENCV_VIDEO_HPP /** @defgroup video Video Analysis @@ -60,4 +60,4 @@ #include "opencv2/video/tracking_c.h" #endif -#endif //__OPENCV_VIDEO_HPP__ +#endif //OPENCV_VIDEO_HPP diff --git a/modules/video/include/opencv2/video/background_segm.hpp b/modules/video/include/opencv2/video/background_segm.hpp index dbeccbdc8f..2952d57c9e 100644 --- a/modules/video/include/opencv2/video/background_segm.hpp +++ b/modules/video/include/opencv2/video/background_segm.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_BACKGROUND_SEGM_HPP__ -#define __OPENCV_BACKGROUND_SEGM_HPP__ +#ifndef OPENCV_BACKGROUND_SEGM_HPP +#define OPENCV_BACKGROUND_SEGM_HPP #include "opencv2/core.hpp" diff --git a/modules/video/include/opencv2/video/tracking.hpp b/modules/video/include/opencv2/video/tracking.hpp index c0da7c7a39..0ae744d86d 100644 --- a/modules/video/include/opencv2/video/tracking.hpp +++ b/modules/video/include/opencv2/video/tracking.hpp @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_TRACKING_HPP__ -#define __OPENCV_TRACKING_HPP__ +#ifndef OPENCV_TRACKING_HPP +#define OPENCV_TRACKING_HPP #include "opencv2/core.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/video/include/opencv2/video/tracking_c.h b/modules/video/include/opencv2/video/tracking_c.h index b355352879..3e32fbd0c0 100644 --- a/modules/video/include/opencv2/video/tracking_c.h +++ b/modules/video/include/opencv2/video/tracking_c.h @@ -41,8 +41,8 @@ // //M*/ -#ifndef __OPENCV_TRACKING_C_H__ -#define __OPENCV_TRACKING_C_H__ +#ifndef OPENCV_TRACKING_C_H +#define OPENCV_TRACKING_C_H #include "opencv2/imgproc/types_c.h" @@ -229,4 +229,4 @@ CVAPI(const CvMat*) cvKalmanCorrect( CvKalman* kalman, const CvMat* measurement #endif -#endif // __OPENCV_TRACKING_C_H__ +#endif // OPENCV_TRACKING_C_H diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp index 0acb3d3f1e..1ee40687d9 100644 --- a/modules/videoio/include/opencv2/videoio.hpp +++ b/modules/videoio/include/opencv2/videoio.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOIO_HPP__ -#define __OPENCV_VIDEOIO_HPP__ +#ifndef OPENCV_VIDEOIO_HPP +#define OPENCV_VIDEOIO_HPP #include "opencv2/core.hpp" @@ -822,4 +822,4 @@ template<> CV_EXPORTS void DefaultDeleter::operator ()(CvVideoWri } // cv -#endif //__OPENCV_VIDEOIO_HPP__ +#endif //OPENCV_VIDEOIO_HPP diff --git a/modules/videoio/include/opencv2/videoio/videoio_c.h b/modules/videoio/include/opencv2/videoio/videoio_c.h index e502c7be83..e5ff862e9d 100644 --- a/modules/videoio/include/opencv2/videoio/videoio_c.h +++ b/modules/videoio/include/opencv2/videoio/videoio_c.h @@ -39,8 +39,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOIO_H__ -#define __OPENCV_VIDEOIO_H__ +#ifndef OPENCV_VIDEOIO_H +#define OPENCV_VIDEOIO_H #include "opencv2/core/core_c.h" @@ -545,4 +545,4 @@ CVAPI(void) cvReleaseVideoWriter( CvVideoWriter** writer ); } #endif -#endif //__OPENCV_VIDEOIO_H__ +#endif //OPENCV_VIDEOIO_H diff --git a/modules/videostab/include/opencv2/videostab.hpp b/modules/videostab/include/opencv2/videostab.hpp index 7c8dc412dd..ca3f5adef2 100644 --- a/modules/videostab/include/opencv2/videostab.hpp +++ b/modules/videostab/include/opencv2/videostab.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_HPP__ -#define __OPENCV_VIDEOSTAB_HPP__ +#ifndef OPENCV_VIDEOSTAB_HPP +#define OPENCV_VIDEOSTAB_HPP /** @defgroup videostab Video Stabilization diff --git a/modules/videostab/include/opencv2/videostab/deblurring.hpp b/modules/videostab/include/opencv2/videostab/deblurring.hpp index 8028c1d811..b383f0d45a 100644 --- a/modules/videostab/include/opencv2/videostab/deblurring.hpp +++ b/modules/videostab/include/opencv2/videostab/deblurring.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_DEBLURRING_HPP__ -#define __OPENCV_VIDEOSTAB_DEBLURRING_HPP__ +#ifndef OPENCV_VIDEOSTAB_DEBLURRING_HPP +#define OPENCV_VIDEOSTAB_DEBLURRING_HPP #include #include "opencv2/core.hpp" diff --git a/modules/videostab/include/opencv2/videostab/fast_marching.hpp b/modules/videostab/include/opencv2/videostab/fast_marching.hpp index c0c7985a74..526b10bb09 100644 --- a/modules/videostab/include/opencv2/videostab/fast_marching.hpp +++ b/modules/videostab/include/opencv2/videostab/fast_marching.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_FAST_MARCHING_HPP__ -#define __OPENCV_VIDEOSTAB_FAST_MARCHING_HPP__ +#ifndef OPENCV_VIDEOSTAB_FAST_MARCHING_HPP +#define OPENCV_VIDEOSTAB_FAST_MARCHING_HPP #include #include diff --git a/modules/videostab/include/opencv2/videostab/fast_marching_inl.hpp b/modules/videostab/include/opencv2/videostab/fast_marching_inl.hpp index 6388e69666..fdd488aac8 100644 --- a/modules/videostab/include/opencv2/videostab/fast_marching_inl.hpp +++ b/modules/videostab/include/opencv2/videostab/fast_marching_inl.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_FAST_MARCHING_INL_HPP__ -#define __OPENCV_VIDEOSTAB_FAST_MARCHING_INL_HPP__ +#ifndef OPENCV_VIDEOSTAB_FAST_MARCHING_INL_HPP +#define OPENCV_VIDEOSTAB_FAST_MARCHING_INL_HPP #include "opencv2/videostab/fast_marching.hpp" diff --git a/modules/videostab/include/opencv2/videostab/frame_source.hpp b/modules/videostab/include/opencv2/videostab/frame_source.hpp index 612fbdb30b..e4e00b59a6 100644 --- a/modules/videostab/include/opencv2/videostab/frame_source.hpp +++ b/modules/videostab/include/opencv2/videostab/frame_source.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_FRAME_SOURCE_HPP__ -#define __OPENCV_VIDEOSTAB_FRAME_SOURCE_HPP__ +#ifndef OPENCV_VIDEOSTAB_FRAME_SOURCE_HPP +#define OPENCV_VIDEOSTAB_FRAME_SOURCE_HPP #include #include "opencv2/core.hpp" diff --git a/modules/videostab/include/opencv2/videostab/global_motion.hpp b/modules/videostab/include/opencv2/videostab/global_motion.hpp index 5d51e4234a..80b147a6b5 100644 --- a/modules/videostab/include/opencv2/videostab/global_motion.hpp +++ b/modules/videostab/include/opencv2/videostab/global_motion.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_GLOBAL_MOTION_HPP__ -#define __OPENCV_VIDEOSTAB_GLOBAL_MOTION_HPP__ +#ifndef OPENCV_VIDEOSTAB_GLOBAL_MOTION_HPP +#define OPENCV_VIDEOSTAB_GLOBAL_MOTION_HPP #include #include diff --git a/modules/videostab/include/opencv2/videostab/inpainting.hpp b/modules/videostab/include/opencv2/videostab/inpainting.hpp index 844c68c7b3..61eeec357c 100644 --- a/modules/videostab/include/opencv2/videostab/inpainting.hpp +++ b/modules/videostab/include/opencv2/videostab/inpainting.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_INPAINTINT_HPP__ -#define __OPENCV_VIDEOSTAB_INPAINTINT_HPP__ +#ifndef OPENCV_VIDEOSTAB_INPAINTINT_HPP +#define OPENCV_VIDEOSTAB_INPAINTINT_HPP #include #include "opencv2/core.hpp" diff --git a/modules/videostab/include/opencv2/videostab/log.hpp b/modules/videostab/include/opencv2/videostab/log.hpp index 28625ed298..81c634a3d8 100644 --- a/modules/videostab/include/opencv2/videostab/log.hpp +++ b/modules/videostab/include/opencv2/videostab/log.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_LOG_HPP__ -#define __OPENCV_VIDEOSTAB_LOG_HPP__ +#ifndef OPENCV_VIDEOSTAB_LOG_HPP +#define OPENCV_VIDEOSTAB_LOG_HPP #include "opencv2/core.hpp" diff --git a/modules/videostab/include/opencv2/videostab/motion_core.hpp b/modules/videostab/include/opencv2/videostab/motion_core.hpp index 17448e3c29..4525cc7b3c 100644 --- a/modules/videostab/include/opencv2/videostab/motion_core.hpp +++ b/modules/videostab/include/opencv2/videostab/motion_core.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_MOTION_CORE_HPP__ -#define __OPENCV_VIDEOSTAB_MOTION_CORE_HPP__ +#ifndef OPENCV_VIDEOSTAB_MOTION_CORE_HPP +#define OPENCV_VIDEOSTAB_MOTION_CORE_HPP #include #include "opencv2/core.hpp" diff --git a/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp b/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp index 3bdbfbd009..5ea5a65a68 100644 --- a/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp +++ b/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_MOTION_STABILIZING_HPP__ -#define __OPENCV_VIDEOSTAB_MOTION_STABILIZING_HPP__ +#ifndef OPENCV_VIDEOSTAB_MOTION_STABILIZING_HPP +#define OPENCV_VIDEOSTAB_MOTION_STABILIZING_HPP #include #include diff --git a/modules/videostab/include/opencv2/videostab/optical_flow.hpp b/modules/videostab/include/opencv2/videostab/optical_flow.hpp index 41d1953549..d631488999 100644 --- a/modules/videostab/include/opencv2/videostab/optical_flow.hpp +++ b/modules/videostab/include/opencv2/videostab/optical_flow.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_OPTICAL_FLOW_HPP__ -#define __OPENCV_VIDEOSTAB_OPTICAL_FLOW_HPP__ +#ifndef OPENCV_VIDEOSTAB_OPTICAL_FLOW_HPP +#define OPENCV_VIDEOSTAB_OPTICAL_FLOW_HPP #include "opencv2/core.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp b/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp index 9e40f854ca..9b9b3844cc 100644 --- a/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp +++ b/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_OUTLIER_REJECTION_HPP__ -#define __OPENCV_VIDEOSTAB_OUTLIER_REJECTION_HPP__ +#ifndef OPENCV_VIDEOSTAB_OUTLIER_REJECTION_HPP +#define OPENCV_VIDEOSTAB_OUTLIER_REJECTION_HPP #include #include "opencv2/core.hpp" diff --git a/modules/videostab/include/opencv2/videostab/ring_buffer.hpp b/modules/videostab/include/opencv2/videostab/ring_buffer.hpp index 7cc3f03e9a..55d52444bc 100644 --- a/modules/videostab/include/opencv2/videostab/ring_buffer.hpp +++ b/modules/videostab/include/opencv2/videostab/ring_buffer.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_RING_BUFFER_HPP__ -#define __OPENCV_VIDEOSTAB_RING_BUFFER_HPP__ +#ifndef OPENCV_VIDEOSTAB_RING_BUFFER_HPP +#define OPENCV_VIDEOSTAB_RING_BUFFER_HPP #include #include "opencv2/imgproc.hpp" diff --git a/modules/videostab/include/opencv2/videostab/stabilizer.hpp b/modules/videostab/include/opencv2/videostab/stabilizer.hpp index c18d31416c..b78b4eaef4 100644 --- a/modules/videostab/include/opencv2/videostab/stabilizer.hpp +++ b/modules/videostab/include/opencv2/videostab/stabilizer.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_STABILIZER_HPP__ -#define __OPENCV_VIDEOSTAB_STABILIZER_HPP__ +#ifndef OPENCV_VIDEOSTAB_STABILIZER_HPP +#define OPENCV_VIDEOSTAB_STABILIZER_HPP #include #include diff --git a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp index 3f0a9432b9..a44410bfd6 100644 --- a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp +++ b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_VIDEOSTAB_WOBBLE_SUPPRESSION_HPP__ -#define __OPENCV_VIDEOSTAB_WOBBLE_SUPPRESSION_HPP__ +#ifndef OPENCV_VIDEOSTAB_WOBBLE_SUPPRESSION_HPP +#define OPENCV_VIDEOSTAB_WOBBLE_SUPPRESSION_HPP #include #include "opencv2/core.hpp" diff --git a/modules/viz/include/opencv2/viz.hpp b/modules/viz/include/opencv2/viz.hpp index 3f8353efe3..b896ef7670 100644 --- a/modules/viz/include/opencv2/viz.hpp +++ b/modules/viz/include/opencv2/viz.hpp @@ -43,8 +43,8 @@ // //M*/ -#ifndef __OPENCV_VIZ_HPP__ -#define __OPENCV_VIZ_HPP__ +#ifndef OPENCV_VIZ_HPP +#define OPENCV_VIZ_HPP #include #include @@ -81,4 +81,4 @@ cw.setColor(viz::Color::yellow()); @} */ -#endif /* __OPENCV_VIZ_HPP__ */ +#endif /* OPENCV_VIZ_HPP */ diff --git a/modules/viz/include/opencv2/viz/types.hpp b/modules/viz/include/opencv2/viz/types.hpp index 3c88fbaa5a..f485442161 100644 --- a/modules/viz/include/opencv2/viz/types.hpp +++ b/modules/viz/include/opencv2/viz/types.hpp @@ -43,8 +43,8 @@ // //M*/ -#ifndef __OPENCV_VIZ_TYPES_HPP__ -#define __OPENCV_VIZ_TYPES_HPP__ +#ifndef OPENCV_VIZ_TYPES_HPP +#define OPENCV_VIZ_TYPES_HPP #include #include diff --git a/modules/viz/include/opencv2/viz/viz3d.hpp b/modules/viz/include/opencv2/viz/viz3d.hpp index 33c278e457..86e4a3839b 100644 --- a/modules/viz/include/opencv2/viz/viz3d.hpp +++ b/modules/viz/include/opencv2/viz/viz3d.hpp @@ -43,8 +43,8 @@ // //M*/ -#ifndef __OPENCV_VIZ_VIZ3D_HPP__ -#define __OPENCV_VIZ_VIZ3D_HPP__ +#ifndef OPENCV_VIZ_VIZ3D_HPP +#define OPENCV_VIZ_VIZ3D_HPP #if !defined YES_I_AGREE_THAT_VIZ_API_IS_NOT_STABLE_NOW_AND_BINARY_COMPARTIBILITY_WONT_BE_SUPPORTED && !defined CVAPI_EXPORTS //#error "Viz is in beta state now. Please define macro above to use it" diff --git a/modules/viz/include/opencv2/viz/vizcore.hpp b/modules/viz/include/opencv2/viz/vizcore.hpp index 76f1ba2063..c32802cbee 100644 --- a/modules/viz/include/opencv2/viz/vizcore.hpp +++ b/modules/viz/include/opencv2/viz/vizcore.hpp @@ -43,8 +43,8 @@ // //M*/ -#ifndef __OPENCV_VIZCORE_HPP__ -#define __OPENCV_VIZCORE_HPP__ +#ifndef OPENCV_VIZCORE_HPP +#define OPENCV_VIZCORE_HPP #include #include @@ -173,4 +173,4 @@ namespace cv } /* namespace viz */ } /* namespace cv */ -#endif /* __OPENCV_VIZCORE_HPP__ */ +#endif /* OPENCV_VIZCORE_HPP */ diff --git a/modules/viz/include/opencv2/viz/widget_accessor.hpp b/modules/viz/include/opencv2/viz/widget_accessor.hpp index ccc5b28b24..7b4be543f8 100644 --- a/modules/viz/include/opencv2/viz/widget_accessor.hpp +++ b/modules/viz/include/opencv2/viz/widget_accessor.hpp @@ -43,8 +43,8 @@ // //M*/ -#ifndef __OPENCV_VIZ_WIDGET_ACCESSOR_HPP__ -#define __OPENCV_VIZ_WIDGET_ACCESSOR_HPP__ +#ifndef OPENCV_VIZ_WIDGET_ACCESSOR_HPP +#define OPENCV_VIZ_WIDGET_ACCESSOR_HPP #include #include diff --git a/modules/viz/include/opencv2/viz/widgets.hpp b/modules/viz/include/opencv2/viz/widgets.hpp index 47b655424f..dc05d77795 100644 --- a/modules/viz/include/opencv2/viz/widgets.hpp +++ b/modules/viz/include/opencv2/viz/widgets.hpp @@ -43,8 +43,8 @@ // //M*/ -#ifndef __OPENCV_VIZ_WIDGETS_HPP__ -#define __OPENCV_VIZ_WIDGETS_HPP__ +#ifndef OPENCV_VIZ_WIDGETS_HPP +#define OPENCV_VIZ_WIDGETS_HPP #include diff --git a/modules/world/include/opencv2/world.hpp b/modules/world/include/opencv2/world.hpp index 2442f2c27a..4902c2f2a6 100644 --- a/modules/world/include/opencv2/world.hpp +++ b/modules/world/include/opencv2/world.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_WORLD_HPP__ -#define __OPENCV_WORLD_HPP__ +#ifndef OPENCV_WORLD_HPP +#define OPENCV_WORLD_HPP #include "opencv2/core.hpp"