Merge pull request #7389 from alalek:fix_defines_typo

pull/7403/head
Alexander Alekhin 9 years ago
commit 9c90a5f5e7
  1. 2
      modules/core/include/opencv2/core/cuda/color.hpp
  2. 6
      modules/core/include/opencv2/core/cuda/detail/reduce_key_val.hpp
  3. 2
      modules/core/include/opencv2/core/cuda/reduce.hpp
  4. 6
      modules/core/include/opencv2/core/cuda/type_traits.hpp
  5. 2
      modules/core/include/opencv2/core/private.cuda.hpp
  6. 2
      modules/cudafilters/include/opencv2/cudafilters.hpp

@ -306,4 +306,4 @@ namespace cv { namespace cuda { namespace device
//! @endcond //! @endcond
#endif // OPENCV_CUDA_BORDER_INTERPOLATE_HPP #endif // OPENCV_CUDA_COLOR_HPP

@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP_ #ifndef OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP
#define OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP_ #define OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP
#include <thrust/tuple.h> #include <thrust/tuple.h>
#include "../warp.hpp" #include "../warp.hpp"
@ -499,4 +499,4 @@ namespace cv { namespace cuda { namespace device
//! @endcond //! @endcond
#endif // OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP_ #endif // OPENCV_CUDA_PRED_VAL_REDUCE_DETAIL_HPP

@ -202,4 +202,4 @@ namespace cv { namespace cuda { namespace device
//! @endcond //! @endcond
#endif // OPENCV_CUDA_UTILITY_HPP #endif // OPENCV_CUDA_REDUCE_HPP

@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef OPENCV_CUDA_REDUCE_DETAIL_HPP #ifndef OPENCV_CUDA_TYPE_TRAITS_HPP
#define OPENCV_CUDA_REDUCE_DETAIL_HPP #define OPENCV_CUDA_TYPE_TRAITS_HPP
#include "detail/type_traits_detail.hpp" #include "detail/type_traits_detail.hpp"
@ -87,4 +87,4 @@ namespace cv { namespace cuda { namespace device
//! @endcond //! @endcond
#endif // OPENCV_CUDA_REDUCE_DETAIL_HPP #endif // OPENCV_CUDA_TYPE_TRAITS_HPP

@ -169,4 +169,4 @@ namespace cv { namespace cuda
//! @endcond //! @endcond
#endif // OPENCV_CORE_CUDA_PRIVATE_HPP #endif // OPENCV_CORE_PRIVATE_CUDA_HPP

@ -328,4 +328,4 @@ CV_EXPORTS Ptr<Filter> createMedianFilter(int srcType, int windowSize, int parti
}} // namespace cv { namespace cuda { }} // namespace cv { namespace cuda {
#endif /*OPENCV_CUDAFILTERS_HPP */ #endif /* OPENCV_CUDAFILTERS_HPP */

Loading…
Cancel
Save