Merge pull request #21 from Didstopia/development

Preparing for a new release
Didstopia · Mar 22, 2018 · df0ee64 · df0ee64
2 parents ee30100 + d21b088
commit df0ee64
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/Didstopia.PDFSharp.Tests/Didstopia.PDFSharp.Tests.csproj b/Didstopia.PDFSharp.Tests/Didstopia.PDFSharp.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <ReleaseVersion>1.0.0-beta5</ReleaseVersion>
+    <ReleaseVersion>1.0.0-beta6</ReleaseVersion>
     <Description>A .NET Standard 2.0 library for reading, writing and editing PDF files.
 
 This is a modified fork based on several OSS projects. For more information see the license.</Description>
@@ -19,7 +19,7 @@ This is a modified fork based on several OSS projects. For more information see
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0002" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Didstopia.PDFSharp.sln b/Didstopia.PDFSharp.sln
@@ -76,6 +76,6 @@ Global
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		description = @A .NET Standard 2.0 library for reading, writing and editing PDF files.\r\n\r\nThis is a modified fork based on several OSS projects. For more information see the license.
-		version = 1.0.0-beta5
+		version = 1.0.0-beta6
 	EndGlobalSection
 EndGlobal
diff --git a/Didstopia.PDFSharp/Didstopia.PDFSharp.csproj b/Didstopia.PDFSharp/Didstopia.PDFSharp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <ReleaseVersion>1.0.0-beta5</ReleaseVersion>
+    <ReleaseVersion>1.0.0-beta6</ReleaseVersion>
     <VersionPrefix>0.0.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>Didstopia, ststeiger, roceh, empira</Authors>

diff --git a/Didstopia.PDFSharp/Drawing/XImage.cs b/Didstopia.PDFSharp/Drawing/XImage.cs
@@ -176,17 +176,22 @@ public static XImage FromImageSource(IImageSource imageSouce)
         /// <param name="path">The path to a BMP, PNG, GIF, JPEG, TIFF, or PDF file.</param>
         public static bool ExistsFile(string path)
         {
-            // Support for "base64:" pseudo protocol is a MigraDoc feature, currently completely implemented in MigraDoc files. TODO: Does support for "base64:" make sense for PDFsharp? Probably not as PDFsharp can handle images from streams.
-            //if (path.StartsWith("base64:")) // The Image is stored in the string here, so the file exists.
-            //    return true;
-
-            if (PdfReader.TestPdfFile(path) > 0)
+			// Support for "base64:" pseudo protocol is a MigraDoc feature, currently completely implemented in MigraDoc files. TODO: Does support for "base64:" make sense for PDFsharp? Probably not as PDFsharp can handle images from streams.
+			//if (path.StartsWith("base64:")) // The Image is stored in the string here, so the file exists.
+			//    return true;
+
+			// NOTE: The old method below would try to validate the PDF file,
+            //       which has nothing to do with checking for the existence of a file
+			return File.Exists(path);
+
+            /*if (PdfReader.TestPdfFile(path) > 0)
                 return true;
+			
 #if !NETFX_CORE && !UWP && !PORTABLE
             return File.Exists(path);
 #else
             return false;
-#endif
+#endif*/
         }
 
         internal XImageState XImageState

diff --git a/Didstopia.PDFSharp/Drawing/XPdfForm.cs b/Didstopia.PDFSharp/Drawing/XPdfForm.cs
@@ -96,7 +96,7 @@ internal XPdfForm(Stream stream)
         /// <summary>
         /// Creates an XPdfForm from a file.
         /// </summary>
-        public static new XPdfForm FromFile(string path)
+        public static XPdfForm FromFile(string path)
         {
             // TODO: Same file should return same object (that's why the function is static).
             return new XPdfForm(path);