Update BarcodeWriter instantiation for compatibility

if net8.0 runtime errors Updated instantiation of ZXing.BarcodeWriter in AztecCode.cs, BarCode128.cs, BarCode39.cs, BarCodeEAN8.cs, and QrCode.cs to use different types based on compilation symbols. For DRAWINGCOMPAT, replaced with ZXing.SkiaSharp.BarcodeWriter. For NETSTANDARD2_0 or NET5_0_OR_GREATER, replaced with ZXing.Windows.Compatibility.BarcodeWriter. Default remains ZXing.BarcodeWriter. These changes ensure compatibility with different frameworks and improve barcode writing for various image formats.
majorsilence · Jan 12, 2025 · bf3f7de · bf3f7de
1 parent 941e207
commit bf3f7de
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/RdlCri/AztecCode.cs b/RdlCri/AztecCode.cs
@@ -38,9 +38,9 @@ void ICustomReportItem.DrawImage(ref Drawing.Bitmap bm)
         internal void DrawImage(ref Drawing.Bitmap bm, string aztecCode)
         {
 #if DRAWINGCOMPAT
-            var writer = new ZXing.BarcodeWriter<SkiaSharp.SKBitmap>();
+            var writer = new ZXing.SkiaSharp.BarcodeWriter();
 #elif NETSTANDARD2_0 || NET5_0_OR_GREATER
-            var writer = new ZXing.BarcodeWriter<Drawing.Bitmap>();
+            var writer = new ZXing.Windows.Compatibility.BarcodeWriter();
 #else
             var writer = new ZXing.BarcodeWriter();
 #endif

diff --git a/RdlCri/BarCode128.cs b/RdlCri/BarCode128.cs
@@ -43,9 +43,9 @@ public void DrawDesignerImage(ref Drawing.Bitmap bm)
 		public void DrawImage(ref Drawing.Bitmap bm, string code128)
 		{
 #if DRAWINGCOMPAT
-            var writer = new ZXing.BarcodeWriter<SkiaSharp.SKBitmap>();
+            var writer = new ZXing.SkiaSharp.BarcodeWriter();
 #elif NETSTANDARD2_0 || NET5_0_OR_GREATER
-            var writer = new ZXing.BarcodeWriter<Drawing.Bitmap>();
+            var writer = new ZXing.Windows.Compatibility.BarcodeWriter();
 #else
             var writer = new ZXing.BarcodeWriter();
 #endif

diff --git a/RdlCri/BarCode39.cs b/RdlCri/BarCode39.cs
@@ -44,9 +44,9 @@ public void DrawDesignerImage(ref Drawing.Bitmap bm)
         public void DrawImage(ref Drawing.Bitmap bm, string code39)
         {
 #if DRAWINGCOMPAT
-            var writer = new ZXing.BarcodeWriter<SkiaSharp.SKBitmap>();
+            var writer = new ZXing.SkiaSharp.BarcodeWriter();
 #elif NETSTANDARD2_0 || NET5_0_OR_GREATER
-            var writer = new ZXing.BarcodeWriter<Drawing.Bitmap>();
+            var writer = new ZXing.Windows.Compatibility.BarcodeWriter();
 #else
             var writer = new ZXing.BarcodeWriter();
 #endif

diff --git a/RdlCri/BarCodeEAN8.cs b/RdlCri/BarCodeEAN8.cs
@@ -44,9 +44,9 @@ public void DrawDesignerImage(ref Bitmap bm)
         public void DrawImage(ref Bitmap bm, string code)
         {
 #if DRAWINGCOMPAT
-            var writer = new ZXing.BarcodeWriter<SkiaSharp.SKBitmap>();
+            var writer = new ZXing.SkiaSharp.BarcodeWriter();
 #elif NETSTANDARD2_0 || NET5_0_OR_GREATER
-            var writer = new ZXing.BarcodeWriter<System.Drawing.Bitmap>();
+            var writer = new ZXing.Windows.Compatibility.BarcodeWriter();
 #else
             var writer = new ZXing.BarcodeWriter();
 #endif

diff --git a/RdlCri/QrCode.cs b/RdlCri/QrCode.cs
@@ -39,9 +39,9 @@ void ICustomReportItem.DrawImage(ref Drawing.Bitmap bm)
         internal void DrawImage(ref Drawing.Bitmap bm, string qrcode)
         {
 #if DRAWINGCOMPAT
-            var writer = new ZXing.BarcodeWriter<SkiaSharp.SKBitmap>();
+            var writer = new ZXing.SkiaSharp.BarcodeWriter();
 #elif NETSTANDARD2_0 || NET5_0_OR_GREATER
-            var writer = new ZXing.BarcodeWriter<Drawing.Bitmap>();
+            var writer = new ZXing.Windows.Compatibility.BarcodeWriter();
 #else
             var writer = new ZXing.BarcodeWriter();
 #endif