generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5458 from berak:fix_putText

Browse Source
This commit is contained in:
Alexander Alekhin
2015-10-06 17:11:47 +00:00
parent 6025738b8b f2decec3e8
commit 559b538be8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/drawing.cpp
View File

@@ -2111,7 +2111,7 @@ void putText( InputOutputArray _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;
@@ -2158,7 +2158,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;