Commit 45ea3e56 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander Trofimov

Исправлены баги при отрисовке текста патами.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63575 954022d7-b5bf-4e40-9824-e11837661b57
parent fb6bae5e
...@@ -402,6 +402,7 @@ namespace Aggplus ...@@ -402,6 +402,7 @@ namespace Aggplus
if (NULL == pFont) if (NULL == pFont)
return InvalidParameter; return InvalidParameter;
pFont->SetTextMatrix(1, 0, 0, 1, 0, 0);
pFont->LoadString1(strText, (float)x, (float)y); pFont->LoadString1(strText, (float)x, (float)y);
return (TRUE == pFont->GetStringPath(this)) ? Ok : InvalidParameter; return (TRUE == pFont->GetStringPath(this)) ? Ok : InvalidParameter;
} }
...@@ -410,6 +411,7 @@ namespace Aggplus ...@@ -410,6 +411,7 @@ namespace Aggplus
if (NULL == pFont) if (NULL == pFont)
return InvalidParameter; return InvalidParameter;
pFont->SetTextMatrix(1, 0, 0, 1, 0, 0);
pFont->LoadString1(pGids, nGidsCount, (float)x, (float)y); pFont->LoadString1(pGids, nGidsCount, (float)x, (float)y);
return (TRUE == pFont->GetStringPath(this)) ? Ok : InvalidParameter; return (TRUE == pFont->GetStringPath(this)) ? Ok : InvalidParameter;
} }
...@@ -419,8 +421,9 @@ namespace Aggplus ...@@ -419,8 +421,9 @@ namespace Aggplus
if (NULL == pFont) if (NULL == pFont)
return InvalidParameter; return InvalidParameter;
std::wstring strText((wchar_t)lText, 1); unsigned int _c = (int)lText;
pFont->LoadString1(strText, (float)x, (float)y); pFont->SetTextMatrix(1, 0, 0, 1, 0, 0);
pFont->LoadString1(&_c, 1, (float)x, (float)y);
return (TRUE == pFont->GetStringPath(this)) ? Ok : InvalidParameter; return (TRUE == pFont->GetStringPath(this)) ? Ok : InvalidParameter;
} }
......
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