Merge pull request #2106 from robbertkl:patch-2

11 years ago · 7acea48788
parent 58882e5c22 e21c6e19db
commit 7acea48788
1 changed files with 1 additions and 1 deletions
--- a/modules/core/src/algorithm.cpp
+++ b/modules/core/src/algorithm.cpp
@ -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)
    {
        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)) )
        {
            string message = getErrorMessageForWrongArgumentInSetter(algo->name(), parameter, p->type, argType);