Commit ad595016 authored by Oleg Korshul's avatar Oleg Korshul Committed by Alexander.Trofimov

не делаем жирными шрифты heavy & extrabold

parent 839e017d
...@@ -1323,12 +1323,14 @@ function CFontFile(fileName, faceIndex) ...@@ -1323,12 +1323,14 @@ function CFontFile(fileName, faceIndex)
var _width = pCurentGliph.bitmap.pitch; var _width = pCurentGliph.bitmap.pitch;
var _disable_need_bold = (pFace.os2 && (pFace.os2.version != 0xFFFF) && (pFace.os2.usWeightClass >= 800)) ? true : false;
if (_width != 0) if (_width != 0)
{ {
var nRowSize = 0; var nRowSize = 0;
if (this.m_bAntiAliasing) if (this.m_bAntiAliasing)
{ {
if (this.m_bNeedDoBold) if (this.m_bNeedDoBold && !_disable_need_bold)
oSizes.oBitmap.nWidth++; oSizes.oBitmap.nWidth++;
nRowSize = oSizes.oBitmap.nWidth; nRowSize = oSizes.oBitmap.nWidth;
...@@ -1338,7 +1340,7 @@ function CFontFile(fileName, faceIndex) ...@@ -1338,7 +1340,7 @@ function CFontFile(fileName, faceIndex)
nRowSize = (oSizes.oBitmap.nWidth + 7) >> 3; nRowSize = (oSizes.oBitmap.nWidth + 7) >> 3;
} }
if (this.m_bNeedDoBold && this.m_bAntiAliasing) if (this.m_bNeedDoBold && this.m_bAntiAliasing && !_disable_need_bold)
{ {
var _width_im = oSizes.oBitmap.nWidth; var _width_im = oSizes.oBitmap.nWidth;
var _height = oSizes.oBitmap.nHeight; var _height = oSizes.oBitmap.nHeight;
...@@ -1597,8 +1599,10 @@ function CFontFile(fileName, faceIndex) ...@@ -1597,8 +1599,10 @@ function CFontFile(fileName, faceIndex)
oSizes.oBitmap.nWidth = pCurentGliph.bitmap.width; oSizes.oBitmap.nWidth = pCurentGliph.bitmap.width;
oSizes.oBitmap.nHeight = pCurentGliph.bitmap.rows; oSizes.oBitmap.nHeight = pCurentGliph.bitmap.rows;
var _disable_need_bold = (pFace.os2 && (pFace.os2.version != 0xFFFF) && (pFace.os2.usWeightClass >= 800)) ? true : false;
var nRowSize = 0; var nRowSize = 0;
if (this.m_bAntiAliasing) if (this.m_bAntiAliasing && !_disable_need_bold)
{ {
if (this.m_bNeedDoBold) if (this.m_bNeedDoBold)
oSizes.oBitmap.nWidth++; oSizes.oBitmap.nWidth++;
...@@ -1610,7 +1614,7 @@ function CFontFile(fileName, faceIndex) ...@@ -1610,7 +1614,7 @@ function CFontFile(fileName, faceIndex)
nRowSize = (oSizes.oBitmap.nWidth + 7) >> 3; nRowSize = (oSizes.oBitmap.nWidth + 7) >> 3;
} }
if (this.m_bNeedDoBold && this.m_bAntiAliasing) if (this.m_bNeedDoBold && this.m_bAntiAliasing && !_disable_need_bold)
{ {
var _width_im = oSizes.oBitmap.nWidth; var _width_im = oSizes.oBitmap.nWidth;
var _height = oSizes.oBitmap.nHeight; var _height = oSizes.oBitmap.nHeight;
......
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