Skip to content

O
opencv
Commit 41dc8293 authored by LeonidBeynenson's avatar LeonidBeynenson
Browse files
Options

Made changes to avoid warnings (Windows compilation).

parent bfb644ac
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 22 deletions
modules/core/src/algorithm.cpp
View file @ 41dc8293
...@@ -897,17 +897,17 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp ...@@ -897,17 +897,17 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp
int val = p->getter ? (algo->*f.get_int)() : *(int*)((uchar*)algo + p->offset); int val = p->getter ? (algo->*f.get_int)() : *(int*)((uchar*)algo + p->offset);
if( argType == Param::INT ) if( argType == Param::INT )
*(int*)value = val; *(int*)value = (int)val;
else if ( argType == Param::REAL ) else if ( argType == Param::REAL )
*(double*)value = val; *(double*)value = (double)val;
else if ( argType == Param::FLOAT) else if ( argType == Param::FLOAT)
*(float*)value = val; *(float*)value = (float)val;
else if ( argType == Param::UNSIGNED_INT ) else if ( argType == Param::UNSIGNED_INT )
*(unsigned int*)value = val; *(unsigned int*)value = (unsigned int)val;
else if ( argType == Param::UINT64 ) else if ( argType == Param::UINT64 )
*(uint64*)value = val; *(uint64*)value = (uint64)val;
else if ( argType == Param::UCHAR) else if ( argType == Param::UCHAR)
*(uchar*)value = val; *(uchar*)value = (uchar)val;
else else
CV_Error(CV_StsBadArg, "Wrong argument type"); CV_Error(CV_StsBadArg, "Wrong argument type");
...@@ -939,13 +939,13 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp ...@@ -939,13 +939,13 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp
else if ( argType == Param::REAL ) else if ( argType == Param::REAL )
*(double*)value = (int)val; *(double*)value = (int)val;
else if ( argType == Param::FLOAT) else if ( argType == Param::FLOAT)
*(float*)value = (int)val; *(float*)value = (float)((int)val);
else if ( argType == Param::UNSIGNED_INT ) else if ( argType == Param::UNSIGNED_INT )
*(unsigned int*)value = (int)val; *(unsigned int*)value = (unsigned int)val;
else if ( argType == Param::UINT64 ) else if ( argType == Param::UINT64 )
*(uint64*)value = (int)val; *(uint64*)value = (int)val;
else if ( argType == Param::UCHAR) else if ( argType == Param::UCHAR)
*(uchar*)value = (int)val; *(uchar*)value = (uchar)val;
else else
CV_Error(CV_StsBadArg, "Wrong argument type"); CV_Error(CV_StsBadArg, "Wrong argument type");
} }
...@@ -991,17 +991,17 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp ...@@ -991,17 +991,17 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp
unsigned int val = p->getter ? (algo->*f.get_uint)() : *(unsigned int*)((uchar*)algo + p->offset); unsigned int val = p->getter ? (algo->*f.get_uint)() : *(unsigned int*)((uchar*)algo + p->offset);
if( argType == Param::INT ) if( argType == Param::INT )
*(int*)value = val; *(int*)value = (int)val;
else if ( argType == Param::REAL ) else if ( argType == Param::REAL )
*(double*)value = val; *(double*)value = (double)val;
else if ( argType == Param::FLOAT) else if ( argType == Param::FLOAT)
*(float*)value = val; *(float*)value = (float)val;
else if ( argType == Param::UNSIGNED_INT ) else if ( argType == Param::UNSIGNED_INT )
*(unsigned int*)value = val; *(unsigned int*)value = (unsigned int)val;
else if ( argType == Param::UINT64 ) else if ( argType == Param::UINT64 )
*(uint64*)value = val; *(uint64*)value = (uint64)val;
else if ( argType == Param::UCHAR) else if ( argType == Param::UCHAR)
*(uchar*)value = val; *(uchar*)value = (uchar)val;
else else
CV_Error(CV_StsBadArg, "Wrong argument type"); CV_Error(CV_StsBadArg, "Wrong argument type");
} }
...@@ -1015,20 +1015,19 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp ...@@ -1015,20 +1015,19 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp
uint64 val = p->getter ? (algo->*f.get_uint64)() : *(uint64*)((uchar*)algo + p->offset); uint64 val = p->getter ? (algo->*f.get_uint64)() : *(uint64*)((uchar*)algo + p->offset);
if( argType == Param::INT ) if( argType == Param::INT )
*(int*)value = val; *(int*)value = (int)val;
else if ( argType == Param::REAL ) else if ( argType == Param::REAL )
*(double*)value = val; *(double*)value = (double)val;
else if ( argType == Param::FLOAT) else if ( argType == Param::FLOAT)
*(float*)value = val; *(float*)value = (float)val;
else if ( argType == Param::UNSIGNED_INT ) else if ( argType == Param::UNSIGNED_INT )
*(unsigned int*)value = val; *(unsigned int*)value = (unsigned int)val;
else if ( argType == Param::UINT64 ) else if ( argType == Param::UINT64 )
*(uint64*)value = val; *(uint64*)value = (uint64)val;
else if ( argType == Param::UCHAR) else if ( argType == Param::UCHAR)
*(uchar*)value = val; *(uchar*)value = (uchar)val;
else else
CV_Error(CV_StsBadArg, "Wrong argument type"); CV_Error(CV_StsBadArg, "Wrong argument type");
} }
else if( p->type == Param::UCHAR ) else if( p->type == Param::UCHAR )
{ {
......
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