Skip to content

O
opencv
Commit 06617392 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

workaround issue with MatExpr

parent a6f46d7b
master 4.3.0 4.2.0 4.1.2 4.1.2-openvino 4.1.1 4.1.1-openvino 4.1.0 4.1.0-openvino 4.0.1 4.0.1-openvino 4.0.0 4.0.0-rc 4.0.0-openvino 4.0.0-beta 4.0.0-alpha 3.4.10 3.4.9 3.4.8 3.4.7 3.4.6 3.4.5 3.4.4 3.4.3 3.4.3-openvino 3.4.2 3.4.2-openvino 3.4.1 3.4.1-cvsdk 3.4.0 3.4.0-rc 3.3.1 3.3.1-cvsdk 3.3.0 3.3.0-rc 3.3.0-cvsdk 3.2.0 3.2.0-rc 3.1.0
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/core/src/matop.cpp
View file @ 06617392
......@@ -1583,12 +1583,12 @@ void MatOp_Initializer::multiply(const MatExpr& e, double s, MatExpr& res) const
inline void MatOp_Initializer::makeExpr(MatExpr& res, int method, Size sz, int type, double alpha)
{
res = MatExpr(getGlobalMatOpInitializer(), method, Mat(sz, type, (void*)0), Mat(), Mat(), alpha, 0);
res = MatExpr(getGlobalMatOpInitializer(), method, Mat(sz, type, (void*)0xEEEEEEEE), Mat(), Mat(), alpha, 0);
}
inline void MatOp_Initializer::makeExpr(MatExpr& res, int method, int ndims, const int* sizes, int type, double alpha)
{
res = MatExpr(getGlobalMatOpInitializer(), method, Mat(ndims, sizes, type, (void*)0), Mat(), Mat(), alpha, 0);
res = MatExpr(getGlobalMatOpInitializer(), method, Mat(ndims, sizes, type, (void*)0xEEEEEEEE), Mat(), Mat(), alpha, 0);
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment