Merge pull request #602 from Kanglt/master

xl-wenqiang · web-flow · commit 45251a14ceef · 2025-08-18T14:12:19.000+08:00
修复Excel导出图片慢的问题
diff --git a/src/Magicodes.ExporterAndImporter.Excel/Images/ImageExtensions.cs b/src/Magicodes.ExporterAndImporter.Excel/Images/ImageExtensions.cs
@@ -56,7 +56,8 @@ public static Image GetImageByUrl(this string url, out IImageFormat format)
                         var image = Image.Load(memoryStream);
                         format = image.GetImageFormat(memoryStream);
 
-                        if (image.Metadata.HorizontalResolution == 0 && image.Metadata.VerticalResolution == 0)
+                        // 2025-08-03 SixLabors.ImageSharp在加载某些格式的图片（尤其是 JPEG/PNG）时，如果图片元数据中没有明确指定 DPI 信息，或者元数据格式不符合预期，可能会将 DPI 默认设置为 1
+                        if (image.Metadata.HorizontalResolution <= 1 && image.Metadata.VerticalResolution <= 1)
                         {
                             image.Metadata.HorizontalResolution = ImageMetadata.DefaultHorizontalResolution;
                             image.Metadata.VerticalResolution = ImageMetadata.DefaultVerticalResolution;

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ public static Image GetImageByUrl(this string url, out IImageFormat format)`
`56`	`56`	`var image = Image.Load(memoryStream);`
`57`	`57`	`format = image.GetImageFormat(memoryStream);`
`58`	`58`
`59`		`- if (image.Metadata.HorizontalResolution == 0 && image.Metadata.VerticalResolution == 0)`
	`59`	`+ // 2025-08-03 SixLabors.ImageSharp在加载某些格式的图片（尤其是 JPEG/PNG）时，如果图片元数据中没有明确指定 DPI 信息，或者元数据格式不符合预期，可能会将 DPI 默认设置为 1`
	`60`	`+ if (image.Metadata.HorizontalResolution <= 1 && image.Metadata.VerticalResolution <= 1)`
`60`	`61`	`{`
`61`	`62`	`image.Metadata.HorizontalResolution = ImageMetadata.DefaultHorizontalResolution;`
`62`	`63`	`image.Metadata.VerticalResolution = ImageMetadata.DefaultVerticalResolution;`