git-svn-id:...

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

ASCImageStudio3/ASCGraphics/Objects/ASCFontManager.cpp

@@ -125,9 +125,14 @@ void CASCFontManager::DumpToJSEditor(CString strDirectory, bool bIsUnionFamily)
 	// -------------------------------------------
 
 	//    
+	int nDpi = 96;
+	if (FALSE)
+		nDpi <<= 1;
+
 	double dW_mm = 80;
-	LONG lH1_px = LONG(7 * 96 / 25.4);
-	LONG lWidthPix = (LONG)(dW_mm * 96 / 25.4);
+	LONG lH1_px = LONG(7 * nDpi / 25.4);
+	LONG lWidthPix = (LONG)(dW_mm * nDpi / 25.4);
+
 	LONG lHeightPix = (LONG)(nCountFonts * lH1_px);
 	MediaCore::IAVSUncompressedVideoFrame* pFrame = NULL;
 	CoCreateInstance(MediaCore::CLSID_CAVSUncompressedVideoFrame, NULL, CLSCTX_ALL, MediaCore::IID_IAVSUncompressedVideoFrame, (void**)&pFrame);
@@ -170,7 +175,7 @@ void CASCFontManager::DumpToJSEditor(CString strDirectory, bool bIsUnionFamily)
 	pRenderer->SetAdditionalParam( L"FontManager", vtVariant );
 
 	pRenderer->put_Width(dW_mm);
-	pRenderer->put_Height(lHeightPix * 25.4 / 96);
+	pRenderer->put_Height(lHeightPix * 25.4 / nDpi);
 	pRenderer->CreateFromMediaData((IUnknown*)pFrame, 0, 0, lWidthPix, lHeightPix);
 
 	//    (  )

ASCImageStudio3/ASCGraphics/Objects/Image/Wmf/WmfFile.h

@@ -2,6 +2,7 @@
 #define _WMF_FILE_H
 
 #include <stdio.h>
+#include <algorithm>
 
 #include "WmfTypes.h"
 #include "WmfColor.h"
@@ -69,7 +70,10 @@ public:
 		pPlayer->ulFlags = 0;
 
 		m_pFontManager = NULL;
+
+#ifdef DESKTOP_EDITOR_GRAPHICS
 		m_bDeleteFontManager = true;
+#endif
 	}
 
 	~CWmfFile()