fixed Ghostscript v.9.50+ compatibility issues

em-josip · em-josip · commit 76b27f51ce6e · 2021-03-09T12:26:59.000Z
diff --git a/Ghostscript.NET.DisplayTest/Properties/AssemblyInfo.cs b/Ghostscript.NET.DisplayTest/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2")]
-[assembly: AssemblyFileVersion("1.2.2")]
+[assembly: AssemblyVersion("1.2.3")]
+[assembly: AssemblyFileVersion("1.2.3")]
diff --git a/Ghostscript.NET.Samples/Ghostscript.NET.Samples.csproj b/Ghostscript.NET.Samples/Ghostscript.NET.Samples.csproj
@@ -24,7 +24,7 @@
     </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
diff --git a/Ghostscript.NET.Samples/Properties/AssemblyInfo.cs b/Ghostscript.NET.Samples/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2")]
-[assembly: AssemblyFileVersion("1.2.2")]
+[assembly: AssemblyVersion("1.2.3")]
+[assembly: AssemblyFileVersion("1.2.3")]
diff --git a/Ghostscript.NET.Samples/Samples/RasterizerSample1.cs b/Ghostscript.NET.Samples/Samples/RasterizerSample1.cs
@@ -26,8 +26,6 @@
 
 // required Ghostscript.NET namespaces
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing.Imaging;
 using System.IO;
 using Ghostscript.NET.Rasterizer;
@@ -52,12 +50,14 @@ public void Sample1()
         {
             int desired_dpi = 96;
 
-            string inputPdfPath = @"E:\gss_test\test\a.pdf";
+            string inputPdfPath = @"E:\gss_test\test.pdf";
             string outputPath = @"E:\gss_test\output\";
 
+            GhostscriptVersionInfo gvi = new GhostscriptVersionInfo(@"C:\Program Files\gs\gs9.53.3\bin\gsdll64.dll");
+
             using (var rasterizer = new GhostscriptRasterizer())
             {
-                rasterizer.Open(inputPdfPath);
+                rasterizer.Open(inputPdfPath, gvi, false);
 
                 for (var pageNumber = 1; pageNumber <= rasterizer.PageCount; pageNumber++)
                 {
diff --git a/Ghostscript.NET.Viewer/Properties/AssemblyInfo.cs b/Ghostscript.NET.Viewer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2")]
-[assembly: AssemblyFileVersion("1.2.2")]
+[assembly: AssemblyVersion("1.2.3")]
+[assembly: AssemblyFileVersion("1.2.3")]
diff --git a/Ghostscript.NET/GhostscriptDisplayDeviceHandler.cs b/Ghostscript.NET/GhostscriptDisplayDeviceHandler.cs
@@ -39,21 +39,33 @@ public abstract class GhostscriptDisplayDeviceHandler
 
         internal display_callback _callback;
 
+        internal GhostscriptLibrary _gs;
+
         #endregion
 
         #region Constructor
 
         /// <summary>
         /// Initializes a new instance of the Ghostscript.NET.GhostscriptDisplayDeviceHandler class.
         /// </summary>
-        public GhostscriptDisplayDeviceHandler()
+        public GhostscriptDisplayDeviceHandler(GhostscriptLibrary gs)
         {
-            _callback = new display_callback();
-
-            _callback.size = Marshal.SizeOf(_callback);
-
-            _callback.version_minor = gdevdsp.DISPLAY_VERSION_MINOR;
-            _callback.version_major = gdevdsp.DISPLAY_VERSION_MAJOR;
+            _gs = gs;
+
+            if (gs.Revision > 951)
+            {
+                _callback = new display_callback_v3();
+                _callback.version_minor = gdevdsp.DISPLAY_VERSION_MINOR_V3;
+                _callback.version_major = gdevdsp.DISPLAY_VERSION_MAJOR_V3;
+                _callback.size = Marshal.SizeOf(typeof(display_callback_v3));
+            }
+            else
+            {
+                _callback = new display_callback();
+                _callback.version_minor = gdevdsp.DISPLAY_VERSION_MINOR_V2;
+                _callback.version_major = gdevdsp.DISPLAY_VERSION_MAJOR_V2;
+                _callback.size = Marshal.SizeOf(typeof(display_callback));
+            }
 
             _callback.display_open = new display_open_callback(display_open);
             _callback.display_preclose = new display_preclose_callback(display_preclose);
diff --git a/Ghostscript.NET/Interpreter/GhostscriptInterpreter.cs b/Ghostscript.NET/Interpreter/GhostscriptInterpreter.cs
@@ -428,5 +428,14 @@ public int LibraryRevision
 
         #endregion
 
+        #region GhostscriptLibrary
+
+        public GhostscriptLibrary GhostscriptLibrary
+        {
+            get { return _gs; }
+        }
+
+        #endregion
+
     }
 }
diff --git a/Ghostscript.NET/Properties/AssemblyInfo.cs b/Ghostscript.NET/Properties/AssemblyInfo.cs
@@ -16,5 +16,5 @@
 [assembly: Guid("5b1fe89e-e040-4b7a-9c05-478c1756b6e8")]
 
 
-[assembly: AssemblyVersion("1.2.2")]
-[assembly: AssemblyFileVersion("1.2.2")]
+[assembly: AssemblyVersion("1.2.3")]
+[assembly: AssemblyFileVersion("1.2.3")]
diff --git a/Ghostscript.NET/Viewer/FormatHandlers/GhostscriptViewerPdfFormatHandler.cs b/Ghostscript.NET/Viewer/FormatHandlers/GhostscriptViewerPdfFormatHandler.cs
@@ -120,6 +120,10 @@ public override void Open(string filePath)
             {
                 throw new GhostscriptException("IO error for file: '" + filePath + "'", ierrors.e_ioerror);
             }
+            else if (res == ierrors.e_invalidfileaccess)
+            {
+                throw new GhostscriptException("IO security problem (access control failure) for file: '" + filePath + "'", ierrors.e_ioerror);
+            }
 
             this.Execute("/FirstPage where { pop FirstPage } { 1 } ifelse");
             this.Execute("/LastPage where { pop LastPage } { pdfpagecount } ifelse");
diff --git a/Ghostscript.NET/Viewer/GhostscriptViewer.cs b/Ghostscript.NET/Viewer/GhostscriptViewer.cs
@@ -384,6 +384,10 @@ private void Open()
                         (int)DISPLAY_FORMAT_FIRSTROW.DISPLAY_BOTTOMFIRST).ToString());
 
 
