mirrors/opencv
2
0 Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-10-06 04:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin authored and Alexander Alekhin committed 2018-09-14 23:44:35 +00:00
2 parents a024593fa6 14b438317e
commit 808ba552c5
235 files changed
+18422 -3526
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/core/src/array.cpp
+1 -1
View File
@@ -3224,7 +3224,7 @@ void scalarToRawData_(const Scalar& s, T * const buf, const int cn, const int un
void scalarToRawData(const Scalar& s, void* _buf, int type, int unroll_to)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
const int depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
CV_Assert(cn <= 4);