DocxFile3 win64 build (с исправлениями Emf/Wmf)

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

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //1
-//320
-#define INTVER 2,0,1,320
-#define STRVER "2,0,1,320\0"
+//322
+#define INTVER 2,0,1,322
+#define STRVER "2,0,1,322\0"

DesktopEditor/raster/Metafile/Emf/EmfFile.h

@@ -371,8 +371,8 @@ namespace MetaFile
 					nQuarter = 2;
 			}
 
-			double dDist = std::sqrt((nX - dX0) * (nX - dX0) + (nY - dY0) * (nY - dY0));
-			double dRadAngle = std::asin(std::abs(nY - dY0) / dDist);
+			double dDist = /*std::*/sqrt((double)(nX - dX0) * (nX - dX0) + (nY - dY0) * (nY - dY0));
+			double dRadAngle = /*std::*/asin(/*std::*/abs(nY - dY0) / dDist);
 			
 			double dAngle = dRadAngle * 180 / 3.1415926;
 			switch (nQuarter)