Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed grid/glob_reduce.hpp -> grid/reduce.hpp

Browse Source
pull/1540/head
Vladislav Vinogradov 12 years ago
parent e820c5c65f
commit 9fe92e2111
4 changed files with 58 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/cudev/include/opencv2/cudev.hpp
  2. 2
      modules/cudev/include/opencv2/cudev/expr/reduction.hpp
  3. 6
      modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp
  4. 26
      modules/cudev/include/opencv2/cudev/grid/reduce.hpp

2
modules/cudev/include/opencv2/cudev.hpp
Unescape View File

@ -73,7 +73,7 @@
#include "cudev/block/vec_distance.hpp" #include "cudev/block/vec_distance.hpp"
#include "cudev/grid/copy.hpp" #include "cudev/grid/copy.hpp"
#include "cudev/grid/glob_reduce.hpp" #include "cudev/grid/reduce.hpp"
#include "cudev/grid/histogram.hpp" #include "cudev/grid/histogram.hpp"
#include "cudev/grid/integral.hpp" #include "cudev/grid/integral.hpp"
#include "cudev/grid/pyramids.hpp" #include "cudev/grid/pyramids.hpp"

2
modules/cudev/include/opencv2/cudev/expr/reduction.hpp
Unescape View File

@ -47,7 +47,7 @@
#define __OPENCV_CUDEV_EXPR_REDUCTION_HPP__ #define __OPENCV_CUDEV_EXPR_REDUCTION_HPP__
#include "../common.hpp" #include "../common.hpp"
#include "../grid/glob_reduce.hpp" #include "../grid/reduce.hpp"
#include "../grid/histogram.hpp" #include "../grid/histogram.hpp"
#include "../grid/integral.hpp" #include "../grid/integral.hpp"
#include "../grid/reduce_to_vec.hpp" #include "../grid/reduce_to_vec.hpp"

6
modules/cudev/include/opencv2/cudev/grid/detail/glob_reduce.hpp → modules/cudev/include/opencv2/cudev/grid/detail/reduce.hpp
Unescape View File

