mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-13 00:01:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix algorithm setter argument validation for uchar(cherry picked from commit e21c6e19db)

Browse Source
This commit is contained in:
Robbert Klarenbeek 2014-01-02 21:17:55 +01:00 committed by Alexander Smorkalov
parent a65d7d4dd3
commit 345b3b0bdd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/algorithm.cpp
View File

@ -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);