fixed defects from Xcode

This commit is contained in:
Ilya Lavrenov
2014-02-23 21:07:20 +04:00
parent 32eb38ec98
commit ce0557ebb8
11 changed files with 23 additions and 29 deletions

View File

@@ -353,7 +353,7 @@ Mat& Mat::operator = (const Scalar& s)
Mat& Mat::setTo(InputArray _value, InputArray _mask)
{
if( !data )
if( empty() )
return *this;
Mat value = _value.getMat(), mask = _mask.getMat();
@@ -632,6 +632,7 @@ int cv::borderInterpolate( int p, int len, int borderType )
}
else if( borderType == BORDER_WRAP )
{
CV_Assert(len > 0);
if( p < 0 )
p -= ((p-len+1)/len)*len;
if( p >= len )

View File

@@ -426,6 +426,7 @@ String format( const char* fmt, ... )
String s(len, '\0');
va_start(va, fmt);
len = vsnprintf((char*)s.c_str(), len + 1, fmt, va);
(void)len;
va_end(va);
return s;
}