Permalink
Browse files

Merge pull request #7370 from souch55:Fixxn

  • Loading branch information...
2 parents 16b4ccb + a34fbf7 commit 1c18b1d245a875565c9b9e49ccec901e9b516337 @alalek alalek committed Oct 1, 2016
Showing with 657 additions and 657 deletions.
  1. +3 −3 apps/traincascade/old_ml.hpp
  2. +2 −2 apps/traincascade/old_ml_precomp.hpp
  3. +2 −2 include/opencv/cv.h
  4. +2 −2 include/opencv/cv.hpp
  5. +2 −2 include/opencv/cvaux.h
  6. +2 −2 include/opencv/cvaux.hpp
  7. +2 −2 include/opencv/cvwimage.h
  8. +2 −2 include/opencv/cxcore.h
  9. +2 −2 include/opencv/cxcore.hpp
  10. +2 −2 include/opencv/cxeigen.hpp
  11. +2 −2 include/opencv/cxmisc.h
  12. +2 −2 include/opencv/highgui.h
  13. +2 −2 include/opencv/ml.h
  14. +2 −2 include/opencv2/opencv.hpp
  15. +2 −2 modules/calib3d/include/opencv2/calib3d.hpp
  16. +3 −3 modules/calib3d/include/opencv2/calib3d/calib3d_c.h
  17. +3 −3 modules/core/include/opencv2/core.hpp
  18. +3 −3 modules/core/include/opencv2/core/affine.hpp
  19. +3 −3 modules/core/include/opencv2/core/base.hpp
  20. +3 −3 modules/core/include/opencv2/core/bufferpool.hpp
  21. +2 −2 modules/core/include/opencv2/core/core_c.h
  22. +3 −3 modules/core/include/opencv2/core/cuda.hpp
  23. +3 −3 modules/core/include/opencv2/core/cuda.inl.hpp
  24. +3 −3 modules/core/include/opencv2/core/cuda/block.hpp
  25. +3 −3 modules/core/include/opencv2/core/cuda/border_interpolate.hpp
  26. +3 −3 modules/core/include/opencv2/core/cuda/color.hpp
  27. +3 −3 modules/core/include/opencv2/core/cuda/common.hpp
  28. +3 −3 modules/core/include/opencv2/core/cuda/datamov_utils.hpp
  29. +3 −3 modules/core/include/opencv2/core/cuda/detail/color_detail.hpp
  30. +3 −3 modules/core/include/opencv2/core/cuda/detail/reduce.hpp
  31. +3 −3 modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp
  32. +3 −3 modules/core/include/opencv2/core/cuda/detail/transform_detail.hpp
  33. +3 −3 modules/core/include/opencv2/core/cuda/detail/type_traits_detail.hpp
  34. +3 −3 modules/core/include/opencv2/core/cuda/detail/vec_distance_detail.hpp
  35. +3 −3 modules/core/include/opencv2/core/cuda/dynamic_smem.hpp
  36. +3 −3 modules/core/include/opencv2/core/cuda/filters.hpp
  37. +3 −3 modules/core/include/opencv2/core/cuda/funcattrib.hpp
  38. +3 −3 modules/core/include/opencv2/core/cuda/functional.hpp
  39. +3 −3 modules/core/include/opencv2/core/cuda/limits.hpp
  40. +3 −3 modules/core/include/opencv2/core/cuda/reduce.hpp
  41. +3 −3 modules/core/include/opencv2/core/cuda/saturate_cast.hpp
  42. +3 −3 modules/core/include/opencv2/core/cuda/scan.hpp
  43. +3 −3 modules/core/include/opencv2/core/cuda/simd_functions.hpp
  44. +3 −3 modules/core/include/opencv2/core/cuda/transform.hpp
  45. +3 −3 modules/core/include/opencv2/core/cuda/type_traits.hpp
  46. +3 −3 modules/core/include/opencv2/core/cuda/utility.hpp
  47. +3 −3 modules/core/include/opencv2/core/cuda/vec_distance.hpp
  48. +3 −3 modules/core/include/opencv2/core/cuda/vec_math.hpp
  49. +3 −3 modules/core/include/opencv2/core/cuda/vec_traits.hpp
  50. +3 −3 modules/core/include/opencv2/core/cuda/warp.hpp
  51. +3 −3 modules/core/include/opencv2/core/cuda/warp_shuffle.hpp
  52. +3 −3 modules/core/include/opencv2/core/cuda_stream_accessor.hpp
  53. +3 −3 modules/core/include/opencv2/core/cuda_types.hpp
  54. +3 −3 modules/core/include/opencv2/core/cvdef.h
  55. +3 −3 modules/core/include/opencv2/core/cvstd.hpp
  56. +3 −3 modules/core/include/opencv2/core/cvstd.inl.hpp
  57. +3 −3 modules/core/include/opencv2/core/directx.hpp
  58. +2 −2 modules/core/include/opencv2/core/eigen.hpp
  59. +2 −2 modules/core/include/opencv2/core/fast_math.hpp
  60. +3 −3 modules/core/include/opencv2/core/hal/hal.hpp
  61. +2 −2 modules/core/include/opencv2/core/hal/intrin.hpp
  62. +2 −2 modules/core/include/opencv2/core/hal/intrin_cpp.hpp
  63. +2 −2 modules/core/include/opencv2/core/hal/intrin_neon.hpp
  64. +2 −2 modules/core/include/opencv2/core/hal/intrin_sse.hpp
  65. +2 −2 modules/core/include/opencv2/core/ippasync.hpp
  66. +3 −3 modules/core/include/opencv2/core/mat.hpp
  67. +2 −2 modules/core/include/opencv2/core/mat.inl.hpp
  68. +3 −3 modules/core/include/opencv2/core/matx.hpp
  69. +3 −3 modules/core/include/opencv2/core/neon_utils.hpp
  70. +2 −2 modules/core/include/opencv2/core/ocl.hpp
  71. +2 −2 modules/core/include/opencv2/core/ocl_genbase.hpp
  72. +3 −3 modules/core/include/opencv2/core/opencl/opencl_svm.hpp
  73. +1 −1 modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdblas.hpp
  74. +1 −1 modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_clamdfft.hpp
  75. +1 −1 modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
  76. +1 −1 modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
  77. +1 −1 modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
  78. +1 −1 modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
  79. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
  80. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp
  81. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp
  82. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
  83. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_gl.hpp
  84. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
  85. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp
  86. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
  87. +3 −3 modules/core/include/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
  88. +3 −3 modules/core/include/opencv2/core/opengl.hpp
  89. +2 −2 modules/core/include/opencv2/core/operations.hpp
  90. +2 −2 modules/core/include/opencv2/core/optim.hpp
  91. +3 −3 modules/core/include/opencv2/core/persistence.hpp
  92. +3 −3 modules/core/include/opencv2/core/private.cuda.hpp
  93. +3 −3 modules/core/include/opencv2/core/private.hpp
  94. +3 −3 modules/core/include/opencv2/core/ptr.inl.hpp
  95. +3 −3 modules/core/include/opencv2/core/saturate.hpp
  96. +3 −3 modules/core/include/opencv2/core/sse_utils.hpp
  97. +3 −3 modules/core/include/opencv2/core/traits.hpp
  98. +3 −3 modules/core/include/opencv2/core/types.hpp
  99. +3 −3 modules/core/include/opencv2/core/types_c.h
  100. +3 −3 modules/core/include/opencv2/core/utility.hpp
  101. +3 −3 modules/core/include/opencv2/core/va_intel.hpp
  102. +2 −2 modules/core/include/opencv2/core/version.hpp
  103. +2 −2 modules/core/include/opencv2/core/wimage.hpp
  104. +3 −3 modules/cudaarithm/include/opencv2/cudaarithm.hpp
  105. +3 −3 modules/cudabgsegm/include/opencv2/cudabgsegm.hpp
  106. +2 −2 modules/cudabgsegm/perf/perf_precomp.hpp
  107. +3 −3 modules/cudabgsegm/src/precomp.hpp
  108. +2 −2 modules/cudabgsegm/test/test_precomp.hpp
  109. +3 −3 modules/cudacodec/include/opencv2/cudacodec.hpp
  110. +2 −2 modules/cudacodec/perf/perf_precomp.hpp
  111. +3 −3 modules/cudacodec/src/precomp.hpp
  112. +2 −2 modules/cudacodec/test/test_precomp.hpp
  113. +3 −3 modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp
  114. +3 −3 modules/cudafilters/include/opencv2/cudafilters.hpp
  115. +3 −3 modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
  116. +3 −3 modules/cudalegacy/include/opencv2/cudalegacy.hpp
  117. +3 −3 modules/cudalegacy/include/opencv2/cudalegacy/private.hpp
  118. +3 −3 modules/cudaobjdetect/include/opencv2/cudaobjdetect.hpp
  119. +3 −3 modules/cudaoptflow/include/opencv2/cudaoptflow.hpp
  120. +3 −3 modules/cudastereo/include/opencv2/cudastereo.hpp
  121. +3 −3 modules/cudawarping/include/opencv2/cudawarping.hpp
  122. +2 −2 modules/cudev/include/opencv2/cudev.hpp
  123. +2 −2 modules/cudev/include/opencv2/cudev/block/block.hpp
  124. +2 −2 modules/cudev/include/opencv2/cudev/block/detail/reduce.hpp
  125. +2 −2 modules/cudev/include/opencv2/cudev/block/detail/reduce_key_val.hpp
  126. +2 −2 modules/cudev/include/opencv2/cudev/block/dynamic_smem.hpp
  127. +2 −2 modules/cudev/include/opencv2/cudev/block/reduce.hpp
  128. +2 −2 modules/cudev/include/opencv2/cudev/block/scan.hpp
  129. +2 −2 modules/cudev/include/opencv2/cudev/block/vec_distance.hpp
  130. +2 −2 modules/cudev/include/opencv2/cudev/common.hpp
  131. +2 −2 modules/cudev/include/opencv2/cudev/expr/binary_func.hpp
  132. +2 −2 modules/cudev/include/opencv2/cudev/expr/binary_op.hpp
  133. +2 −2 modules/cudev/include/opencv2/cudev/expr/color.hpp
  134. +2 −2 modules/cudev/include/opencv2/cudev/expr/deriv.hpp
  135. +2 −2 modules/cudev/include/opencv2/cudev/expr/expr.hpp
  136. +2 −2 modules/cudev/include/opencv2/cudev/expr/per_element_func.hpp
  137. +2 −2 modules/cudev/include/opencv2/cudev/expr/reduction.hpp
  138. +2 −2 modules/cudev/include/opencv2/cudev/expr/unary_func.hpp
  139. +2 −2 modules/cudev/include/opencv2/cudev/expr/unary_op.hpp
  140. +2 −2 modules/cudev/include/opencv2/cudev/expr/warping.hpp
  141. +2 −2 modules/cudev/include/opencv2/cudev/functional/color_cvt.hpp
  142. +2 −2 modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp
  143. +2 −2 modules/cudev/include/opencv2/cudev/functional/functional.hpp
  144. +2 −2 modules/cudev/include/opencv2/cudev/functional/tuple_adapter.hpp
  145. +2 −2 modules/cudev/include/opencv2/cudev/grid/copy.hpp
  146. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/copy.hpp
  147. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/histogram.hpp
  148. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp
  149. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/minmaxloc.hpp
  150. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/pyr_down.hpp
  151. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/pyr_up.hpp
  152. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp
  153. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
  154. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
  155. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/split_merge.hpp
  156. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/transform.hpp
  157. +2 −2 modules/cudev/include/opencv2/cudev/grid/detail/transpose.hpp
  158. +2 −2 modules/cudev/include/opencv2/cudev/grid/histogram.hpp
  159. +2 −2 modules/cudev/include/opencv2/cudev/grid/integral.hpp
  160. +2 −2 modules/cudev/include/opencv2/cudev/grid/pyramids.hpp
  161. +2 −2 modules/cudev/include/opencv2/cudev/grid/reduce.hpp
  162. +2 −2 modules/cudev/include/opencv2/cudev/grid/reduce_to_vec.hpp
  163. +2 −2 modules/cudev/include/opencv2/cudev/grid/split_merge.hpp
  164. +2 −2 modules/cudev/include/opencv2/cudev/grid/transform.hpp
  165. +2 −2 modules/cudev/include/opencv2/cudev/grid/transpose.hpp
  166. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/constant.hpp
  167. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/deriv.hpp
  168. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
  169. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/extrapolation.hpp
  170. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/glob.hpp
  171. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/gpumat.hpp
  172. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/interpolation.hpp
  173. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/lut.hpp
  174. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/mask.hpp
  175. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/remap.hpp
  176. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/resize.hpp
  177. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/texture.hpp
  178. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/traits.hpp
  179. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/transform.hpp
  180. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/warping.hpp
  181. +2 −2 modules/cudev/include/opencv2/cudev/ptr2d/zip.hpp
  182. +2 −2 modules/cudev/include/opencv2/cudev/util/atomic.hpp
  183. +2 −2 modules/cudev/include/opencv2/cudev/util/detail/tuple.hpp
  184. +2 −2 modules/cudev/include/opencv2/cudev/util/detail/type_traits.hpp
  185. +2 −2 modules/cudev/include/opencv2/cudev/util/limits.hpp
  186. +2 −2 modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp
  187. +2 −2 modules/cudev/include/opencv2/cudev/util/simd_functions.hpp
  188. +2 −2 modules/cudev/include/opencv2/cudev/util/tuple.hpp
  189. +2 −2 modules/cudev/include/opencv2/cudev/util/type_traits.hpp
  190. +2 −2 modules/cudev/include/opencv2/cudev/util/vec_math.hpp
  191. +2 −2 modules/cudev/include/opencv2/cudev/util/vec_traits.hpp
  192. +2 −2 modules/cudev/include/opencv2/cudev/warp/detail/reduce.hpp
  193. +2 −2 modules/cudev/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
  194. +2 −2 modules/cudev/include/opencv2/cudev/warp/reduce.hpp
  195. +2 −2 modules/cudev/include/opencv2/cudev/warp/scan.hpp
  196. +2 −2 modules/cudev/include/opencv2/cudev/warp/shuffle.hpp
  197. +2 −2 modules/cudev/include/opencv2/cudev/warp/warp.hpp
  198. +2 −2 modules/features2d/include/opencv2/features2d.hpp
  199. +2 −2 modules/flann/include/opencv2/flann.hpp
  200. +2 −2 modules/flann/include/opencv2/flann/miniflann.hpp
  201. +2 −2 modules/flann/src/precomp.hpp
  202. +2 −2 modules/flann/test/test_precomp.hpp
  203. +2 −2 modules/highgui/include/opencv2/highgui.hpp
  204. +2 −2 modules/highgui/include/opencv2/highgui/highgui_c.h
  205. +3 −3 modules/imgcodecs/include/opencv2/imgcodecs.hpp
  206. +3 −3 modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h
  207. +2 −2 modules/imgproc/include/opencv2/imgproc.hpp
  208. +3 −3 modules/imgproc/include/opencv2/imgproc/detail/distortion_model.hpp
  209. +2 −2 modules/imgproc/include/opencv2/imgproc/imgproc_c.h
  210. +2 −2 modules/imgproc/include/opencv2/imgproc/types_c.h
  211. +3 −3 modules/ml/include/opencv2/ml.hpp
  212. +2 −2 modules/objdetect/include/opencv2/objdetect.hpp
  213. +2 −2 modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
  214. +3 −3 modules/objdetect/include/opencv2/objdetect/objdetect_c.h
  215. +2 −2 modules/photo/include/opencv2/photo.hpp
  216. +3 −3 modules/photo/include/opencv2/photo/cuda.hpp
  217. +3 −3 modules/photo/include/opencv2/photo/photo_c.h
  218. +2 −2 modules/shape/include/opencv2/shape.hpp
  219. +2 −2 modules/shape/include/opencv2/shape/emdL1.hpp
  220. +2 −2 modules/shape/include/opencv2/shape/hist_cost.hpp
  221. +2 −2 modules/shape/include/opencv2/shape/shape_distance.hpp
  222. +2 −2 modules/shape/include/opencv2/shape/shape_transformer.hpp
  223. +3 −3 modules/stitching/include/opencv2/stitching.hpp
  224. +3 −3 modules/stitching/include/opencv2/stitching/detail/autocalib.hpp
  225. +3 −3 modules/stitching/include/opencv2/stitching/detail/blenders.hpp
  226. +3 −3 modules/stitching/include/opencv2/stitching/detail/camera.hpp
  227. +3 −3 modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
  228. +3 −3 modules/stitching/include/opencv2/stitching/detail/matchers.hpp
  229. +3 −3 modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp
  230. +3 −3 modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
  231. +3 −3 modules/stitching/include/opencv2/stitching/detail/timelapsers.hpp
  232. +3 −3 modules/stitching/include/opencv2/stitching/detail/util.hpp
  233. +3 −3 modules/stitching/include/opencv2/stitching/detail/util_inl.hpp
  234. +3 −3 modules/stitching/include/opencv2/stitching/detail/warpers.hpp
  235. +3 −3 modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp
  236. +3 −3 modules/stitching/include/opencv2/stitching/warpers.hpp
  237. +3 −3 modules/superres/include/opencv2/superres.hpp
  238. +3 −3 modules/superres/include/opencv2/superres/optical_flow.hpp
  239. +2 −2 modules/ts/include/opencv2/ts.hpp
  240. +3 −3 modules/ts/include/opencv2/ts/cuda_perf.hpp
  241. +3 −3 modules/ts/include/opencv2/ts/cuda_test.hpp
  242. +3 −3 modules/ts/include/opencv2/ts/ocl_perf.hpp
  243. +3 −3 modules/ts/include/opencv2/ts/ocl_test.hpp
  244. +3 −3 modules/ts/include/opencv2/ts/ts_ext.hpp
  245. +3 −3 modules/ts/include/opencv2/ts/ts_perf.hpp
  246. +3 −3 modules/video/include/opencv2/video.hpp
  247. +2 −2 modules/video/include/opencv2/video/background_segm.hpp
  248. +2 −2 modules/video/include/opencv2/video/tracking.hpp
  249. +3 −3 modules/video/include/opencv2/video/tracking_c.h
  250. +3 −3 modules/videoio/include/opencv2/videoio.hpp
  251. +3 −3 modules/videoio/include/opencv2/videoio/videoio_c.h
  252. +2 −2 modules/videostab/include/opencv2/videostab.hpp
  253. +2 −2 modules/videostab/include/opencv2/videostab/deblurring.hpp
  254. +2 −2 modules/videostab/include/opencv2/videostab/fast_marching.hpp
  255. +2 −2 modules/videostab/include/opencv2/videostab/fast_marching_inl.hpp
  256. +2 −2 modules/videostab/include/opencv2/videostab/frame_source.hpp
  257. +2 −2 modules/videostab/include/opencv2/videostab/global_motion.hpp
  258. +2 −2 modules/videostab/include/opencv2/videostab/inpainting.hpp
  259. +2 −2 modules/videostab/include/opencv2/videostab/log.hpp
  260. +2 −2 modules/videostab/include/opencv2/videostab/motion_core.hpp
  261. +2 −2 modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp
  262. +2 −2 modules/videostab/include/opencv2/videostab/optical_flow.hpp
  263. +2 −2 modules/videostab/include/opencv2/videostab/outlier_rejection.hpp
  264. +2 −2 modules/videostab/include/opencv2/videostab/ring_buffer.hpp
  265. +2 −2 modules/videostab/include/opencv2/videostab/stabilizer.hpp
  266. +2 −2 modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
  267. +3 −3 modules/viz/include/opencv2/viz.hpp
  268. +2 −2 modules/viz/include/opencv2/viz/types.hpp
  269. +2 −2 modules/viz/include/opencv2/viz/viz3d.hpp
  270. +3 −3 modules/viz/include/opencv2/viz/vizcore.hpp
  271. +2 −2 modules/viz/include/opencv2/viz/widget_accessor.hpp
  272. +2 −2 modules/viz/include/opencv2/viz/widgets.hpp
  273. +2 −2 modules/world/include/opencv2/world.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. */
@@ -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"
View
@@ -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)
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
View
@@ -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"
@@ -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
@@ -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"
@@ -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 @@ class CV_EXPORTS CvLevMarq
#endif
-#endif /* __OPENCV_CALIB3D_C_H__ */
+#endif /* OPENCV_CALIB3D_C_H */
@@ -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*/
@@ -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 */
@@ -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
@@ -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 @@ class BufferPoolController
}
-#endif // __OPENCV_CORE_BUFFER_POOL_HPP__
+#endif // OPENCV_CORE_BUFFER_POOL_HPP
@@ -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"
@@ -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 */
@@ -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
@@ -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 */
@@ -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
@@ -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
@@ -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
@@ -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
Oops, something went wrong.

0 comments on commit 1c18b1d

Please sign in to comment.