Merge pull request #1415 from ONLYOFFICE/fix/WmfSize

Fix Wmf file Size
ONLYOFFICE · Feb 9, 2024 · 5ccef7b · 5ccef7b
2 parents ba79959 + 581e546
commit 5ccef7b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 23 deletions.
diff --git a/DesktopEditor/raster/Metafile/Common/MetaFile.h b/DesktopEditor/raster/Metafile/Common/MetaFile.h
@@ -80,7 +80,7 @@ namespace MetaFile
 		virtual bool         IsWindowFlippedY() = 0;
 		virtual bool         IsWindowFlippedX() = 0;
 		virtual unsigned int GetMapMode() = 0;
-		virtual double       GetDpi() = 0;
+		virtual USHORT       GetDpi() = 0;
 		virtual IRegion*     GetRegion() = 0;
 		virtual unsigned int GetArcDirection() = 0;
 		virtual CPath*       GetPath() = 0;

diff --git a/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfParserBase.cpp b/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfParserBase.cpp
@@ -749,9 +749,9 @@ namespace MetaFile
 		return m_pDC->GetMapMode();
 	}
 
-	double CEmfParserBase::GetDpi()
+	USHORT CEmfParserBase::GetDpi()
 	{
-		return 96.;
+		return 96;
 	}
 
 	IRegion *CEmfParserBase::GetRegion()

diff --git a/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfParserBase.h b/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfParserBase.h
@@ -79,7 +79,7 @@ namespace MetaFile
 		bool            IsWindowFlippedY()               override;
 		bool            IsWindowFlippedX()               override;
 		unsigned int    GetMapMode()                     override;
-		double          GetDpi()                         override;
+		USHORT          GetDpi()                         override;
 		IRegion*        GetRegion()                      override;
 		unsigned int    GetArcDirection()                override;
 		CPath*          GetPath()                        override;

diff --git a/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfPlusParser.cpp b/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfPlusParser.cpp
@@ -336,9 +336,9 @@ namespace MetaFile
 		this->ClearFile();
 	}
 
-	double CEmfPlusParser::GetDpi()
+	USHORT CEmfPlusParser::GetDpi()
 	{
-		return (double)m_unLogicalDpiX;
+		return m_unLogicalDpiX;
 	}
 
 	EmfParserType CEmfPlusParser::GetType()

diff --git a/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfPlusParser.h b/DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfPlusParser.h
@@ -21,7 +21,7 @@ namespace MetaFile
 
 		void            PlayFile()                                  override;
 		void            Scan()                                      override;
-		double          GetDpi()                                    override;
+		USHORT          GetDpi()                                    override;
 
 		EmfParserType   GetType()				    override;
 

diff --git a/DesktopEditor/raster/Metafile/StarView/SvmFile.h b/DesktopEditor/raster/Metafile/StarView/SvmFile.h
@@ -202,9 +202,9 @@ class CSvmFile : virtual public IMetaFileBase
 		return MM_ANISOTROPIC;
 	}
 
-	double GetDpi()
+	USHORT GetDpi()
 	{
-		return 96.;
+		return 96;
 	}
 
 	IRegion* GetRegion()

diff --git a/DesktopEditor/raster/Metafile/Wmf/WmfParser/CWmfParserBase.cpp b/DesktopEditor/raster/Metafile/Wmf/WmfParser/CWmfParserBase.cpp
@@ -161,9 +161,9 @@ namespace MetaFile
 		return m_pDC->GetMapMode();
 	}
 
-	double CWmfParserBase::GetDpi()
+	USHORT CWmfParserBase::GetDpi()
 	{
-		return (0 != m_oPlaceable.ushInch) ? m_oPlaceable.ushInch : 96.;
+		return (0 != m_oPlaceable.ushInch) ? m_oPlaceable.ushInch : 96;
 	}
 
 	IRegion *CWmfParserBase::GetRegion()
@@ -249,6 +249,19 @@ namespace MetaFile
 
 			oBB = m_oPlaceable.oBoundingBox;
 
+			const USHORT ushFileDpi = GetDpi();
+			const USHORT ushRendererDpi = 96;
+
+			if (ushFileDpi != ushRendererDpi && 0 != ushFileDpi)
+			{
+				const double dKoef = (double)ushRendererDpi / (double)ushFileDpi;
+
+				oBB.Left   = std::round(oBB.Left   * dKoef);
+				oBB.Top    = std::round(oBB.Top    * dKoef);
+				oBB.Right  = std::round(oBB.Right  * dKoef);
+				oBB.Bottom = std::round(oBB.Bottom * dKoef);
+			}
+
 			// Иногда m_oPlaceable.BoundingBox задается нулевой ширины и высоты
 			if (abs(oBB.Right - oBB.Left) <= 1)
 			{
@@ -261,17 +274,6 @@ namespace MetaFile
 				oBB.Bottom = m_oBoundingBox.Bottom;
 			}
 
-			const double dFileDpi = GetDpi();
-			const double dRendererDpi = 96;
-
-			if (Equals(dFileDpi, dRendererDpi) && !Equals(0, dFileDpi))
-				return oBB;
-
-			oBB.Left   = std::round(oBB.Left   * dRendererDpi / dFileDpi);
-			oBB.Top    = std::round(oBB.Top    * dRendererDpi / dFileDpi);
-			oBB.Right  = std::round(oBB.Right  * dRendererDpi / dFileDpi);
-			oBB.Bottom = std::round(oBB.Bottom * dRendererDpi / dFileDpi);
-
 			return oBB;
 		}
 		else

diff --git a/DesktopEditor/raster/Metafile/Wmf/WmfParser/CWmfParserBase.h b/DesktopEditor/raster/Metafile/Wmf/WmfParser/CWmfParserBase.h
@@ -57,7 +57,7 @@ namespace MetaFile
 		bool            IsWindowFlippedY()               override;
 		bool            IsWindowFlippedX()               override;
 		unsigned int    GetMapMode()                     override;
-		double          GetDpi()                         override;
+		USHORT          GetDpi()                         override;
 		IRegion*        GetRegion()                      override;
 		unsigned int    GetArcDirection()                override;
 		CPath*          GetPath()                        override;