Merge pull request opencv#5461 from berak:fix_putText_24

ywscr · Oct 6, 2015 · 454e5e5 · 454e5e5
2 parents 59082c8 + bb9bd31
commit 454e5e5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/core/src/drawing.cpp b/modules/core/src/drawing.cpp
@@ -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;