Skip to content

O
opencv
Commit 5a797ae7 authored by Dinar Ahmatnurov's avatar Dinar Ahmatnurov
Browse files
Options

fix issue with font;

parent de6edcc4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/core/src/drawing.cpp
View file @ 5a797ae7
...@@ -1938,12 +1938,12 @@ static const int* getFontData(int fontFace) ...@@ -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, ...@@ -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 ...@@ -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';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment