git-svn-id:...

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

DesktopEditor/graphics/Graphics.cpp

@@ -595,6 +595,8 @@ namespace Aggplus
 					LONG lCount2	= lCount / 2;
 
 					double dKoef	= 0.352777778;
+					if (m_dDpiX > 1)
+						dKoef = 25.4 / m_dDpiX;
 
 					for (LONG i = 0; i < lCount2; ++i)
 					{

DesktopEditor/graphics/GraphicsRenderer.cpp

@@ -353,6 +353,7 @@ HRESULT CGraphicsRenderer::PenDashPattern(double* pPattern, LONG lCount)
 	RELEASEARRAYOBJECTS((m_oPen.DashPattern));
 	m_oPen.DashPattern = new double[lCount];
 	memcpy(m_oPen.DashPattern, pPattern, lCount * sizeof(double));
+	m_oPen.Count = lCount;
 	return S_OK;
 }
 

DesktopEditor/test/EditorEngine/EditorEngine.h

@@ -223,6 +223,26 @@ public:
 		CBgraFrame oFrame;
 		oFrame.OpenFile(sFile);
 
+		if (FALSE)
+		{
+			CBgraFrame oFrame2;
+			oFrame2.OpenFile(L"\\\\korshul\\Exchange\\1234\\.png");
+
+			BYTE* pData = oFrame2.get_Data();
+			int nCount = oFrame2.get_Width() * oFrame2.get_Height() * 4;
+			CStringA strImage = "";
+			for (int i = 0; i < nCount; ++i)
+			{
+				CStringA s = "";
+				s.Format("%d;", pData[i]);
+				strImage += s;
+			}
+
+			FILE* ff = fopen("c:\\image_dump", "a+");
+			fprintf(ff, strImage.GetBuffer());
+			fclose(ff);
+		}
+
 		oFrame.SaveFile(L"D:\\Exchange\\1234\\RENDERER\\1.png", _CXIMAGE_FORMAT_PNG);
 
 		return S_OK;