From 4e039007739aab9403515a05224d4935593fbb80 Mon Sep 17 00:00:00 2001 From: gomi42 Date: Mon, 21 Aug 2023 09:16:13 +0200 Subject: [PATCH] update --- BarcodeGenerator/EmfBarcodeGenerator.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BarcodeGenerator/EmfBarcodeGenerator.cs b/BarcodeGenerator/EmfBarcodeGenerator.cs index 2cc29fa..51293c1 100644 --- a/BarcodeGenerator/EmfBarcodeGenerator.cs +++ b/BarcodeGenerator/EmfBarcodeGenerator.cs @@ -38,7 +38,7 @@ internal class EmfBarcodeGenerator : BarcodeGenerator ///////////////////////////////////////////////////////////// - private string imageBaseFilename; + private string filename; private Metafile metafile; private Graphics graphics; private int currentPage; @@ -50,7 +50,7 @@ internal class EmfBarcodeGenerator : BarcodeGenerator public bool GenerateEmf(string focal, string outputBaseFilename) { - imageBaseFilename = Path.Combine(Path.GetDirectoryName(outputBaseFilename), Path.GetFileNameWithoutExtension(outputBaseFilename)); + filename = outputBaseFilename; currentPage = 1; return Generate(focal, false); @@ -80,7 +80,8 @@ private void InitImage() Graphics referenceGraphics = Graphics.FromImage(bitmap); IntPtr referenceHdc = referenceGraphics.GetHdc(); - metafile = new Metafile(imageBaseFilename + "-" + currentPage.ToString() + ".emf", referenceHdc, EmfType.EmfOnly); + var baseFilename = Path.Combine(Path.GetDirectoryName(filename), Path.GetFileNameWithoutExtension(filename)); + metafile = new Metafile(baseFilename + "-" + currentPage.ToString() + Path.GetExtension(filename), referenceHdc, EmfType.EmfOnly); referenceGraphics.ReleaseHdc(referenceHdc); referenceGraphics.Dispose();