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

Revise naming for getOclMat function.

Browse Source
This commit is contained in:
peng xiao 2013-06-21 14:51:23 +08:00
parent e129638263
commit 290c8db0a8
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/matrix.cpp
View File

@ -982,7 +982,7 @@ Mat _InputArray::getMat(int i) const
if( k == OCL_MAT ) if( k == OCL_MAT )
{ {
CV_Error(-1, "Not implemented"); CV_Error(CV_StsNotImplemented, "This method is not implemented for oclMat yet");
} }
CV_Assert( k == STD_VECTOR_MAT ); CV_Assert( k == STD_VECTOR_MAT );
@ -1069,7 +1069,7 @@ void _InputArray::getMatVector(vector<Mat>& mv) const
if( k == OCL_MAT ) if( k == OCL_MAT )
{ {
CV_Error(-1, "Not implemented"); CV_Error(CV_StsNotImplemented, "This method is not implemented for oclMat yet");
} }
CV_Assert( k == STD_VECTOR_MAT ); CV_Assert( k == STD_VECTOR_MAT );
@ -1201,7 +1201,7 @@ Size _InputArray::size(int i) const
if( k == OCL_MAT ) if( k == OCL_MAT )
{ {
CV_Error(-1, "Not implemented"); CV_Error(CV_StsNotImplemented, "This method is not implemented for oclMat yet");
} }
CV_Assert( k == GPU_MAT ); CV_Assert( k == GPU_MAT );
@ -1320,7 +1320,7 @@ bool _InputArray::empty() const
if( k == OCL_MAT ) if( k == OCL_MAT )
{ {
CV_Error(-1, "Not implemented"); CV_Error(CV_StsNotImplemented, "This method is not implemented for oclMat yet");
} }
CV_Assert( k == GPU_MAT ); CV_Assert( k == GPU_MAT );
@ -1545,7 +1545,7 @@ void _OutputArray::create(int dims, const int* sizes, int mtype, int i, bool all
if( k == OCL_MAT ) if( k == OCL_MAT )
{ {
CV_Error(-1, "Not implemented"); CV_Error(CV_StsNotImplemented, "This method is not implemented for oclMat yet");
} }
if( k == NONE ) if( k == NONE )
@ -1661,7 +1661,7 @@ void _OutputArray::release() const
if( k == OCL_MAT ) if( k == OCL_MAT )
{ {
CV_Error(-1, "Not implemented"); CV_Error(CV_StsNotImplemented, "This method is not implemented for oclMat yet");
} }
CV_Assert( k == STD_VECTOR_MAT ); CV_Assert( k == STD_VECTOR_MAT );

6
modules/ocl/include/opencv2/ocl/ocl.hpp
View File

@ -392,9 +392,9 @@ namespace cv
int wholecols; int wholecols;
}; };
// convert InputArray/OutputArray to oclMat // convert InputArray/OutputArray to oclMat references
CV_EXPORTS oclMat& getOclMat(InputArray src); CV_EXPORTS oclMat& getOclMatRef(InputArray src);
CV_EXPORTS oclMat& getOclMat(OutputArray src); CV_EXPORTS oclMat& getOclMatRef(OutputArray src);
///////////////////// mat split and merge ///////////////////////////////// ///////////////////// mat split and merge /////////////////////////////////
//! Compose a multi-channel array from several single-channel arrays //! Compose a multi-channel array from several single-channel arrays

4
modules/ocl/src/matrix_operations.cpp
View File

@ -244,13 +244,13 @@ cv::ocl::oclMat::operator cv::_OutputArray()
return newOutputArray; return newOutputArray;
} }
cv::ocl::oclMat& cv::ocl::getOclMat(InputArray src) cv::ocl::oclMat& cv::ocl::getOclMatRef(InputArray src)
{ {
CV_Assert(src.flags & cv::_InputArray::OCL_MAT); CV_Assert(src.flags & cv::_InputArray::OCL_MAT);
return *reinterpret_cast<oclMat*>(src.obj); return *reinterpret_cast<oclMat*>(src.obj);
} }
cv::ocl::oclMat& cv::ocl::getOclMat(OutputArray src) cv::ocl::oclMat& cv::ocl::getOclMatRef(OutputArray src)
{ {
CV_Assert(src.flags & cv::_InputArray::OCL_MAT); CV_Assert(src.flags & cv::_InputArray::OCL_MAT);
return *reinterpret_cast<oclMat*>(src.obj); return *reinterpret_cast<oclMat*>(src.obj);