Commit db41449b authored by Alexey Spizhevoy's avatar Alexey Spizhevoy

fixed errors under MacOS

parent e3f3de84
...@@ -938,7 +938,7 @@ namespace cv { namespace gpu { namespace mathfunc ...@@ -938,7 +938,7 @@ namespace cv { namespace gpu { namespace mathfunc
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Sum // Sum
namespace sum namespace sums
{ {
template <typename T> struct SumType {}; template <typename T> struct SumType {};
......
...@@ -130,7 +130,7 @@ namespace cv { namespace gpu { namespace mathfunc ...@@ -130,7 +130,7 @@ namespace cv { namespace gpu { namespace mathfunc
template <typename T> template <typename T>
void sqrSumMultipassCaller(const DevMem2D src, PtrStep buf, double* sum, int cn); void sqrSumMultipassCaller(const DevMem2D src, PtrStep buf, double* sum, int cn);
namespace sum namespace sums
{ {
void getBufSizeRequired(int cols, int rows, int cn, int& bufcols, int& bufrows); void getBufSizeRequired(int cols, int rows, int cn, int& bufcols, int& bufrows);
} }
...@@ -161,7 +161,7 @@ Scalar cv::gpu::sum(const GpuMat& src, GpuMat& buf) ...@@ -161,7 +161,7 @@ Scalar cv::gpu::sum(const GpuMat& src, GpuMat& buf)
sumCaller<int>, sumCaller<float>, 0 }; sumCaller<int>, sumCaller<float>, 0 };
Size buf_size; Size buf_size;
sum::getBufSizeRequired(src.cols, src.rows, src.channels(), sums::getBufSizeRequired(src.cols, src.rows, src.channels(),
buf_size.width, buf_size.height); buf_size.width, buf_size.height);
ensureSizeIsEnough(buf_size, CV_8U, buf); ensureSizeIsEnough(buf_size, CV_8U, buf);
...@@ -206,7 +206,7 @@ Scalar cv::gpu::sqrSum(const GpuMat& src, GpuMat& buf) ...@@ -206,7 +206,7 @@ Scalar cv::gpu::sqrSum(const GpuMat& src, GpuMat& buf)
callers = singlepass_callers; callers = singlepass_callers;
Size buf_size; Size buf_size;
sum::getBufSizeRequired(src.cols, src.rows, src.channels(), sums::getBufSizeRequired(src.cols, src.rows, src.channels(),
buf_size.width, buf_size.height); buf_size.width, buf_size.height);
ensureSizeIsEnough(buf_size, CV_8U, buf); ensureSizeIsEnough(buf_size, CV_8U, buf);
......
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