Merge pull request #223 from pj-r/adjust-outline-handling

Fix pdf outline handling

Author: ststeiger

PdfSharpCore/Pdf/PdfArray.cs

@@ -1,4 +1,4 @@
-#region PDFsharp - A .NET library for processing PDF
+#region PDFsharp - A .NET library for processing PDF
 //
 // Authors:
 //   Stefan Lange
@@ -213,7 +213,7 @@ public bool GetBoolean(int index)
                     throw new ArgumentOutOfRangeException("index", index, PSSR.IndexOutOfRange);
 
                 object obj = this[index];
-                if (obj == null)
+                if (obj == null || obj is PdfNull)
                     return false;
 
                 PdfBoolean boolean = obj as PdfBoolean;
@@ -239,7 +239,7 @@ public int GetInteger(int index)
                     throw new ArgumentOutOfRangeException("index", index, PSSR.IndexOutOfRange);
 
                 object obj = this[index];
-                if (obj == null)
+                if (obj == null || obj is PdfNull)
                     return 0;
 
                 PdfInteger integer = obj as PdfInteger;
@@ -265,7 +265,7 @@ public double GetReal(int index)
                     throw new ArgumentOutOfRangeException("index", index, PSSR.IndexOutOfRange);
 
                 object obj = this[index];
-                if (obj == null)
+                if (obj == null || obj is PdfNull)
                     return 0;
 
                 PdfReal real = obj as PdfReal;
@@ -299,7 +299,7 @@ public string GetString(int index)
                     throw new ArgumentOutOfRangeException("index", index, PSSR.IndexOutOfRange);
 
                 object obj = this[index];
-                if (obj == null)
+                if (obj == null || obj is PdfNull)
                     return String.Empty;
 
                 PdfString str = obj as PdfString;
@@ -325,7 +325,7 @@ public string GetName(int index)
                     throw new ArgumentOutOfRangeException("index", index, PSSR.IndexOutOfRange);
 
                 object obj = this[index];
-                if (obj == null)
+                if (obj == null || obj is PdfNull)
                     return String.Empty;
 
                 PdfName name = obj as PdfName;

PdfSharpCore/Pdf/PdfOutline.cs

@@ -1,4 +1,4 @@
-#region PDFsharp - A .NET library for processing PDF
+#region PDFsharp - A .NET library for processing PDF
 //
 // Authors:
 //   Stefan Lange
@@ -354,11 +354,9 @@ void Initialize()
             PdfItem a = Elements.GetValue(Keys.A);
             Debug.Assert(dest == null || a == null, "Either destination or goto action.");
 
-            PdfArray destArray = null;
             if (dest != null)
             {
-                destArray = dest as PdfArray;
-                if (destArray != null)
+                if (dest is PdfArray destArray)
                 {
                     SplitDestinationPage(destArray);
                 }
@@ -374,14 +372,20 @@ void Initialize()
                 if (action != null && action.Elements.GetName(PdfAction.Keys.S) == "/GoTo")
                 {
                     dest = action.Elements[PdfGoToAction.Keys.D];
-                    destArray = dest as PdfArray;
-                    if (destArray != null)
+                    if (dest is PdfArray destArray)
                     {
                         // Replace Action with /Dest entry.
                         Elements.Remove(Keys.A);
                         Elements.Add(Keys.Dest, destArray);
                         SplitDestinationPage(destArray);
                     }
+                    else if (dest is PdfReference detRef)
+                    {
+                      // Replace Action with /Dest entry.
+                      Elements.Remove(Keys.A);
+                      Elements.Add(Keys.Dest, detRef.Value);
+                      SplitDestinationPage((PdfArray)detRef.Value);
+                    }
                     else
                     {
                         throw new Exception("Destination Array expected.");
@@ -732,14 +736,14 @@ internal sealed class Keys : KeysBase
 
             /// <summary>
             /// (Required if the item has any descendants; must be an indirect reference)
-            ///  The first of this item’s immediate children in the outline hierarchy.
+            ///  The first of this item’s immediate children in the outline hierarchy.
             /// </summary>
             [KeyInfo(KeyType.Dictionary | KeyType.Required)]
             public const string First = "/First";
 
             /// <summary>
             /// (Required if the item has any descendants; must be an indirect reference)
-            /// The last of this item’s immediate children in the outline hierarchy.
+            /// The last of this item’s immediate children in the outline hierarchy.
             /// </summary>
             [KeyInfo(KeyType.Dictionary | KeyType.Required)]
             public const string Last = "/Last";
@@ -780,15 +784,15 @@ internal sealed class Keys : KeysBase
 
             /// <summary>
             /// (Optional; PDF 1.4) An array of three numbers in the range 0.0 to 1.0, representing the 
-            /// components in the DeviceRGB color space of the color to be used for the outline entry’s text.
+            /// components in the DeviceRGB color space of the color to be used for the outline entry’s text.
             /// Default value: [0.0 0.0 0.0].
             /// </summary>
             [KeyInfo(KeyType.Array | KeyType.Optional)]
             public const string C = "/C";
 
             /// <summary>
             /// (Optional; PDF 1.4) A set of flags specifying style characteristics for displaying the outline
-            /// item’s text. Default value: 0.
+            /// item’s text. Default value: 0.
             /// </summary>
             [KeyInfo(KeyType.Integer | KeyType.Optional)]
             public const string F = "/F";