支持传递参数

Author: lindexi

src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/EnhancedGraphicsMetafileOptimization.cs

@@ -150,7 +150,12 @@ private static ImageFileOptimizationResult ConvertWithSkiaWmfRenderer(ImageFileO
 
         context.LogMessage($"Start convert wmf to png by SkiaWmfRenderer. File:'{file}'");
 
-        if (SkiaWmfRenderHelper.TryConvertToPng(file, outputPngFile, requestWidth, requestHeight) && File.Exists(outputPngFile.FullName))
+        var skiaWmfRenderConfiguration = new SkiaWmfRenderConfiguration()
+        {
+            RequestWidth = requestWidth, 
+            RequestHeight = requestHeight
+        };
+        if (SkiaWmfRenderHelper.TryConvertToPng(file, outputPngFile, skiaWmfRenderConfiguration) && File.Exists(outputPngFile.FullName))
         {
             context.LogMessage($"Success converted wmf to png by SkiaWmfRenderer. File:'{file}' Output:'{outputPngFile}'");
 

src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/Rendering/WmfRenderStatus.cs

@@ -11,6 +11,13 @@ namespace SkiaWmfRenderer.Rendering;
 
 class WmfRenderStatus : IDisposable
 {
+    public WmfRenderStatus(SkiaWmfRenderConfiguration renderConfiguration)
+    {
+        RenderConfiguration = renderConfiguration;
+    }
+
+    public SkiaWmfRenderConfiguration RenderConfiguration { get; }
+
     public required float CurrentX { get; set; }
     public required float CurrentY { get; set; }
 
@@ -114,9 +121,18 @@ public void UpdateSkiaTextStatus(string text)
         {
             typeface = SKTypeface.FromFamilyName(CurrentFontName, (SKFontStyleWeight) FontWeight,
            SKFontStyleWidth.Normal, IsItalic ? SKFontStyleSlant.Italic : SKFontStyleSlant.Upright);
+
+            if (typeface is null || typeface.GlyphCount == 0)
+            {
+                var fontFile = Path.Join(AppContext.BaseDirectory, $"{CurrentFontName}.ttf");
+                if (File.Exists(fontFile))
+                {
+                    typeface = SKTypeface.FromFile(fontFile);
+                }
+            }
         }
 
-        Console.WriteLine($"CurrentFontName='{CurrentFontName}' get the SKTypeface {(typeface is null ? "is null" : "not null")}. SKTypeface={typeface?.FamilyName} GlyphCount={typeface?.GlyphCount}. Text={text}");
+        RenderConfiguration.LogMessage($"CurrentFontName='{CurrentFontName}' get the SKTypeface {(typeface is null ? "is null" : "not null")}. SKTypeface={typeface?.FamilyName} GlyphCount={typeface?.GlyphCount}. Text={text}");
 
         skFont.Typeface = typeface;
 

src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/Rendering/WmfRenderer.cs

@@ -10,8 +10,9 @@ namespace SkiaWmfRenderer.Rendering;
 class WmfRenderer
 {
     public required WmfDocument WmfDocument { get; init; }
-    public required int RequestWidth { get; init; }
-    public required int RequestHeight { get; init; }
+    public required SkiaWmfRenderConfiguration RenderConfiguration { get; init; }
+    private int RequestWidth => RenderConfiguration.RequestWidth;
+    private int RequestHeight => RenderConfiguration.RequestHeight;
 
     /// <summary>
     /// 图片压缩的最大宽度
@@ -35,7 +36,7 @@ public bool TryRender([NotNullWhen(true)] out SKBitmap? skBitmap)
         var width = Math.Abs(format.Right - format.Left);
         var height = Math.Abs(format.Bottom - format.Top);
 
-        using WmfRenderStatus renderStatus = new()
+        using WmfRenderStatus renderStatus = new(RenderConfiguration)
         {
             CurrentX = x,
             CurrentY = y,
@@ -53,6 +54,8 @@ public bool TryRender([NotNullWhen(true)] out SKBitmap? skBitmap)
         {
             var result = TryRenderInner(canvas, renderStatus);
 
+            RenderConfiguration.LogMessage($"[WmfRenderer] TryRenderInner={result}; IsIncludeText={renderStatus.IsIncludeText} && (IsIncludeOtherEncoding={renderStatus.IsIncludeOtherEncoding} || IsIncludeTextWithDx={renderStatus.IsIncludeTextWithDx})");
+
             if (result)
             {
                 return true;

src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/SkiaWmfRenderConfiguration.cs

@@ -0,0 +1,37 @@
+namespace SkiaWmfRenderer;
+
+public class SkiaWmfRenderConfiguration
+{
+    /// <summary>
+    /// 请求的宽度，0 表示不限制
+    /// </summary>
+    public int RequestWidth { get; set; } = 0;
+
+    /// <summary>
+    /// 请求的高度，0 表示不限制
+    /// </summary>
+    public int RequestHeight { get; set; } = 0;
+
+    /// <summary>
+    /// 是否启用调试模式，输出日志到控制台
+    /// </summary>
+    public bool? ShouldLogToConsole { get; init; } = false;
+
+    /// <summary>
+    /// 符号字体文件的路径
+    /// </summary>
+    public FileInfo? SymbolFontFile { get; init; }
+
+    /// <summary>
+    /// 字体文件夹
+    /// </summary>
+    public DirectoryInfo? FontFolder { get; init; }
+
+    internal void LogMessage(string message)
+    {
+        if (ShouldLogToConsole is true)
+        {
+            Console.WriteLine(message);
+        }
+    }
+}

src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/SkiaWmfRenderHelper.cs

@@ -11,9 +11,10 @@ namespace SkiaWmfRenderer;
 
 public static class SkiaWmfRenderHelper
 {
-    public static bool TryConvertToPng(FileInfo wmfFile, FileInfo outputPngFile, int requestWidth = 0, int requestHeight = 0)
+    public static bool TryConvertToPng(FileInfo wmfFile, FileInfo outputPngFile, SkiaWmfRenderConfiguration? configuration = null)
     {
-        if (!TryRender(wmfFile, requestWidth, requestHeight, out var skBitmap))
+        configuration ??= new SkiaWmfRenderConfiguration();
+        if (!TryRender(wmfFile, configuration, out var skBitmap))
         {
             return false;
         }
@@ -24,7 +25,7 @@ public static bool TryConvertToPng(FileInfo wmfFile, FileInfo outputPngFile, int
         return true;
     }
 
-    public static bool TryRender(FileInfo wmfFile, int requestWidth, int requestHeight, [NotNullWhen(true)] out SKBitmap? skBitmap)
+    public static bool TryRender(FileInfo wmfFile, SkiaWmfRenderConfiguration configuration, [NotNullWhen(true)] out SKBitmap? skBitmap)
     {
         Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
@@ -46,8 +47,7 @@ public static bool TryRender(FileInfo wmfFile, int requestWidth, int requestHeig
         var wmfRenderer = new WmfRenderer()
         {
             WmfDocument = wmfDocument,
-            RequestWidth = requestWidth,
-            RequestHeight = requestHeight,
+            RenderConfiguration = configuration
         };
 
         return wmfRenderer.TryRender(out skBitmap);