Merge pull request #1 from Cr4zyEight/issues/122-facturx-contribution

fixed PixelFormat compiling error
ArtifexSoftware · Sep 3, 2024 · f1e9a46 · f1e9a46
2 parents db70bcd + 2b7fc20
commit f1e9a46
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 65 deletions.
diff --git a/Ghostscript.NET.DisplayTest/Ghostscript.NET.DisplayTest.csproj b/Ghostscript.NET.DisplayTest/Ghostscript.NET.DisplayTest.csproj
@@ -3,14 +3,10 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>WinExe</OutputType>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <SccProjectName></SccProjectName>
+    <SccLocalPath></SccLocalPath>
+    <SccAuxPath></SccAuxPath>
+    <SccProvider></SccProvider>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>

diff --git a/Ghostscript.NET.Samples/Ghostscript.NET.Samples.csproj b/Ghostscript.NET.Samples/Ghostscript.NET.Samples.csproj
@@ -3,14 +3,10 @@
     <TargetFramework>net6.0</TargetFramework>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>Exe</OutputType>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <SccProjectName></SccProjectName>
+    <SccLocalPath></SccLocalPath>
+    <SccAuxPath></SccAuxPath>
+    <SccProvider></SccProvider>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyTitle>Ghostscript.NET.Samples</AssemblyTitle>
     <Company>Habjan</Company>
@@ -46,7 +42,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />

diff --git a/Ghostscript.NET.Samples/Program.cs b/Ghostscript.NET.Samples/Program.cs
@@ -26,40 +26,37 @@
 
 using System;
 using System.Collections.Generic;
-using Ghostscript.NET.Viewer;
+using Ghostscript.NET;
+using Ghostscript.NET.Samples;
 
-namespace Ghostscript.NET.Samples
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Console.WriteLine("Ghostscript.NET Samples");
-
-            if (!GhostscriptVersionInfo.IsGhostscriptInstalled)
-            {
-                throw new Exception("You don't have Ghostscript installed on this machine!");
-            }
+Console.WriteLine("Ghostscript.NET Samples");
 
-            ISample sample;
-
-            //sample = new GetInkCoverageSample();
-            //sample = new ProcessorSample1();
-            //sample = new ProcessorSample2();
-            //sample = new FindInstalledGhostscriptVersionsSample();
-            //sample = new RunMultipleInstancesSample();
-            //sample = new ViewerSample();
-            sample = new RasterizerSample1();
-            //sample = new RasterizerSample2();
-            //sample = new AddWatermarkSample();
-            //sample = new DeviceUsageSample();
-            //sample = new PipedOutputSample();
-            //sample = new SendToPrinterSample();
-            //sample = new RasterizerCropSample();
+if (!GhostscriptVersionInfo.IsGhostscriptInstalled)
+{
+    throw new Exception("You don't have Ghostscript installed on this machine!");
+}
 
-            sample.Start();
+List<ISample> samples = new()
+{
+    //new GetInkCoverageSample(),
+    //new ProcessorSample1(),
+    //new ProcessorSample2(),
+    //new FindInstalledGhostscriptVersionsSample(),
+    //new RunMultipleInstancesSample(),
+    //new ViewerSample(),
+    //new RasterizerSample1(),
+    //new RasterizerSample2(),
+    //new AddWatermarkSample(),
+    //new DeviceUsageSample(),
+    //new PipedOutputSample(),
+    //new SendToPrinterSample(),
+    new FacturXWriteSample()
+};
 
-            Console.ReadLine();
-        }
-    }
+foreach (ISample sample in samples)
+{
+    sample.Start();
+    Console.WriteLine($"Sample '{sample.GetType().Name}' run successful!");
 }
+
+Console.ReadLine();
diff --git a/Ghostscript.NET.VS2022.sln b/Ghostscript.NET.VS2022.sln
@@ -0,0 +1,43 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.34928.147
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ghostscript.NET", "Ghostscript.NET\Ghostscript.NET.csproj", "{C3553CA6-33AF-4137-A5C2-73D57A8DAF43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ghostscript.NET.DisplayTest", "Ghostscript.NET.DisplayTest\Ghostscript.NET.DisplayTest.csproj", "{FDB623A5-8362-47BA-9145-781B574962DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ghostscript.NET.Samples", "Ghostscript.NET.Samples\Ghostscript.NET.Samples.csproj", "{749F1BE2-A1BE-4C89-B94B-A2F1E38E03EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ghostscript.NET.Viewer", "Ghostscript.NET.Viewer\Ghostscript.NET.Viewer.csproj", "{194189A8-3558-4D92-9573-01BCAF85912F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C3553CA6-33AF-4137-A5C2-73D57A8DAF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3553CA6-33AF-4137-A5C2-73D57A8DAF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3553CA6-33AF-4137-A5C2-73D57A8DAF43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3553CA6-33AF-4137-A5C2-73D57A8DAF43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDB623A5-8362-47BA-9145-781B574962DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDB623A5-8362-47BA-9145-781B574962DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDB623A5-8362-47BA-9145-781B574962DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDB623A5-8362-47BA-9145-781B574962DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{749F1BE2-A1BE-4C89-B94B-A2F1E38E03EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{749F1BE2-A1BE-4C89-B94B-A2F1E38E03EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{749F1BE2-A1BE-4C89-B94B-A2F1E38E03EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{749F1BE2-A1BE-4C89-B94B-A2F1E38E03EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{194189A8-3558-4D92-9573-01BCAF85912F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{194189A8-3558-4D92-9573-01BCAF85912F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{194189A8-3558-4D92-9573-01BCAF85912F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{194189A8-3558-4D92-9573-01BCAF85912F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {51B9DE2F-D521-41F2-9AC0-DB8F8587A599}
+	EndGlobalSection
+EndGlobal
diff --git a/Ghostscript.NET.Viewer/Ghostscript.NET.Viewer.csproj b/Ghostscript.NET.Viewer/Ghostscript.NET.Viewer.csproj
@@ -3,14 +3,10 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>WinExe</OutputType>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <SccProjectName></SccProjectName>
+    <SccLocalPath></SccLocalPath>
+    <SccAuxPath></SccAuxPath>
+    <SccProvider></SccProvider>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>

diff --git a/Ghostscript.NET/Ghostscript.NET.csproj b/Ghostscript.NET/Ghostscript.NET.csproj
@@ -8,14 +8,10 @@
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <BuildPackage>true</BuildPackage>
 
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <SccProjectName></SccProjectName>
+    <SccLocalPath></SccLocalPath>
+    <SccAuxPath></SccAuxPath>
+    <SccProvider></SccProvider>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -59,6 +55,7 @@
     <PackageReference Include="itext7" Version="8.0.3" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.3" />
     <PackageReference Include="OpenJDK.BigMathNET" Version="1.0.2.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
 </Project>