[#582] ZXing.Net not compatible with Magick.Net >= 14.0.0

micjahn · Oct 24, 2024 · 808c9f2 · 808c9f2
1 parent d96cb2a
commit 808c9f2
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git a/Source/Bindings/ZXing.Magick/BarcodeWriter.Extensions.cs b/Source/Bindings/ZXing.Magick/BarcodeWriter.Extensions.cs
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-using ImageMagick;
-using ZXing.Magick.Rendering;
-
 namespace ZXing
 {
+    using ImageMagick;
+    using ImageMagick.Factories;
+    using ZXing.Magick.Rendering;
+
     /// <summary>
     /// extensions methods which are working directly on any BarcodeWriterGeneric implementation
     /// </summary>

diff --git a/Source/Bindings/ZXing.Magick/BarcodeWriter.cs b/Source/Bindings/ZXing.Magick/BarcodeWriter.cs
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-using ImageMagick;
-
-using ZXing.Magick.Rendering;
-
 namespace ZXing.Magick
 {
+    using ImageMagick;
+    using ImageMagick.Factories;
+
+    using ZXing.Magick.Rendering;
+
     /// <summary>
     /// barcode writer which creates Magick.NET Image instances
     /// </summary>

diff --git a/Source/Bindings/ZXing.Magick/MagickImageLuminanceSource.cs b/Source/Bindings/ZXing.Magick/MagickImageLuminanceSource.cs
@@ -30,7 +30,7 @@ public class MagickImageLuminanceSource : BaseLuminanceSource
         /// </summary>
         /// <param name="image"></param>
         public MagickImageLuminanceSource(IMagickImage image)
-           : base(CalculateLuminance(image), image.Width, image.Height)
+           : base(CalculateLuminance(image), (int)image.Width, (int)image.Height)
         {
         }
 

diff --git a/Source/Bindings/ZXing.Magick/Renderer/MagickImageRenderer.cs b/Source/Bindings/ZXing.Magick/Renderer/MagickImageRenderer.cs
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-using ZXing.Common;
-using ZXing.Rendering;
-
-using ImageMagick;
-
 namespace ZXing.Magick.Rendering
 {
+    using ZXing.Common;
+    using ZXing.Rendering;
+
+    using ImageMagick;
+    using ImageMagick.Factories;
+
     /// <summary>
     /// renderer class which generates a <see cref="IMagickImage{TQuantumType}"/> from a BitMatrix
     /// </summary>

diff --git a/Source/Bindings/ZXing.Magick/ZXing.Magick.csproj b/Source/Bindings/ZXing.Magick/ZXing.Magick.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>0.16.13</VersionPrefix>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <VersionPrefix>0.16.15</VersionPrefix>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>anycpu</PlatformTarget>
     <SignAssembly>true</SignAssembly>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Magick.NET.Core" Version="13.8.0" />
+    <PackageReference Include="Magick.NET.Core" Version="14.0.0" />
     <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
 

diff --git a/Source/Bindings/ZXing.Magick/project.nuspec b/Source/Bindings/ZXing.Magick/project.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 	<metadata>
-		<version>0.16.13</version>
+		<version>0.16.15</version>
 		<authors>Michael Jahn</authors>
 		<owners>Michael Jahn</owners>
 		<license type="expression">Apache-2.0</license>
@@ -19,12 +19,12 @@
 		<dependencies>
 			<group targetFramework="netstandard2.0">
 				<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
-				<dependency id="Magick.NET.Core" version="13.8.0" exclude="Build,Analyzers" />
+				<dependency id="Magick.NET.Core" version="14.0.0" exclude="Build,Analyzers" />
 				<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
 			</group>
-			<group targetFramework="netstandard2.1">
+			<group targetFramework="net8.0">
 				<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
-				<dependency id="Magick.NET.Core" version="13.8.0" exclude="Build,Analyzers" />
+				<dependency id="Magick.NET.Core" version="14.0.0" exclude="Build,Analyzers" />
 			</group>
 		</dependencies>
 	</metadata>
@@ -34,8 +34,8 @@
 		<file src="bin\Release\netstandard2.0\ZXing.Magick.dll" target="lib\netstandard2.0\ZXing.Magick.dll" />
 		<file src="bin\Release\netstandard2.0\ZXing.Magick.pdb" target="lib\netstandard2.0\ZXing.Magick.pdb" />
 		<file src="bin\Release\netstandard2.0\ZXing.Magick.xml" target="lib\netstandard2.0\ZXing.Magick.xml" />
-		<file src="bin\Release\netstandard2.1\ZXing.Magick.dll" target="lib\netstandard2.1\ZXing.Magick.dll" />
-		<file src="bin\Release\netstandard2.1\ZXing.Magick.pdb" target="lib\netstandard2.1\ZXing.Magick.pdb" />
-		<file src="bin\Release\netstandard2.1\ZXing.Magick.xml" target="lib\netstandard2.1\ZXing.Magick.xml" />
+		<file src="bin\Release\net8.0\ZXing.Magick.dll" target="lib\net8.0\ZXing.Magick.dll" />
+		<file src="bin\Release\net8.0\ZXing.Magick.pdb" target="lib\net8.0\ZXing.Magick.pdb" />
+		<file src="bin\Release\net8.0\ZXing.Magick.xml" target="lib\net8.0\ZXing.Magick.xml" />
 	</files>
 </package>