From 41dc8293410d85c9f14f9ad4afc64a879f8765e8 Mon Sep 17 00:00:00 2001 From: LeonidBeynenson Date: Mon, 25 Feb 2013 15:38:59 +0400 Subject: [PATCH] Made changes to avoid warnings (Windows compilation). --- modules/core/src/algorithm.cpp | 43 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/modules/core/src/algorithm.cpp b/modules/core/src/algorithm.cpp index cebecd0b5..f96f243cb 100644 --- a/modules/core/src/algorithm.cpp +++ b/modules/core/src/algorithm.cpp @@ -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); if( argType == Param::INT ) - *(int*)value = val; + *(int*)value = (int)val; else if ( argType == Param::REAL ) - *(double*)value = val; + *(double*)value = (double)val; else if ( argType == Param::FLOAT) - *(float*)value = val; + *(float*)value = (float)val; else if ( argType == Param::UNSIGNED_INT ) - *(unsigned int*)value = val; + *(unsigned int*)value = (unsigned int)val; else if ( argType == Param::UINT64 ) - *(uint64*)value = val; + *(uint64*)value = (uint64)val; else if ( argType == Param::UCHAR) - *(uchar*)value = val; + *(uchar*)value = (uchar)val; else CV_Error(CV_StsBadArg, "Wrong argument type"); @@ -939,13 +939,13 @@ void AlgorithmInfo::get(const Algorithm* algo, const char* parameter, int argTyp else if ( argType == Param::REAL ) *(double*)value = (int)val; else if ( argType == Param::FLOAT) - *(float*)value = (int)val; + *(float*)value = (float)((int)val); else if ( argType == Param::UNSIGNED_INT ) - *(unsigned int*)value = (int)val; + *(unsigned int*)value = (unsigned int)val; else if ( argType == Param::UINT64 ) *(uint64*)value = (int)val; else if ( argType == Param::UCHAR) - *(uchar*)value = (int)val; + *(uchar*)value = (uchar)val; else CV_Error(CV_StsBadArg, "Wrong argument type"); } @@ -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); if( argType == Param::INT ) - *(int*)value = val; + *(int*)value = (int)val; else if ( argType == Param::REAL ) - *(double*)value = val; + *(double*)value = (double)val; else if ( argType == Param::FLOAT) - *(float*)value = val; + *(float*)value = (float)val; else if ( argType == Param::UNSIGNED_INT ) - *(unsigned int*)value = val; + *(unsigned int*)value = (unsigned int)val; else if ( argType == Param::UINT64 ) - *(uint64*)value = val; + *(uint64*)value = (uint64)val; else if ( argType == Param::UCHAR) - *(uchar*)value = val; + *(uchar*)value = (uchar)val; else CV_Error(CV_StsBadArg, "Wrong argument type"); } @@ -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); if( argType == Param::INT ) - *(int*)value = val; + *(int*)value = (int)val; else if ( argType == Param::REAL ) - *(double*)value = val; + *(double*)value = (double)val; else if ( argType == Param::FLOAT) - *(float*)value = val; + *(float*)value = (float)val; else if ( argType == Param::UNSIGNED_INT ) - *(unsigned int*)value = val; + *(unsigned int*)value = (unsigned int)val; else if ( argType == Param::UINT64 ) - *(uint64*)value = val; + *(uint64*)value = (uint64)val; else if ( argType == Param::UCHAR) - *(uchar*)value = val; + *(uchar*)value = (uchar)val; else CV_Error(CV_StsBadArg, "Wrong argument type"); - } else if( p->type == Param::UCHAR ) {