Merge pull request #7370 from souch55:Fixxn

9 years ago · 1c18b1d245
parent 16b4ccb846 a34fbf7bb1
commit 1c18b1d245
273 changed files with 657 additions and 657 deletions
--- 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<CvDTreeSplit>::operator ()(CvDTreeSplit* obj) con
 }

 #endif // __cplusplus
-#endif // __OPENCV_ML_HPP__
+#endif // OPENCV_ML_HPP

 /* End of file. */
--- 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"
--- 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)
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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

 // File that defines what modules where included during the build of OpenCV
 // These are purely the defines of the correct HAVE_OPENCV_modulename values
--- 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"
--- 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 */
--- 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++
@ -3197,4 +3197,4 @@ template<> struct ParamType<uchar>
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/optim.hpp"

-#endif /*__OPENCV_CORE_HPP__*/
+#endif /*OPENCV_CORE_HPP*/
--- 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<T>::operator Eigen::Transform<T, 3, Eigen::Affine>() const

 #endif /* __cplusplus */

-#endif /* __OPENCV_CORE_AFFINE3_HPP__ */
+#endif /* OPENCV_CORE_AFFINE3_HPP */
--- 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++
@ -688,4 +688,4 @@ CV_EXPORTS void setUseIPP(bool flag);

 #include "opencv2/core/neon_utils.hpp"

-#endif //__OPENCV_CORE_BASE_HPP__
+#endif //OPENCV_CORE_BASE_HPP
--- 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
--- 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"

--- 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++
@ -871,4 +871,4 @@ CV_EXPORTS void convertFp16(InputArray _src, OutputArray _dst, Stream& stream =

 #include "opencv2/core/cuda.inl.hpp"

-#endif /* __OPENCV_CORE_CUDA_HPP__ */
+#endif /* OPENCV_CORE_CUDA_HPP */
--- 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
--- 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 */
--- 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
--- 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
--- 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 <cuda_runtime.h>
 #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
--- 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
--- 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
--- 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 <thrust/tuple.h>
 #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
--- 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 <thrust/tuple.h>
 #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_
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 <cstdio>

@ -76,4 +76,4 @@ namespace cv { namespace cuda { namespace device

 //! @endcond

-#endif  /* __OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP_ */
+#endif  /* OPENCV_CUDA_DEVICE_FUNCATTRIB_HPP */
--- 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 <functional>
 #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
--- 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 <limits.h>
 #include <float.h>
@ -125,4 +125,4 @@ template <> struct numeric_limits<double>

 //! @endcond

-#endif // __OPENCV_CUDA_LIMITS_HPP__
+#endif // OPENCV_CUDA_LIMITS_HPP
--- 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 <thrust/tuple.h>
 #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
--- 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 */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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
--- 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 */
--- 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 */
--- 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
 //! @{
@ -483,4 +483,4 @@ Cv64suf;

 //! @}

-#endif // __OPENCV_CORE_CVDEF_H__
+#endif // OPENCV_CORE_CVDEF_H
--- 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
--- 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 <complex>
@ -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
--- 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
--- 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"

--- 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"

--- 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"
@ -247,4 +247,4 @@ CV_EXPORTS void invSqrt(const double* src, double* dst, int len);

 }} //cv::hal

-#endif //__OPENCV_HAL_HPP__
+#endif //OPENCV_HAL_HPP
--- 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 <cmath>
 #include <float.h>
--- 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 <limits>
 #include <cstring>
--- 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 <algorithm>

--- 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 <algorithm>

--- 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

--- 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++
@ -3459,4 +3459,4 @@ CV_EXPORTS MatExpr abs(const MatExpr& e);

 #include "opencv2/core/mat.inl.hpp"

-#endif // __OPENCV_CORE_MAT_HPP__
+#endif // OPENCV_CORE_MAT_HPP
--- 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++
--- 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<typename _Tp> inline Vec<_Tp, 4>& operator *= (Vec<_Tp, 4>& v1, const V

 } // cv

-#endif // __OPENCV_CORE_MATX_HPP__
+#endif // OPENCV_CORE_MATX_HPP
--- 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
--- 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"

--- 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
 {
--- 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. */
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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++
--- 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"

--- 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++
@ -1261,4 +1261,4 @@ CV_EXPORTS void cvWriteMatND_Base64(::CvFileStorage* fs, const char* name, const

 } // cv

-#endif // __OPENCV_CORE_PERSISTENCE_HPP__
+#endif // OPENCV_CORE_PERSISTENCE_HPP
--- 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
--- 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
@ -573,4 +573,4 @@ CV_EXPORTS InstrNode* getCurrentNode();

 //! @endcond

-#endif // __OPENCV_CORE_PRIVATE_HPP__
+#endif // OPENCV_CORE_PRIVATE_HPP
--- 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 <algorithm>

@ -376,4 +376,4 @@ Ptr<T> 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
--- 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<unsigned>(double v) { return cvRound(v)

 } // cv

-#endif // __OPENCV_CORE_SATURATE_HPP__
+#endif // OPENCV_CORE_SATURATE_HPP
--- 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
--- 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_64F>

 } // cv

-#endif // __OPENCV_CORE_TRAITS_HPP__
+#endif // OPENCV_CORE_TRAITS_HPP
--- 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++
@ -2257,4 +2257,4 @@ TermCriteria::TermCriteria(int _type, int _maxCount, double _epsilon)

 } // cv

-#endif //__OPENCV_CORE_TYPES_HPP__
+#endif //OPENCV_CORE_TYPES_HPP
--- 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__
@ -1832,6 +1832,6 @@ CvModuleInfo;

 /** @} */

-#endif /*__OPENCV_CORE_TYPES_H__*/
+#endif /*OPENCV_CORE_TYPES_H*/

 /* End of file. */
--- 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++
@ -1149,4 +1149,4 @@ CV_EXPORTS FLAGS      getFlags();
 #include "opencv2/core/core_c.h"
 #endif

-#endif //__OPENCV_CORE_UTILITY_H__
+#endif //OPENCV_CORE_UTILITY_H
--- a/Show More
+++ b/Show More