mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9841 from alalek:naming_issue

Browse Source
This commit is contained in:
Alexander Alekhin 2017-10-12 11:22:54 +00:00
commit f1fe873375
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1151,7 +1151,7 @@ int Mat::checkVector(int _elemChannels, int _depth, bool _requireContinuous) con
} }
template <typename T> static inline template <typename T> static inline
void scalarToRawData(const Scalar& s, T * const buf, const int cn, const int unroll_to) void scalarToRawData_(const Scalar& s, T * const buf, const int cn, const int unroll_to)
{ {
int i = 0; int i = 0;
for(; i < cn; i++) for(; i < cn; i++)
@ -1169,25 +1169,25 @@ void scalarToRawData(const Scalar& s, void* _buf, int type, int unroll_to)
switch(depth) switch(depth)
{ {
case CV_8U: case CV_8U:
scalarToRawData<uchar>(s, (uchar*)_buf, cn, unroll_to); scalarToRawData_<uchar>(s, (uchar*)_buf, cn, unroll_to);
break; break;
case CV_8S: case CV_8S:
scalarToRawData<schar>(s, (schar*)_buf, cn, unroll_to); scalarToRawData_<schar>(s, (schar*)_buf, cn, unroll_to);
break; break;
case CV_16U: case CV_16U:
scalarToRawData<ushort>(s, (ushort*)_buf, cn, unroll_to); scalarToRawData_<ushort>(s, (ushort*)_buf, cn, unroll_to);
break; break;
case CV_16S: case CV_16S:
scalarToRawData<short>(s, (short*)_buf, cn, unroll_to); scalarToRawData_<short>(s, (short*)_buf, cn, unroll_to);
break; break;
case CV_32S: case CV_32S:
scalarToRawData<int>(s, (int*)_buf, cn, unroll_to); scalarToRawData_<int>(s, (int*)_buf, cn, unroll_to);
break; break;
case CV_32F: case CV_32F:
scalarToRawData<float>(s, (float*)_buf, cn, unroll_to); scalarToRawData_<float>(s, (float*)_buf, cn, unroll_to);
break; break;
case CV_64F: case CV_64F:
scalarToRawData<double>(s, (double*)_buf, cn, unroll_to); scalarToRawData_<double>(s, (double*)_buf, cn, unroll_to);
break; break;
default: default:
CV_Error(CV_StsUnsupportedFormat,""); CV_Error(CV_StsUnsupportedFormat,"");