@ -43,8 +43,8 @@
#pragma once #pragma once
#ifndef __OPENCV_CUDEV_GRID_GLOB_REDUCE_DETAIL_HPP__ #ifndef __OPENCV_CUDEV_GRID_REDUCE_DETAIL_HPP__
#define __OPENCV_CUDEV_GRID_GLOB_REDUCE_DETAIL_HPP__ #define __OPENCV_CUDEV_GRID_REDUCE_DETAIL_HPP__
#include "../../common.hpp" #include "../../common.hpp"
#include "../../util/tuple.hpp" #include "../../util/tuple.hpp"
@ -59,7 +59,7 @@
namespace cv { namespace cudev { namespace cv { namespace cudev {
namespace grid_glob_reduce_detail namespace grid_reduce_detail
{ {
// Unroll // Unroll

26
modules/cudev/include/opencv2/cudev/grid/glob_reduce.hpp → modules/cudev/include/opencv2/cudev/grid/reduce.hpp
Unescape View File

@ -43,8 +43,8 @@
#pragma once #pragma once
#ifndef __OPENCV_CUDEV_GRID_GLOB_REDUCE_HPP__ #ifndef __OPENCV_CUDEV_GRID_REDUCE_HPP__
#define __OPENCV_CUDEV_GRID_GLOB_REDUCE_HPP__ #define __OPENCV_CUDEV_GRID_REDUCE_HPP__
#include <limits> #include <limits>
#include "../common.hpp" #include "../common.hpp"
@ -52,7 +52,7 @@
#include "../ptr2d/gpumat.hpp" #include "../ptr2d/gpumat.hpp"
#include "../ptr2d/mask.hpp" #include "../ptr2d/mask.hpp"
#include "../ptr2d/transform.hpp" #include "../ptr2d/transform.hpp"
#include "detail/glob_reduce.hpp" #include "detail/reduce.hpp"
namespace cv { namespace cudev { namespace cv { namespace cudev {
@ -67,7 +67,7 @@ __host__ void gridCalcSum_(const SrcPtr& src, GpuMat_<ResType>& dst, const MaskP
CV_Assert( getRows(mask) == rows && getCols(mask) == cols ); CV_Assert( getRows(mask) == rows && getCols(mask) == cols );
grid_glob_reduce_detail::sum<Policy>(shrinkPtr(src), grid_reduce_detail::sum<Policy>(shrinkPtr(src),
dst[0], dst[0],
shrinkPtr(mask), shrinkPtr(mask),
rows, cols, rows, cols,
@ -83,7 +83,7 @@ __host__ void gridCalcSum_(const SrcPtr& src, GpuMat_<ResType>& dst, Stream& str
const int rows = getRows(src); const int rows = getRows(src);
const int cols = getCols(src); const int cols = getCols(src);
grid_glob_reduce_detail::sum<Policy>(shrinkPtr(src), grid_reduce_detail::sum<Policy>(shrinkPtr(src),
dst[0], dst[0],
WithOutMask(), WithOutMask(),
rows, cols, rows, cols,
@ -101,7 +101,7 @@ __host__ void gridFindMinVal_(const SrcPtr& src, GpuMat_<ResType>& dst, const Ma
CV_Assert( getRows(mask) == rows && getCols(mask) == cols ); CV_Assert( getRows(mask) == rows && getCols(mask) == cols );
grid_glob_reduce_detail::minVal<Policy>(shrinkPtr(src), grid_reduce_detail::minVal<Policy>(shrinkPtr(src),
dst[0], dst[0],
shrinkPtr(mask), shrinkPtr(mask),
rows, cols, rows, cols,
@ -117,7 +117,7 @@ __host__ void gridFindMinVal_(const SrcPtr& src, GpuMat_<ResType>& dst, Stream&
const int rows = getRows(src); const int rows = getRows(src);
const int cols = getCols(src); const int cols = getCols(src);
grid_glob_reduce_detail::minVal<Policy>(shrinkPtr(src), grid_reduce_detail::minVal<Policy>(shrinkPtr(src),
dst[0], dst[0],
WithOutMask(), WithOutMask(),
rows, cols, rows, cols,
@ -135,7 +135,7 @@ __host__ void gridFindMaxVal_(const SrcPtr& src, GpuMat_<ResType>& dst, const Ma
CV_Assert( getRows(mask) == rows && getCols(mask) == cols ); CV_Assert( getRows(mask) == rows && getCols(mask) == cols );
grid_glob_reduce_detail::maxVal<Policy>(shrinkPtr(src), grid_reduce_detail::maxVal<Policy>(shrinkPtr(src),
dst[0], dst[0],
shrinkPtr(mask), shrinkPtr(mask),
rows, cols, rows, cols,
@ -151,7 +151,7 @@ __host__ void gridFindMaxVal_(const SrcPtr& src, GpuMat_<ResType>& dst, Stream&
const int rows = getRows(src); const int rows = getRows(src);
const int cols = getCols(src); const int cols = getCols(src);
grid_glob_reduce_detail::maxVal<Policy>(shrinkPtr(src), grid_reduce_detail::maxVal<Policy>(shrinkPtr(src),
dst[0], dst[0],
WithOutMask(), WithOutMask(),
rows, cols, rows, cols,
@ -170,7 +170,7 @@ __host__ void gridFindMinMaxVal_(const SrcPtr& src, GpuMat_<ResType>& dst, const
CV_Assert( getRows(mask) == rows && getCols(mask) == cols ); CV_Assert( getRows(mask) == rows && getCols(mask) == cols );
grid_glob_reduce_detail::minMaxVal<Policy>(shrinkPtr(src), grid_reduce_detail::minMaxVal<Policy>(shrinkPtr(src),
dst[0], dst[0],
shrinkPtr(mask), shrinkPtr(mask),
rows, cols, rows, cols,
@ -187,7 +187,7 @@ __host__ void gridFindMinMaxVal_(const SrcPtr& src, GpuMat_<ResType>& dst, Strea
const int rows = getRows(src); const int rows = getRows(src);
const int cols = getCols(src); const int cols = getCols(src);
grid_glob_reduce_detail::minMaxVal<Policy>(shrinkPtr(src), grid_reduce_detail::minMaxVal<Policy>(shrinkPtr(src),
dst[0], dst[0],
WithOutMask(), WithOutMask(),
rows, cols, rows, cols,
@ -209,7 +209,7 @@ __host__ void gridCountNonZero_(const SrcPtr& src, GpuMat_<ResType>& dst, const
not_equal_to<src_type> ne_op; not_equal_to<src_type> ne_op;
const src_type zero = VecTraits<src_type>::all(0); const src_type zero = VecTraits<src_type>::all(0);
grid_glob_reduce_detail::sum<Policy>(shrinkPtr(transformPtr(src, bind2nd(ne_op, zero))), grid_reduce_detail::sum<Policy>(shrinkPtr(transformPtr(src, bind2nd(ne_op, zero))),
dst[0], dst[0],
shrinkPtr(mask), shrinkPtr(mask),
rows, cols, rows, cols,
@ -229,7 +229,7 @@ __host__ void gridCountNonZero_(const SrcPtr& src, GpuMat_<ResType>& dst, Stream
not_equal_to<src_type> ne_op; not_equal_to<src_type> ne_op;
const src_type zero = VecTraits<src_type>::all(0); const src_type zero = VecTraits<src_type>::all(0);
grid_glob_reduce_detail::sum<Policy>(shrinkPtr(transformPtr(src, bind2nd(ne_op, zero))), grid_reduce_detail::sum<Policy>(shrinkPtr(transformPtr(src, bind2nd(ne_op, zero))),
dst[0], dst[0],
WithOutMask(), WithOutMask(),
rows, cols, rows, cols,
Write Preview
Loading…
Cancel
Save