+            if (_interpreter.LibraryRevision > 950)
+            {
+                args.Add("--permit-file-read=" + _filePath);
+            }
 
             args.Add("-dDOINTERPOLATE");
             args.Add("-dGridFitTT=0");
diff --git a/Ghostscript.NET/Viewer/GhostscriptViewerDisplayHandler.cs b/Ghostscript.NET/Viewer/GhostscriptViewerDisplayHandler.cs
@@ -49,7 +49,7 @@ internal class GhostscriptViewerDisplayHandler : GhostscriptDisplayDeviceHandler
 
         #region GhostscriptViewerDisplayHandler
 
-        public GhostscriptViewerDisplayHandler(GhostscriptViewer viewer)
+        public GhostscriptViewerDisplayHandler(GhostscriptViewer viewer) : base(viewer.Interpreter.GhostscriptLibrary)
         {
             _viewer = viewer;
         }
diff --git a/Ghostscript.NET/gs/gdevdsp.h.cs b/Ghostscript.NET/gs/gdevdsp.h.cs
@@ -36,8 +36,11 @@ namespace Ghostscript.NET
 
     public class gdevdsp
     {
-        public const int DISPLAY_VERSION_MAJOR = 2;
-        public const int DISPLAY_VERSION_MINOR = 0;
+        public const int DISPLAY_VERSION_MAJOR_V3 = 3;
+        public const int DISPLAY_VERSION_MINOR_V3 = 0;
+
+        public const int DISPLAY_VERSION_MAJOR_V2 = 2;
+        public const int DISPLAY_VERSION_MINOR_V2 = 0;
 
         public const long DISPLAY_COLORS_MASK = 0x8000fL;
         public const long DISPLAY_ALPHA_MASK = 0x00f0L;
@@ -173,6 +176,62 @@ public enum DISPLAY_FORMAT_ROW_ALIGN
 
     #endregion
 
+    #region display_callback_v3
+
+    /// <summary>
+    /// Display device callback structure.
+    /// 
+    /// Note that for Windows, the display callback functions are
+    /// cdecl, not stdcall.  This differs from those in iapi.h.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public class display_callback_v3 : display_callback
+    {
+        /// <summary>
+        /// Added in V3 */
+        /// If non NULL, then this gives the callback provider a chance to
+        /// a) be informed of and b) control the bandheight used by the
+        /// display device. If a call to allocate the page mode bitmap fails
+        /// (either an internal allocation or a display_memalloc call), then
+        /// Ghostscript will look for the presence of a
+        /// display_rectangle_request callback. If it exists, then it will
+        /// attempt to use retangle request mode.
+        /// 
+        /// As part of this, it will pick an appropriate bandheight. If
+        /// this callback exists, it will be called so the callback provider
+        /// can know (and, optionally, tweak) the bandheight to be used.
+        /// This is purely for performance. The callback should only ever
+        /// *reduce* the bandheight given here.
+        /// 
+        /// Return the adjusted bandheight (or 0 for no change).
+        /// </summary>
+        public display_adjust_band_height display_adjust_band_height;
+
+        /// <summary>
+        /// Ask the callback for a rectangle to render (and a block to render
+        /// it in). Each subsequent call tells the caller that any previous
+        /// call has finished. To signal 'no more rectangles' return with
+        /// *w or *h = 0.
+        /// 
+        /// On entry: *raster and *plane_raster are set to the standard
+        ///   values. All other values are undefined.
+        /// On return: *memory should point to a block of memory to use.
+        ///   Pixel (*ox,*oy) is the first pixel represented in that block.
+        ///   *raster = the number of bytes difference between the address of
+        ///   component 0 of Pixel(*ox,*oy) and the address of component 0 of
+        ///   Pixel(*ox,1+*oy).
+        ///   *plane_raster = the number of bytes difference between the
+        ///   address of component 0 of Pixel(*ox,*oy) and the address of
+        ///   component 1 of Pixel(*ox,*oy), if in planar mode, 0 otherwise.
+        ///   *x, *y, *w, *h = rectangle requested within that memory block.
+        /// </summary>
+        public display_rectangle_request display_rectangle_request;
+
+    }
+
+    #endregion
+
+
     #region display_callback
 
     /// <summary>
@@ -182,7 +241,7 @@ public enum DISPLAY_FORMAT_ROW_ALIGN
     /// cdecl, not stdcall.  This differs from those in iapi.h.
     /// </summary>
     [StructLayout(LayoutKind.Sequential)]
-    public struct display_callback
+    public class display_callback
     {
         /// <summary>
         /// Size of this structure
@@ -289,5 +348,4 @@ public struct display_callback
     }
 
     #endregion
-
 }
