|
|
@ -88,7 +88,8 @@ namespace ft {
|
|
|
|
static int ftd(FT_F26Dot6 fixedInt) {
|
|
|
|
static int ftd(FT_F26Dot6 fixedInt) {
|
|
|
|
if (fixedInt > 0) {
|
|
|
|
if (fixedInt > 0) {
|
|
|
|
return (fixedInt + 32) / 64;
|
|
|
|
return (fixedInt + 32) / 64;
|
|
|
|
}else{
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
return (fixedInt - 32) / 64;
|
|
|
|
return (fixedInt - 32) / 64;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -201,11 +202,13 @@ namespace ft {
|
|
|
|
if (_line_type == LINE_AA) {
|
|
|
|
if (_line_type == LINE_AA) {
|
|
|
|
putTextBitmapBlend(_img, _text, _org, _fontHeight, _color,
|
|
|
|
putTextBitmapBlend(_img, _text, _org, _fontHeight, _color,
|
|
|
|
_thickness, _line_type, _bottomLeftOrigin);
|
|
|
|
_thickness, _line_type, _bottomLeftOrigin);
|
|
|
|
}else{
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
putTextBitmapMono(_img, _text, _org, _fontHeight, _color,
|
|
|
|
putTextBitmapMono(_img, _text, _org, _fontHeight, _color,
|
|
|
|
_thickness, _line_type, _bottomLeftOrigin);
|
|
|
|
_thickness, _line_type, _bottomLeftOrigin);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
putTextOutline(_img, _text, _org, _fontHeight, _color,
|
|
|
|
putTextOutline(_img, _text, _org, _fontHeight, _color,
|
|
|
|
_thickness, _line_type, _bottomLeftOrigin);
|
|
|
|
_thickness, _line_type, _bottomLeftOrigin);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -663,7 +666,8 @@ namespace ft {
|
|
|
|
if (_thickness > 0) {
|
|
|
|
if (_thickness > 0) {
|
|
|
|
width = cvRound(width + _thickness * 2);
|
|
|
|
width = cvRound(width + _thickness * 2);
|
|
|
|
height = cvRound(height + _thickness * 1);
|
|
|
|
height = cvRound(height + _thickness * 1);
|
|
|
|
}else{
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
width = cvRound(width + 1);
|
|
|
|
width = cvRound(width + 1);
|
|
|
|
height = cvRound(height + 1);
|
|
|
|
height = cvRound(height + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -790,4 +794,5 @@ namespace ft {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}} // namespace freetype2
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace freetype2
|
|
|
|