Merge pull request #5461 from berak:fix_putText_24

This commit is contained in:
Alexander Alekhin 2015-10-06 17:12:25 +00:00
commit 454e5e5fa4

View File

@ -2095,7 +2095,7 @@ void putText( Mat& img, const string& text, Point org,
pts.reserve(1 << 10);
const char **faces = cv::g_HersheyGlyphs;
for( int i = 0; text[i] != '\0'; i++ )
for( int i = 0; i < (int)text.size(); i++ )
{
int c = (uchar)text[i];
Point p;
@ -2142,7 +2142,7 @@ Size getTextSize( const string& text, int fontFace, double fontScale, int thickn
int cap_line = (ascii[0] >> 4) & 15;
size.height = cvRound((cap_line + base_line)*fontScale + (thickness+1)/2);
for( int i = 0; text[i] != '\0'; i++ )
for( int i = 0; i < (int)text.size(); i++ )
{
int c = (uchar)text[i];
Point p;