Commit ab84de96 authored by Dan's avatar Dan

More whitespace fixes.

parent 12dcb155
...@@ -21,7 +21,7 @@ template<typename T> struct step_functor : public thrust::unary_function<int, in ...@@ -21,7 +21,7 @@ template<typename T> struct step_functor : public thrust::unary_function<int, in
CV_Assert(mat.depth() == cv::DataType<T>::depth); CV_Assert(mat.depth() == cv::DataType<T>::depth);
columns = mat.cols; columns = mat.cols;
step = mat.step / sizeof(T); step = mat.step / sizeof(T);
channels = mat.channels(); channels = mat.channels();
} }
__host__ __device__ __host__ __device__
int operator()(int x) const int operator()(int x) const
...@@ -34,7 +34,7 @@ template<typename T> struct step_functor : public thrust::unary_function<int, in ...@@ -34,7 +34,7 @@ template<typename T> struct step_functor : public thrust::unary_function<int, in
//! [step_functor] //! [step_functor]
//! [begin_itr] //! [begin_itr]
/* /*
@Brief GpuMatBeginItr returns a thrust compatible iterator to the beginning of a GPU mat's memory. @Brief GpuMatBeginItr returns a thrust compatible iterator to the beginning of a GPU mat's memory.
@Param mat is the input matrix @Param mat is the input matrix
@Param channel is the channel of the matrix that the iterator is accessing. If set to -1, the iterator will access every element in sequential order @Param channel is the channel of the matrix that the iterator is accessing. If set to -1, the iterator will access every element in sequential order
*/ */
...@@ -65,6 +65,4 @@ thrust::permutation_iterator<thrust::device_ptr<T>, thrust::transform_iterator<s ...@@ -65,6 +65,4 @@ thrust::permutation_iterator<thrust::device_ptr<T>, thrust::transform_iterator<s
return thrust::make_permutation_iterator(thrust::device_pointer_cast(mat.ptr<T>(0) + channel), return thrust::make_permutation_iterator(thrust::device_pointer_cast(mat.ptr<T>(0) + channel),
thrust::make_transform_iterator(thrust::make_counting_iterator(mat.rows*mat.cols), step_functor<T>(mat.cols, mat.step / sizeof(T), mat.channels()))); thrust::make_transform_iterator(thrust::make_counting_iterator(mat.rows*mat.cols), step_functor<T>(mat.cols, mat.step / sizeof(T), mat.channels())));
} }
//! [end_itr] //! [end_itr]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment