generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed errors under MacOS

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-01-21 10:53:07 +00:00
parent e3f3de84db
commit db41449be8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/cuda/matrix_reductions.cu
View File

@ -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 {};

10
modules/gpu/src/matrix_reductions.cpp
View File

@ -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,8 +161,8 @@ 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);
Caller* callers = multipass_callers; Caller* callers = multipass_callers;
@ -206,8 +206,8 @@ 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);
Caller caller = callers[src.depth()]; Caller caller = callers[src.depth()];