1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code

This commit is contained in:
Vadim Pisarevsky
2014-08-03 12:46:28 +04:00
parent 9cb79b9abb
commit eeb786fcfd
10 changed files with 30 additions and 30 deletions
+4 -4
View File
@@ -310,7 +310,7 @@ public:
varType.create(1, nvars, CV_8U);
varType = Scalar::all(VAR_ORDERED);
if( noutputvars == 1 )
varType.at<uchar>(ninputvars) = responses.type() < CV_32F ? VAR_CATEGORICAL : VAR_ORDERED;
varType.at<uchar>(ninputvars) = (uchar)(responses.type() < CV_32F ? VAR_CATEGORICAL : VAR_ORDERED);
}
if( noutputvars > 1 )
@@ -558,7 +558,7 @@ public:
if( tp == VAR_MISSED )
haveMissed = true;
rowvals.push_back(val);
rowtypes.push_back(tp);
rowtypes.push_back((uchar)tp);
token = strtok(NULL, delimiters);
if (!token)
break;
@@ -880,7 +880,7 @@ public:
if( s )
{
j = s[i];
CV_DbgAssert( 0 <= j && j < nsamples );
CV_Assert( 0 <= j && j < nsamples );
}
values[i] = src[j*sstep];
if( values[i] == MISSED_VAL )
@@ -955,7 +955,7 @@ public:
if( vptr )
{
j = vptr[i];
CV_DbgAssert( 0 <= j && j < nvars );
CV_Assert( 0 <= j && j < nvars );
}
buf[i] = src[j*vstep];
}