Skip to content

O
opencv
Commit 7acea487 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #2106 from robbertkl:patch-2

parents 58882e5c e21c6e19
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/core/src/algorithm.cpp
View file @ 7acea487
...@@ -647,7 +647,7 @@ void AlgorithmInfo::set(Algorithm* algo, const char* parameter, int argType, con ...@@ -647,7 +647,7 @@ void AlgorithmInfo::set(Algorithm* algo, const char* parameter, int argType, con
|| argType == Param::FLOAT || argType == Param::UNSIGNED_INT || argType == Param::UINT64 || argType == Param::UCHAR) || argType == Param::FLOAT || argType == Param::UNSIGNED_INT || argType == Param::UINT64 || argType == Param::UCHAR)
{ {
if ( !( p->type == Param::INT || p->type == Param::REAL || p->type == Param::BOOLEAN if ( !( p->type == Param::INT || p->type == Param::REAL || p->type == Param::BOOLEAN
|| p->type == Param::UNSIGNED_INT || p->type == Param::UINT64 || p->type == Param::FLOAT || argType == Param::UCHAR || p->type == Param::UNSIGNED_INT || p->type == Param::UINT64 || p->type == Param::FLOAT || p->type == Param::UCHAR
|| (p->type == Param::SHORT && argType == Param::INT)) ) || (p->type == Param::SHORT && argType == Param::INT)) )
{ {
string message = getErrorMessageForWrongArgumentInSetter(algo->name(), parameter, p->type, argType); string message = getErrorMessageForWrongArgumentInSetter(algo->name(), parameter, p->type, argType);
......
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