новая версия

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60825 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/fontengine/FontFile.cpp

@@ -1404,22 +1404,21 @@ INT CFontFile::GetString2C(CGlyphString& oString)
 			pCurGlyph->eState = glyphstateNormal;
         }
 
-        // кернинга нету пока.
-        if (true)
-        {
-            float fX = oString.m_fX + fPenX;
-            float fY = oString.m_fY + fPenY;
-
-            pCurGlyph->fX = (float)(oString.m_arrCTM[4] + fX * oString.m_arrCTM[0] + fY * oString.m_arrCTM[2] - oString.m_fX);
-            pCurGlyph->fY = (float)(oString.m_arrCTM[5] + fX * oString.m_arrCTM[1] + fY * oString.m_arrCTM[3] - oString.m_fY);
-        }
-
         pCurGlyph->oMetrics = oSizes.oMetrics;
 
 		pCurGlyph->bBitmap = oSizes.bBitmap;
 		pCurGlyph->oBitmap = oSizes.oBitmap;
     }
     
+    if (true)
+    {
+        float fX = oString.m_fX + fPenX;
+        float fY = oString.m_fY + fPenY;
+        
+        pCurGlyph->fX = (float)(oString.m_arrCTM[4] + fX * oString.m_arrCTM[0] + fY * oString.m_arrCTM[2] - oString.m_fX);
+        pCurGlyph->fY = (float)(oString.m_arrCTM[5] + fX * oString.m_arrCTM[1] + fY * oString.m_arrCTM[3] - oString.m_fY);
+    }
+    
 	fPenX += (float)(m_oCacheSizes[charSymbolObj].fAdvanceX + m_dCharSpacing);
     if (m_bNeedDoBold)
     {

DesktopEditor/fontengine/FontManager.cpp

@@ -418,9 +418,20 @@ INT CFontManager::SetTextMatrix(const double &fA, const double &fB, const double
 {
     if (NULL == m_pFont)
         return FALSE;
+    
+    if (fabs(fB) > 0.1)
+    {
+        int y = 0;
+        ++y;
+    }
 
+    /*
     if (m_pFont->SetTextMatrix(fA, fB, fC, fD, 0, 0))
 		m_oString.SetCTM((float)fA, (float)fB, (float)fC, (float)fD, 0, 0);
+     */
+    m_pFont->SetTextMatrix(fA, fB, fC, fD, 0, 0);
+    m_oString.SetCTM((float)fA, (float)fB, (float)fC, (float)fD, 0, 0);
+    
 	m_oString.SetTrans((float)fE, (float)fF);
 
     return TRUE;

DesktopEditor/graphics/GraphicsPath.cpp

@@ -663,7 +663,7 @@ namespace Aggplus
 		if( fSweepAngle > 0 )
 			bClockDirection = TRUE;
 
-		if( abs(fSweepAngle) >= 360 ) // Целый эллипс
+		if( fabs(fSweepAngle) >= 360 ) // Целый эллипс
 		{
 			return (0 == Ellipse(fX + fWidth / 2, fY + fHeight / 2, fWidth / 2, fHeight / 2)) ? Ok : GenericError;
 		}
@@ -1143,7 +1143,7 @@ namespace Aggplus
 		if( fSweepAngle > 0 )
 			bClockDirection = TRUE;
 
-		if( abs(fSweepAngle) >= 360 ) // Целый эллипс
+		if( fabs(fSweepAngle) >= 360 ) // Целый эллипс
 		{
 			return (0 == Ellipse(fX + fWidth / 2, fY + fHeight / 2, fWidth / 2, fHeight / 2)) ? true : false;
 		}