Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/11/head
Andrey Kamaev 12 years ago
parent e578259a34
commit b0927397e9
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      modules/core/src/matrix.cpp

12
modules/core/src/matrix.cpp
Unescape 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); 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] = static ConvertData tab[][8] =
{{ convertData_<uchar, uchar>, convertData_<uchar, schar>, {{ convertData_<uchar, uchar>, convertData_<uchar, schar>,
@ -3307,7 +3307,7 @@ static ConvertData getConvertData(int fromType, int toType)
return func; return func;
} }
static ConvertScaleData getConvertScaleData(int fromType, int toType) ConvertScaleData getConvertScaleElem(int fromType, int toType)
{ {
static ConvertScaleData tab[][8] = static ConvertScaleData tab[][8] =
{{ convertScaleData_<uchar, uchar>, convertScaleData_<uchar, schar>, {{ convertScaleData_<uchar, uchar>, convertScaleData_<uchar, schar>,
@ -3537,7 +3537,7 @@ void SparseMat::convertTo( SparseMat& m, int rtype, double alpha ) const
if( alpha == 1 ) if( alpha == 1 )
{ {
ConvertData cvtfunc = getConvertData(type(), rtype); ConvertData cvtfunc = getConvertElem(type(), rtype);
for( i = 0; i < N; i++, ++from ) for( i = 0; i < N; i++, ++from )
{ {
const Node* n = from.node(); const Node* n = from.node();
@ -3547,7 +3547,7 @@ void SparseMat::convertTo( SparseMat& m, int rtype, double alpha ) const
} }
else else
{ {
ConvertScaleData cvtfunc = getConvertScaleData(type(), rtype); ConvertScaleData cvtfunc = getConvertScaleElem(type(), rtype);
for( i = 0; i < N; i++, ++from ) for( i = 0; i < N; i++, ++from )
{ {
const Node* n = from.node(); 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 ) if( alpha == 1 && beta == 0 )
{ {
ConvertData cvtfunc = getConvertData(type(), rtype); ConvertData cvtfunc = getConvertElem(type(), rtype);
for( i = 0; i < N; i++, ++from ) for( i = 0; i < N; i++, ++from )
{ {
const Node* n = from.node(); const Node* n = from.node();
@ -3584,7 +3584,7 @@ void SparseMat::convertTo( Mat& m, int rtype, double alpha, double beta ) const
} }
else else
{ {
ConvertScaleData cvtfunc = getConvertScaleData(type(), rtype); ConvertScaleData cvtfunc = getConvertScaleElem(type(), rtype);
for( i = 0; i < N; i++, ++from ) for( i = 0; i < N; i++, ++from )
{ {
const Node* n = from.node(); const Node* n = from.node();

Write Preview
Loading…
Cancel
Save