Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue with font;

Browse Source
pull/3265/head
Dinar Ahmatnurov 11 years ago
parent de6edcc48a
commit 5a797ae7de
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      modules/core/src/drawing.cpp

8
modules/core/src/drawing.cpp
Unescape View File

@ -1938,12 +1938,12 @@ static const int* getFontData(int fontFace)
return ascii; return ascii;
} }
inline void readCheck(int &c, int &i, const string &text) inline void readCheck(int &c, int &i, const string &text, int fontFace)
{ {
int leftBoundary = ' ', rightBoundary = 127; int leftBoundary = ' ', rightBoundary = 127;
if(c >= 0x80) if(c >= 0x80 && fontFace == FONT_HERSHEY_COMPLEX)
{ {
if(c >= 0xC0 && c <= 0xDF) //2 bytes utf if(c >= 0xC0 && c <= 0xDF) //2 bytes utf
{ {
@ -2014,7 +2014,7 @@ void putText( Mat& img, const string& text, Point org,
int c = (uchar)text[i]; int c = (uchar)text[i];
Point p; Point p;
readCheck(c, i, text); readCheck(c, i, text, fontFace);
const char* ptr = faces[ascii[(c-' ')+1]]; const char* ptr = faces[ascii[(c-' ')+1]];
p.x = (uchar)ptr[0] - 'R'; p.x = (uchar)ptr[0] - 'R';
@ -2061,7 +2061,7 @@ Size getTextSize( const string& text, int fontFace, double fontScale, int thickn
int c = (uchar)text[i]; int c = (uchar)text[i];
Point p; Point p;
readCheck(c, i, text); readCheck(c, i, text, fontFace);
const char* ptr = faces[ascii[(c-' ')+1]]; const char* ptr = faces[ascii[(c-' ')+1]];
p.x = (uchar)ptr[0] - 'R'; p.x = (uchar)ptr[0] - 'R';

Write Preview
Loading…
Cancel
Save