mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#2225 Rename getConvertData to getConvertElem to match the headers and documentation

Browse Source
This commit is contained in:
Andrey Kamaev 2012-08-15 15:28:12 +04:00
parent e578259a34
commit b0927397e9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3262,7 +3262,7 @@ convertScaleData_(const void* _from, void* _to, int cn, double alpha, double bet
to[i] = saturate_cast<T2>(from[i]*alpha + beta);
}
static ConvertData getConvertData(int fromType, int toType)
ConvertData getConvertElem(int fromType, int toType)
{
static ConvertData tab[][8] =
{{ convertData_<uchar, uchar>, convertData_<uchar, schar>,
@ -3307,7 +3307,7 @@ static ConvertData getConvertData(int fromType, int toType)
return func;
}
static ConvertScaleData getConvertScaleData(int fromType, int toType)
ConvertScaleData getConvertScaleElem(int fromType, int toType)
{
static ConvertScaleData tab[][8] =
{{ convertScaleData_<uchar, uchar>, convertScaleData_<uchar, schar>,
@ -3537,7 +3537,7 @@ void SparseMat::convertTo( SparseMat& m, int rtype, double alpha ) const
if( alpha == 1 )
{
ConvertData cvtfunc = getConvertData(type(), rtype);
ConvertData cvtfunc = getConvertElem(type(), rtype);
for( i = 0; i < N; i++, ++from )
{
const Node* n = from.node();
@ -3547,7 +3547,7 @@ void SparseMat::convertTo( SparseMat& m, int rtype, double alpha ) const
}
else
{
ConvertScaleData cvtfunc = getConvertScaleData(type(), rtype);
ConvertScaleData cvtfunc = getConvertScaleElem(type(), rtype);
for( i = 0; i < N; i++, ++from )
{
const Node* n = from.node();
@ -3574,7 +3574,7 @@ void SparseMat::convertTo( Mat& m, int rtype, double alpha, double beta ) const
if( alpha == 1 && beta == 0 )
{
ConvertData cvtfunc = getConvertData(type(), rtype);
ConvertData cvtfunc = getConvertElem(type(), rtype);
for( i = 0; i < N; i++, ++from )
{
const Node* n = from.node();
@ -3584,7 +3584,7 @@ void SparseMat::convertTo( Mat& m, int rtype, double alpha, double beta ) const
}
else
{
ConvertScaleData cvtfunc = getConvertScaleData(type(), rtype);
ConvertScaleData cvtfunc = getConvertScaleElem(type(), rtype);
for( i = 0; i < N; i++, ++from )
{
const Node* n = from.node();