diff --git a/Ghostscript.NET/gs/gdevdsp.h.delegates.cs b/Ghostscript.NET/gs/gdevdsp.h.delegates.cs
@@ -59,6 +59,15 @@ namespace Ghostscript.NET
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate int display_memfree_callback(IntPtr handle, IntPtr device, IntPtr mem);
 
+    // added in v2
     [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
     public delegate int display_separation_callback(IntPtr handle, IntPtr device, Int32 component, String component_name, UInt16 c, UInt16 m, UInt16 y, UInt16 k);
+
+    // added in v3
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate int display_adjust_band_height(IntPtr handle, IntPtr device, Int32 bandheight);
+
+    // added in v3
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate int display_rectangle_request(IntPtr handle, IntPtr device, IntPtr memory, Int32 ox, Int32 oy, Int32 raster, Int32 plane_raster, Int32 x, Int32 y, Int32 w, Int32 h);
 }
diff --git a/README.md b/README.md
@@ -15,9 +15,11 @@
  * allows you to run multiple Ghostscript instances simultaneously within a single process.
  * compatible with 32-bit and 64-bit Ghostscript native library.
 
+**Latest changes - 2021-03-09 - v.1.2.3.**
+* fixed GhostscriptRasterizer/GhostscriptViewer and Ghostscript v.9.50+ compatibility issues.
 
 **Latest changes - 2021-02-04 - v.1.2.2.**
- * fixed Ghostscript 9.26 + (all later versions) compatibility.
+ * fixed Ghostscript v.9.26 + (all later versions) compatibility.
  * fixed problem when opening path/file that contains non ASCII characters.
  * fixed "Arithmetic operation resulted in an overflow" when using multithread instance.
  * changed Y and Y DPI settings to match GhostscriptViewer.

Original file line number	Diff line number	Diff line change
`@@ -428,5 +428,14 @@ public int LibraryRevision`
`428`	`428`
`429`	`429`	`#endregion`
`430`	`430`
	`431`	`+ #region GhostscriptLibrary`
	`432`	`+`
	`433`	`+ public GhostscriptLibrary GhostscriptLibrary`
	`434`	`+ {`
	`435`	`+ get { return _gs; }`
	`436`	`+ }`
	`437`	`+`
	`438`	`+ #endregion`
	`439`	`+`
`431`	`440`	`}`
`432`	`441`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,10 @@ public override void Open(string filePath)`
`120`	`120`	`{`
`121`	`121`	`throw new GhostscriptException("IO error for file: '" + filePath + "'", ierrors.e_ioerror);`
`122`	`122`	`}`
	`123`	`+ else if (res == ierrors.e_invalidfileaccess)`
	`124`	`+ {`
	`125`	`+ throw new GhostscriptException("IO security problem (access control failure) for file: '" + filePath + "'", ierrors.e_ioerror);`
	`126`	`+ }`
`123`	`127`
`124`	`128`	`this.Execute("/FirstPage where { pop FirstPage } { 1 } ifelse");`
`125`	`129`	`this.Execute("/LastPage where { pop LastPage } { pdfpagecount } ifelse");`