From 6f90055c214fdd26ef1a7aa9e22fb4f5742a2395 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Tue, 25 Dec 2018 16:28:33 +0000
Subject: [PATCH 01/31] remove functions marked as obsolete.

---
 DeathSocket/GridPainter.fs | 114 +------------------------------------
 1 file changed, 1 insertion(+), 113 deletions(-)

diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index e961c71..e55197a 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -85,64 +85,6 @@ namespace DeathSocket
         let determineVerticalLines (width: int) (height: int) (columns: int) =
             createVerticalLines width height columns
 
-        /// <summary>
-        /// Uses the information included in spec to create a gridded image.
-        /// It then asynchronously saves it. Uses .jpg or .png formats only.
-        /// Use this function when targeting .Net/Mono).
-        /// </summary>
-        /// <param name="spec">
-        /// The specification used to generate the new gridded image
-        /// </param>
-        /// <exeption cref="System.IO.FileNotFoundException">
-        /// If the file the grid is being applied to cannot be found,
-        /// a FileNotFoundException will be thrown.
-        /// </exception>
-        /// <remarks
-        /// Make sure the image, which is having the overlay added to it,
-        /// is not in use or needed by another program/process.
-        /// This is because it is locked whilst in this function.
-        /// </remarks>
-        [<Obsolete("Method is deprecated, use applyGridToImage instead.")>]
-        let applyBrushSpecGridAsync (spec: BrushSpec) =
-            async {
-                try
-                    validateFilePath spec.originalPath |> ignore
-                    validateSaveFileType spec.savePath |> ignore
-                    drawBrushSpecGrid spec |> ignore
-                with
-                | :? FileNotFoundException as ex ->
-                        printfn "File could not be found at %s" ex.Message
-            }
-
-        /// <summary>
-        /// Uses the information included in spec to create a gridded image. It
-        /// then asynchronously saves it. Uses .jpg or .png formats only.
-        /// Use this function when targeting .Net/Mono).
-        /// </summary>
-        /// <param name="spec">
-        /// The specification used to generate the gridded image.
-        /// </param>
-        /// <exeption cref="System.IO.FileNotFoundException">
-        /// If the file the grid is being applied to cannot be found,
-        /// a FileNotFoundException will be thrown.
-        /// </exception>
-        /// <remarks
-        /// Make sure the image, which is having the overlay added to it,
-        /// is not in use or needed by another program/process.
-        /// This is because it is locked whilst in this function.
-        /// </remarks>
-        [<Obsolete("Method is deprecated, use applyGridToImage instead.")>]
-        let applyRGBAGridAsync (spec: RGBASpec) =
-            async {
-                try
-                    validateFilePath spec.originalPath |> ignore
-                    validateSaveFileType spec.savePath |> ignore
-                    drawRGBAGrid spec
-                with
-                | :? FileNotFoundException as ex ->
-                        printfn "File could not be found at %s" ex.Message
-            }
-
         /// <summary>
         /// Creates a Sytsem.Drawing SolidBrush from the individual RGBA values.
         /// Use this function when targeting .Net/Mono).
@@ -202,58 +144,4 @@ namespace DeathSocket
         /// <remarks>This function is part of the SkiaSharp functions provided
         /// by Death Socket.</remarks>
         let determineSKVerticalLines (width: int) (height: int) (columns: int) =
-            createSKVerticalLines width height columns
-
-        /// <summary>
-        /// Uses the information included in spec to create a gridded image.
-        /// It then asynchronously saves it. Uses .jpg or .png formats only.
-        /// Use this function when targeting Xamarin/UWP/.Net Core.
-        /// </summary>
-        /// <param name="spec">
-        /// Used to note the orignial file's location and the
-        /// changes the user would like to make to it (including the save
-        /// location of the modified version).
-        /// </param>
-        /// <remarks>
-        /// Make sure the image, which is having the overlay added to it,
-        /// is not in use or needed by another program/process.
-        /// This is because it is locked whilst in this function.
-        /// </remarks>
-        [<Obsolete("Method is deprecated, use applyGridToImage instead.")>]
-        let applySkiaGridAsync (spec: SkiaSpec) =
-            async {
-                try
-                    validateFilePath spec.originalPath |> ignore
-                    validateSaveFileType spec.savePath |> ignore
-                    drawSkiaGrid spec
-                with
-                | :? FileNotFoundException as ex ->
-                    printfn "File could not be found at %s" ex.Message
-            }
-
-        /// <summary>
-        /// Uses the information included in spec to create a gridded image.
-        /// It then asynchronously saves it. Uses .jpg or .png formats only.
-        /// Use this function when targeting Xamarin/UWP/.Net Core.
-        /// </summary>
-        /// <param name="spec">
-        /// Used to note the orignial file's location and the
-        /// changes the user would like to make to it (including the save
-        /// location of the modified version).
-        /// </param>
-        /// <remarks>
-        /// Make sure the image, which is having the overlay added to it,
-        /// is not in use or needed by another program/process.
-        /// This is because it is locked whilst in this function.
-        /// </remarks>
-        [<Obsolete("Method is deprecated, use applyGridToImage instead.")>]
-        let applySkiaRGBGridAsync (spec: SkiaRGBSpec) =
-            async {
-                try
-                    validateFilePath spec.originalPath |> ignore
-                    validateSaveFileType spec.savePath |> ignore
-                    drawSkiaRGBGrid spec
-                with
-                | :? FileNotFoundException as ex ->
-                    printfn "File could not be found at %s" ex.Message
-            }
\ No newline at end of file
+            createSKVerticalLines width height columns
\ No newline at end of file

From 941577ec80e4dba2d3a06206c05f2f9af355ace4 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sat, 29 Dec 2018 11:45:22 +0000
Subject: [PATCH 02/31] add function to scale (pen) line thickness.

---
 DeathSocket/GridPainter.fs | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index e55197a..198b44c 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -15,7 +15,6 @@ namespace DeathSocket
 
         open Validation
         open ImageServices
-        open System
 
         /// <summary>
         /// Uses the information included in spec to create a gridded image.
@@ -30,7 +29,7 @@ namespace DeathSocket
         /// If the file the grid is being applied to cannot be found,
         /// a FileNotFoundException will be thrown.
         /// </exception>
-        /// <remarks
+        /// <remarks>
         /// Make sure the image, which is having the overlay added to it,
         /// is not in use or needed by another program/process.
         /// This is because it is locked whilst in this function.
@@ -54,7 +53,33 @@ namespace DeathSocket
                 with
                 | :? FileNotFoundException as ex ->
                     printfn "File could not be found at %s" ex.Message
-            } 
+            }
+
+        // NOT TESTED
+
+        /// <summary>
+        /// Takes an image and determines the current scale it is viewed at
+        /// (E.G. scaled preview in image viewer). The (pen) line thickness is
+        /// then updated to match this preview scale and can be used when
+        /// drawing a grid line on the scaled preview of the image.
+        /// </summary>
+        /// <param name="previewWidth">
+        /// The width of the image when previewed (I.E. in a GUI).
+        /// </param>
+        /// <param name="actualWidth">
+        /// The width of the actual image.
+        /// </param>
+        /// <param name="lineThickness">
+        /// The thickness of the pen used to draw the grid line.
+        /// </param>
+        /// <remarks>
+        /// You should find you only need this function when dealing with
+        /// previewing an image in a GUI. Another thing to note is the
+        /// SkiaSharp based functions already scale the grid lines for you. So,
+        /// you should not need to use this function when using them.
+        /// </remarks>
+        let scaleLineThickness (previewWidth: double) (actualWidth: double) (lineThickness: double) =
+            lineThickness / (previewWidth / actualWidth)
 
         // System.Drawing Functions
         // ========================================================================

From f06451572f8d446220d9023a64331cfef5fc64be Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sat, 29 Dec 2018 13:29:34 +0000
Subject: [PATCH 03/31] update NuGets and add initial code for 0.7 features.

---
 DeathSocket/DeathSocket.fsproj       |  2 +-
 DeathSocket/Domain.fs                | 10 +++++++++-
 DeathSocket/GridPainter.fs           | 30 ++++++++++++++++++----------
 DeathSocket/ImageServices.fs         | 12 ++++++++++-
 DeathSocket/ScratchPad.fsx           | 26 ++++++++++++++++++------
 DeathSocketCLI/DeathSocketCLI.fsproj |  6 +++---
 DeathSocketCLI/packages.config       |  2 +-
 TestCentre/LibraryTests.fs           |  6 +++---
 TestCentre/TestCentre.fsproj         |  6 +++---
 TestCentre/packages.config           |  2 +-
 10 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index ab27a1b..5004753 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="1.60.3" />
+    <PackageReference Include="SkiaSharp" Version="1.68.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
   </ItemGroup>
 
diff --git a/DeathSocket/Domain.fs b/DeathSocket/Domain.fs
index 5bf5a4b..5d93eef 100644
--- a/DeathSocket/Domain.fs
+++ b/DeathSocket/Domain.fs
@@ -6,6 +6,7 @@
 
         open System.Drawing
         open SkiaSharp
+        open System.Threading
 
         /// The specification used to note the orignial file's location and the
         /// changes the user would like to make to it. (including the save
@@ -102,4 +103,11 @@
             | Brush of BrushSpec
             | RGBA of RGBASpec
             | Skia of SkiaSpec
-            | SkiaRGB of SkiaRGBSpec
\ No newline at end of file
+            | SkiaRGB of SkiaRGBSpec
+
+        /// Discriminated Union representing the graphics libraries used by
+        /// Desth Socket. Useful for selecting which one you want to use.
+        /// System.Drawing for using Windows/Mono and SkiaSharp for Xamarin.
+        type ImageType =
+            | SkiaSharp of string
+            | SystemDrawing of string
\ No newline at end of file
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 198b44c..205ba7f 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -58,16 +58,16 @@ namespace DeathSocket
         // NOT TESTED
 
         /// <summary>
-        /// Takes an image and determines the current scale it is viewed at
-        /// (E.G. scaled preview in image viewer). The (pen) line thickness is
-        /// then updated to match this preview scale and can be used when
-        /// drawing a grid line on the scaled preview of the image.
+        /// Determines the current scale an image is viewed at (E.G. scaled
+        /// preview in image viewer). The (pen) line thickness is then updated
+        /// to match this preview scale and can be used when drawing a grid
+        /// line on the scaled preview of the image.
         /// </summary>
-        /// <param name="previewWidth">
-        /// The width of the image when previewed (I.E. in a GUI).
+        /// <param name="previewDimension">
+        /// The width or height of the image when previewed (I.E. in a GUI).
         /// </param>
-        /// <param name="actualWidth">
-        /// The width of the actual image.
+        /// <param name="actualDimension">
+        /// The width or height of the actual image.
         /// </param>
         /// <param name="lineThickness">
         /// The thickness of the pen used to draw the grid line.
@@ -78,8 +78,18 @@ namespace DeathSocket
         /// SkiaSharp based functions already scale the grid lines for you. So,
         /// you should not need to use this function when using them.
         /// </remarks>
-        let scaleLineThickness (previewWidth: double) (actualWidth: double) (lineThickness: double) =
-            lineThickness / (previewWidth / actualWidth)
+        let scaleLineThickness (previewDimension: double) (actualDimension: double) (lineThickness: double) =
+            lineThickness / (previewDimension / actualDimension)
+
+        // NOT TESTED.
+        let determineDimension imageType =
+            match imageType with
+            | SkiaSharp s ->
+                validateIO s |> ignore
+                determineSkiaDimensions s
+            | SystemDrawing d ->
+                validateIO d |> ignore
+                determineSystemDrawingDimensions d
 
         // System.Drawing Functions
         // ========================================================================
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index c68b950..12cba6b 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -21,7 +21,13 @@
         [| for point in 1 .. (columns - 1) ->
             [| SKPoint ((interval * (float32 point)), (float32 0))
                SKPoint ((interval * (float32 point)), (float32 height))|]|]
-    
+
+    let determineSkiaDimensions filePath =
+        use fileStream = File.Open (filePath, FileMode.Open)
+        use skStream = new SKManagedStream (fileStream)
+        use bitmap = SKBitmap.Decode (skStream)
+        (bitmap.Width, bitmap.Height)
+
     let drawSkiaGrid (spec: SkiaSpec) =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
         use skStream = new SKManagedStream (fileStream)
@@ -114,6 +120,10 @@
             [| Point ((interval * point), 0)
                Point ((interval * point), height)|]|]
 
+    let determineSystemDrawingDimensions filePath =
+        use bitmap = Bitmap.FromFile filePath
+        (bitmap.Width, bitmap.Height)
+
     (* Note on Use of Temp. File in Functions which Add A Grid Overlay
     ===========================================================================
     The temp. file is used in the functions below are there to convert images
diff --git a/DeathSocket/ScratchPad.fsx b/DeathSocket/ScratchPad.fsx
index c719984..d14be3c 100644
--- a/DeathSocket/ScratchPad.fsx
+++ b/DeathSocket/ScratchPad.fsx
@@ -1,6 +1,7 @@
 // These two paths need adjusting to match your computer.
-#r @"C:/Users/craig/.nuget/packages/skiasharp/1.60.3/lib/netstandard1.3/SkiaSharp.dll"
-#r @"C:/Users/craig/.nuget/packages/skiasharp/1.60.3/lib/net45/SkiaSharp.dll"
+#r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/lib/netstandard1.3/SkiaSharp.dll"
+// Currently not working...
+// #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.dll"
 
 #load "Domain.fs"
 #load "Validation.fs"
@@ -8,19 +9,19 @@
 #load "ImageServices.fs"
 #load "GridPainter.fs"
 
-open System.Drawing
 open System
-open DeathSocket
+open System.Drawing
+open SkiaSharp
 open Validation
 open ImageServices
-open SkiaSharp
+open DeathSocket
 
 
 (* Death Socket Scripts
 ===============================================================================
 The code in here can be use to create a gridded image without running the CLI.
 You can, also, run checks to see what Death Socket is doing when creating
-a nerw image. *)
+a new image. *)
 
 let desktop = Environment.GetFolderPath (Environment.SpecialFolder.Desktop)
 
@@ -40,6 +41,19 @@ let skVerticalLines = createSKVerticalLines 120 450 22
 (* You will need to provide the image and specify its load/save location.
 Death Socket assumes either JPEG or PNG files.*)
 
+// Not working at time of writing see "#r" comment (lines 3 and 4)
+let skiaSharpDimensions =
+    determineSkiaDimensions (desktop + "/test.jpg")
+
+let systemDrawingDimensions =
+    determineSystemDrawingDimensions (desktop + "/test.jpg")
+
+let width = double (fst systemDrawingDimensions) // skiaSharpDimensions
+let height = double (snd systemDrawingDimensions) // skiaSharpDimensions
+
+// Change the line thickness (the last parameter) to whatever you want.
+let scaledPen = GridPainter.scaleLineThickness width height 8.0
+
 // Brush Specification (uses System.Drawing)
 Brush ({ originalPath = desktop + "/test.jpg"
          savePath = desktop + "/grid.png"
diff --git a/DeathSocketCLI/DeathSocketCLI.fsproj b/DeathSocketCLI/DeathSocketCLI.fsproj
index cf3d00a..5bd45b7 100644
--- a/DeathSocketCLI/DeathSocketCLI.fsproj
+++ b/DeathSocketCLI/DeathSocketCLI.fsproj
@@ -66,7 +66,7 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -86,12 +86,12 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/DeathSocketCLI/packages.config b/DeathSocketCLI/packages.config
index d59a998..cdbffca 100644
--- a/DeathSocketCLI/packages.config
+++ b/DeathSocketCLI/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Console.Waterworks" version="0.1.0.0-alpha1" targetFramework="net471" />
   <package id="FSharp.Core" version="4.5.4" targetFramework="net471" />
-  <package id="SkiaSharp" version="1.60.3" targetFramework="net471" />
+  <package id="SkiaSharp" version="1.68.0" targetFramework="net471" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index 8e37eb1..0678e99 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -99,12 +99,12 @@
 
     module PropertyTests =
 
-        open FsCheck.Xunit
-        open DeathSocket
+        open System.IO
         open System.Drawing
+        open DeathSocket
         open DeathSocket.GridPainter
         open TestingHelpers
-        open System.IO
+        open FsCheck.Xunit
 
         (* With regards to the "saving images" tests, you should end up with
         one image left over in the SavingTestArea folder. Comment out the
diff --git a/TestCentre/TestCentre.fsproj b/TestCentre/TestCentre.fsproj
index 51259fd..cd30cdd 100644
--- a/TestCentre/TestCentre.fsproj
+++ b/TestCentre/TestCentre.fsproj
@@ -63,7 +63,7 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="SmoulderingBeachBall">
       <HintPath>..\packages\SmoulderingBeachBall.0.4.0-alpha1\lib\netstandard2.0\SmoulderingBeachBall.dll</HintPath>
@@ -110,10 +110,10 @@
     <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
     <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets'))" />
   </Target>
   <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
-  <Import Project="..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/TestCentre/packages.config b/TestCentre/packages.config
index 9c7fe0d..3a9ef92 100644
--- a/TestCentre/packages.config
+++ b/TestCentre/packages.config
@@ -3,7 +3,7 @@
   <package id="FsCheck" version="2.13.0" targetFramework="net471" />
   <package id="FsCheck.Xunit" version="2.13.0" targetFramework="net471" />
   <package id="FSharp.Core" version="4.5.4" targetFramework="net471" />
-  <package id="SkiaSharp" version="1.60.3" targetFramework="net471" />
+  <package id="SkiaSharp" version="1.68.0" targetFramework="net471" />
   <package id="SmoulderingBeachBall" version="0.4.0-alpha1" targetFramework="net471" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />

From b45f2861161386e2360ed207bb6bb8e8f9e56f85 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sat, 29 Dec 2018 13:59:13 +0000
Subject: [PATCH 04/31] =update scratchpad to use new code.

---
 DeathSocket/GridPainter.fs |  7 +++++--
 DeathSocket/ScratchPad.fsx | 25 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 205ba7f..af1d235 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -81,8 +81,11 @@ namespace DeathSocket
         let scaleLineThickness (previewDimension: double) (actualDimension: double) (lineThickness: double) =
             lineThickness / (previewDimension / actualDimension)
 
-        // NOT TESTED.
-        let determineDimension imageType =
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="imageType"></param>
+        let determineImageDimensions imageType =
             match imageType with
             | SkiaSharp s ->
                 validateIO s |> ignore
diff --git a/DeathSocket/ScratchPad.fsx b/DeathSocket/ScratchPad.fsx
index d14be3c..444f05f 100644
--- a/DeathSocket/ScratchPad.fsx
+++ b/DeathSocket/ScratchPad.fsx
@@ -1,7 +1,7 @@
-// These two paths need adjusting to match your computer.
+// These paths need adjusting to match your computer.
 #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/lib/netstandard1.3/SkiaSharp.dll"
 // Currently not working...
-// #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.dll"
+// #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/runtimes/win-x64/native/libSkiaSharp.dll"
 
 #load "Domain.fs"
 #load "Validation.fs"
@@ -41,15 +41,30 @@ let skVerticalLines = createSKVerticalLines 120 450 22
 (* You will need to provide the image and specify its load/save location.
 Death Socket assumes either JPEG or PNG files.*)
 
-// Not working at time of writing see "#r" comment (lines 3 and 4)
+// Internal function call. Not accessible outside this project.
 let skiaSharpDimensions =
     determineSkiaDimensions (desktop + "/test.jpg")
 
+// Internal function call. Not accessible outside this project.
 let systemDrawingDimensions =
     determineSystemDrawingDimensions (desktop + "/test.jpg")
 
-let width = double (fst systemDrawingDimensions) // skiaSharpDimensions
-let height = double (snd systemDrawingDimensions) // skiaSharpDimensions
+// Internal function calls. Not accessible outside this project.
+let width = double (fst skiaSharpDimensions)
+let width2 = double (fst systemDrawingDimensions)
+
+// Internal function calls. Not accessible outside this project.
+let height = double (snd skiaSharpDimensions)
+let height2 = double (snd systemDrawingDimensions)
+
+// Public function for the internal ones above.
+let dimensions =
+    //SkiaSharp (desktop + "/test.jpg")
+    SystemDrawing (desktop + "/test.jpg")
+    |> GridPainter.determineImageDimensions
+
+let width3 = fst dimensions
+let height3 = snd dimensions
 
 // Change the line thickness (the last parameter) to whatever you want.
 let scaledPen = GridPainter.scaleLineThickness width height 8.0

From 7ba0d0e9fae51694708d46b8fd8c9ee8f5260774 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sat, 29 Dec 2018 14:16:21 +0000
Subject: [PATCH 05/31] =add file IO exception to GridPainter (dimensions)
 function

---
 DeathSocket/GridPainter.fs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index af1d235..500bcdd 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -15,6 +15,7 @@ namespace DeathSocket
 
         open Validation
         open ImageServices
+        open System
 
         /// <summary>
         /// Uses the information included in spec to create a gridded image.
@@ -81,18 +82,25 @@ namespace DeathSocket
         let scaleLineThickness (previewDimension: double) (actualDimension: double) (lineThickness: double) =
             lineThickness / (previewDimension / actualDimension)
 
+        // NOT TESTED
+
         /// <summary>
         /// 
         /// </summary>
         /// <param name="imageType"></param>
         let determineImageDimensions imageType =
-            match imageType with
-            | SkiaSharp s ->
-                validateIO s |> ignore
-                determineSkiaDimensions s
-            | SystemDrawing d ->
-                validateIO d |> ignore
-                determineSystemDrawingDimensions d
+            try
+                match imageType with
+                | SkiaSharp s ->
+                    validateFilePath s |> ignore
+                    determineSkiaDimensions s
+                | SystemDrawing d ->
+                    validateFilePath d |> ignore
+                    determineSystemDrawingDimensions d
+            with
+            | :? FileNotFoundException as ex -> 
+                printfn "%s" ex.Message
+                (0,0)
 
         // System.Drawing Functions
         // ========================================================================

From 6ef653714c5c3756c3c1eef53db6db55c15f95c4 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sat, 29 Dec 2018 15:44:39 +0000
Subject: [PATCH 06/31] add XML comments and minor refactoring to GridPainter.

---
 DeathSocket/Domain.fs      |  2 +-
 DeathSocket/GridPainter.fs | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/DeathSocket/Domain.fs b/DeathSocket/Domain.fs
index 5d93eef..4bde64e 100644
--- a/DeathSocket/Domain.fs
+++ b/DeathSocket/Domain.fs
@@ -106,7 +106,7 @@
             | SkiaRGB of SkiaRGBSpec
 
         /// Discriminated Union representing the graphics libraries used by
-        /// Desth Socket. Useful for selecting which one you want to use.
+        /// Death Socket. Useful for selecting which one you want to use.
         /// System.Drawing for using Windows/Mono and SkiaSharp for Xamarin.
         type ImageType =
             | SkiaSharp of string
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 500bcdd..726e2ae 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -15,7 +15,6 @@ namespace DeathSocket
 
         open Validation
         open ImageServices
-        open System
 
         /// <summary>
         /// Uses the information included in spec to create a gridded image.
@@ -26,10 +25,6 @@ namespace DeathSocket
         /// ImageSpec is a discriminated union, consisting of a Brush, RGBA,
         /// Skia or SkiaRGB spec.
         /// </param>
-        /// <exeption cref="System.IO.FileNotFoundException">
-        /// If the file the grid is being applied to cannot be found,
-        /// a FileNotFoundException will be thrown.
-        /// </exception>
         /// <remarks>
         /// Make sure the image, which is having the overlay added to it,
         /// is not in use or needed by another program/process.
@@ -85,12 +80,22 @@ namespace DeathSocket
         // NOT TESTED
 
         /// <summary>
-        /// 
+        /// Reads an (jpg or png) image and return its width and height as a
+        /// tuple, (width * hight).
         /// </summary>
-        /// <param name="imageType"></param>
-        let determineImageDimensions imageType =
+        /// <param name="imageType">
+        /// The name of the graphics library used to read and determine the
+        /// images dimensions.
+        /// </param>
+        /// <remarks>
+        /// The image type is determined by the graphics library used. It is
+        /// called "ImageType" and not "GraphicsLibUsed" because the image/file
+        /// information is the thing this function cares about most of all. How
+        /// it is read and what library it uses it secondary.
+        ///</remarks>
+        let determineImageDimensions (iType: ImageType) =
             try
-                match imageType with
+                match iType with
                 | SkiaSharp s ->
                     validateFilePath s |> ignore
                     determineSkiaDimensions s
@@ -100,7 +105,7 @@ namespace DeathSocket
             with
             | :? FileNotFoundException as ex -> 
                 printfn "%s" ex.Message
-                (0,0)
+                reraise ()
 
         // System.Drawing Functions
         // ========================================================================
@@ -151,8 +156,8 @@ namespace DeathSocket
         /// Use this function when targeting .Net/Mono).
         /// </summary>
         /// <param name="spec">
-        ///The specification which the brush is made from.
-        ///</param>
+        /// The specification which the brush is made from.
+        /// </param>
         /// <remarks>
         /// Death Socket uses System.Drawing and not System.Media for colours
         /// and brushes.

From c6b32fcac2ffd3b4404ebc6b94db241b83dda3ec Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sat, 29 Dec 2018 19:47:31 +0000
Subject: [PATCH 07/31] add unit tests for scaleLineThickness function.

---
 DeathSocket/Domain.fs        | 13 +++++++++----
 DeathSocket/GridPainter.fs   |  4 +---
 DeathSocket/ImageServices.fs |  6 ++++++
 TestCentre/LibraryTests.fs   | 22 ++++++++++++++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/DeathSocket/Domain.fs b/DeathSocket/Domain.fs
index 4bde64e..18bc1a6 100644
--- a/DeathSocket/Domain.fs
+++ b/DeathSocket/Domain.fs
@@ -97,7 +97,7 @@
               ///The number of columns the grid will have.
               columns: int }
 
-        /// Discriminated Union representing the various specification types
+        /// A Discriminated Union representing the various specification types
         /// Death Socket can use to apply a grid to an image.
         type ImageSpec =
             | Brush of BrushSpec
@@ -105,9 +105,14 @@
             | Skia of SkiaSpec
             | SkiaRGB of SkiaRGBSpec
 
-        /// Discriminated Union representing the graphics libraries used by
-        /// Death Socket. Useful for selecting which one you want to use.
-        /// System.Drawing for using Windows/Mono and SkiaSharp for Xamarin.
+        /// A Discriminated Union representing a type of image. The type refers
+        /// to the graphics library used to read the image file.
+        /// The graphics library determines how the image is stored in memory
+        /// and the functions you can perform on it.
+        /// When creating an ImageType, pass in the file path of the image
+        /// as a string. If you are on Windows or using Mono, SystemDrawing is
+        /// the recommended choice. If you using Xamarin, SkiaSharp is the
+        /// recommended choice.
         type ImageType =
             | SkiaSharp of string
             | SystemDrawing of string
\ No newline at end of file
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 726e2ae..4b986b1 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -51,8 +51,6 @@ namespace DeathSocket
                     printfn "File could not be found at %s" ex.Message
             }
 
-        // NOT TESTED
-
         /// <summary>
         /// Determines the current scale an image is viewed at (E.G. scaled
         /// preview in image viewer). The (pen) line thickness is then updated
@@ -75,7 +73,7 @@ namespace DeathSocket
         /// you should not need to use this function when using them.
         /// </remarks>
         let scaleLineThickness (previewDimension: double) (actualDimension: double) (lineThickness: double) =
-            lineThickness / (previewDimension / actualDimension)
+            setLineThickness previewDimension actualDimension lineThickness
 
         // NOT TESTED
 
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index 12cba6b..c6408c3 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -6,6 +6,12 @@
     open DeathSocket
     open ColourServices
     open SkiaSharp
+    open System
+
+    let setLineThickness pDimension aDimension lineWidth =
+        if (pDimension <= 0.0 || aDimension <= 0.0 || lineWidth <= 0.0) then
+            raise (new DivideByZeroException ("[ERROR] The images height and width must be greater than 0."))
+        else lineWidth / (pDimension / aDimension)
 
     // SkiaSharp Functions
     // ========================================================================
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index 0678e99..8a2462d 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -111,6 +111,8 @@
         "reset" function to see all the images produced by this test. This will
         mean you will need to manually delete the images yourself if you do. *)
 
+        // scaleLineThickness
+
         [<Property>]
         let ``Can apply grid to image and save it using BrushSpec`` () =
             resetSavingTestArea ()
@@ -219,6 +221,8 @@
 
     module UnitTests =
 
+        // scaleLineThickness
+
         open TestingHelpers
         open Xunit
         open DeathSocket
@@ -254,4 +258,22 @@
         [<Fact>]
         let ``Divide By Zero Exception is thrown when 0 columns is used when determining vertical lines`` () =
             let result () = GridPainter.determineVerticalLines 100 100 0
+            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
+
+        [<Fact>]
+        let ``Divide By Zero Exception is thrown when previewDimension is set to 0 when calling scaleLineThickness`` () =
+            let result () =
+                GridPainter.scaleLineThickness 0.0 1.0 1.0
+            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
+
+        [<Fact>]
+        let ``Divide By Zero Exception is thrown when actualDimension is set to 0 when calling scaleLineThickness`` () =
+            let result () =
+                GridPainter.scaleLineThickness 1.0 0.0 1.0
+            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
+
+        [<Fact>]
+        let ``Divide By Zero Exception is thrown when lineThickness is set to 0 when calling scaleLineThickness`` () =
+            let result () =
+                GridPainter.scaleLineThickness 1.0 1.0 0.0
             Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
\ No newline at end of file

From d2c0a3bb1691c949aba36df4bf12caf5d3d7e364 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sat, 29 Dec 2018 20:13:31 +0000
Subject: [PATCH 08/31] leave comments about failing tests (since Skia
 upgrade).

---
 DeathSocket/ImageServices.fs | 2 ++
 TestCentre/LibraryTests.fs   | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index c6408c3..6b2d748 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -34,6 +34,7 @@
         use bitmap = SKBitmap.Decode (skStream)
         (bitmap.Width, bitmap.Height)
 
+    // Not working since update NuGet to 1.68
     let drawSkiaGrid (spec: SkiaSpec) =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
         use skStream = new SKManagedStream (fileStream)
@@ -75,6 +76,7 @@
     let drawSkiaRGBGrid spec =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
         use skStream = new SKManagedStream (fileStream)
+        use t = new SKBitmap ()
         use bitmap = SKBitmap.Decode (skStream)
         use shader =
             SKShader.CreateBitmap (bitmap, SKShaderTileMode.Mirror, SKShaderTileMode.Mirror)
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index 8a2462d..da33cf0 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -105,14 +105,13 @@
         open DeathSocket.GridPainter
         open TestingHelpers
         open FsCheck.Xunit
+        open SkiaSharp
 
         (* With regards to the "saving images" tests, you should end up with
         one image left over in the SavingTestArea folder. Comment out the
         "reset" function to see all the images produced by this test. This will
         mean you will need to manually delete the images yourself if you do. *)
 
-        // scaleLineThickness
-
         [<Property>]
         let ``Can apply grid to image and save it using BrushSpec`` () =
             resetSavingTestArea ()
@@ -177,6 +176,7 @@
             let result = determineVerticalLines (newNum()) (newNum()) (newNum())
             result.Length > 0
 
+        // Not working since update NuGet to 1.68
         [<Property>]
         let ``Can apply grid to image and save it using SkiaSpec`` () =
             resetSavingTestArea()
@@ -221,8 +221,6 @@
 
     module UnitTests =
 
-        // scaleLineThickness
-
         open TestingHelpers
         open Xunit
         open DeathSocket

From 6d771412b3172f98dcf38da246267e33ce98c0ca Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sun, 30 Dec 2018 14:06:28 +0000
Subject: [PATCH 09/31] downgraded SkiaSharp to 1.60.3 (bug in 1.68).

---
 DeathSocket/DeathSocket.fsproj       | 2 +-
 DeathSocket/ImageServices.fs         | 1 -
 DeathSocketCLI/DeathSocketCLI.fsproj | 6 +++---
 DeathSocketCLI/packages.config       | 2 +-
 TestCentre/LibraryTests.fs           | 4 ++--
 TestCentre/TestCentre.fsproj         | 6 +++---
 TestCentre/packages.config           | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index 5004753..ab27a1b 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="1.68.0" />
+    <PackageReference Include="SkiaSharp" Version="1.60.3" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
   </ItemGroup>
 
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index 6b2d748..2562a7d 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -76,7 +76,6 @@
     let drawSkiaRGBGrid spec =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
         use skStream = new SKManagedStream (fileStream)
-        use t = new SKBitmap ()
         use bitmap = SKBitmap.Decode (skStream)
         use shader =
             SKShader.CreateBitmap (bitmap, SKShaderTileMode.Mirror, SKShaderTileMode.Mirror)
diff --git a/DeathSocketCLI/DeathSocketCLI.fsproj b/DeathSocketCLI/DeathSocketCLI.fsproj
index 5bd45b7..cf3d00a 100644
--- a/DeathSocketCLI/DeathSocketCLI.fsproj
+++ b/DeathSocketCLI/DeathSocketCLI.fsproj
@@ -66,7 +66,7 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -86,12 +86,12 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/DeathSocketCLI/packages.config b/DeathSocketCLI/packages.config
index cdbffca..d59a998 100644
--- a/DeathSocketCLI/packages.config
+++ b/DeathSocketCLI/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Console.Waterworks" version="0.1.0.0-alpha1" targetFramework="net471" />
   <package id="FSharp.Core" version="4.5.4" targetFramework="net471" />
-  <package id="SkiaSharp" version="1.68.0" targetFramework="net471" />
+  <package id="SkiaSharp" version="1.60.3" targetFramework="net471" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index da33cf0..d6cc027 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -105,7 +105,6 @@
         open DeathSocket.GridPainter
         open TestingHelpers
         open FsCheck.Xunit
-        open SkiaSharp
 
         (* With regards to the "saving images" tests, you should end up with
         one image left over in the SavingTestArea folder. Comment out the
@@ -176,7 +175,7 @@
             let result = determineVerticalLines (newNum()) (newNum()) (newNum())
             result.Length > 0
 
-        // Not working since update NuGet to 1.68
+        // This test fails when using SkiaSharp 1.68
         [<Property>]
         let ``Can apply grid to image and save it using SkiaSpec`` () =
             resetSavingTestArea()
@@ -192,6 +191,7 @@
             |> Async.RunSynchronously
             (File.Exists sPath) = true
 
+        // This test fails when using SkiaSharp 1.68
         [<Property>]
         let ``Can apply grid to image and save it using SkiaRGBSpec`` () =
             resetSavingTestArea()
diff --git a/TestCentre/TestCentre.fsproj b/TestCentre/TestCentre.fsproj
index cd30cdd..51259fd 100644
--- a/TestCentre/TestCentre.fsproj
+++ b/TestCentre/TestCentre.fsproj
@@ -63,7 +63,7 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="SkiaSharp">
-      <HintPath>..\packages\SkiaSharp.1.68.0\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll</HintPath>
     </Reference>
     <Reference Include="SmoulderingBeachBall">
       <HintPath>..\packages\SmoulderingBeachBall.0.4.0-alpha1\lib\netstandard2.0\SmoulderingBeachBall.dll</HintPath>
@@ -110,10 +110,10 @@
     <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
     <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
-    <Error Condition="!Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets'))" />
   </Target>
   <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
-  <Import Project="..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.0\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.60.3\build\net45\SkiaSharp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/TestCentre/packages.config b/TestCentre/packages.config
index 3a9ef92..9c7fe0d 100644
--- a/TestCentre/packages.config
+++ b/TestCentre/packages.config
@@ -3,7 +3,7 @@
   <package id="FsCheck" version="2.13.0" targetFramework="net471" />
   <package id="FsCheck.Xunit" version="2.13.0" targetFramework="net471" />
   <package id="FSharp.Core" version="4.5.4" targetFramework="net471" />
-  <package id="SkiaSharp" version="1.68.0" targetFramework="net471" />
+  <package id="SkiaSharp" version="1.60.3" targetFramework="net471" />
   <package id="SmoulderingBeachBall" version="0.4.0-alpha1" targetFramework="net471" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net471" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />

From bc6532c6138658619066d30046668d736b90dbdd Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sun, 30 Dec 2018 17:35:18 +0000
Subject: [PATCH 10/31] add tests and images for GridPainter (dimensions)
 function

---
 DeathSocket/GridPainter.fs |  4 ++--
 TestCentre/LibraryTests.fs | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 4b986b1..985a6e6 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -91,9 +91,9 @@ namespace DeathSocket
         /// information is the thing this function cares about most of all. How
         /// it is read and what library it uses it secondary.
         ///</remarks>
-        let determineImageDimensions (iType: ImageType) =
+        let determineImageDimensions (imgType: ImageType) =
             try
-                match iType with
+                match imgType with
                 | SkiaSharp s ->
                     validateFilePath s |> ignore
                     determineSkiaDimensions s
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index d6cc027..bb00d34 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -227,9 +227,41 @@
         open System
         open System.IO
 
+        [<Fact>]
+        let ``Can determine image width using SkiaSharp`` () =
+            let dimensions =
+                SkiaSharp (loadLocation + "/RequiredInfo/Skia-599x336.png")
+                |> GridPainter.determineImageDimensions
+            let result () = (fst dimensions) = 599
+            Assert.True (result ())
+
+        [<Fact>]
+        let ``Can determine image height using SkiaSharp`` () =
+            let dimensions =
+                SkiaSharp (loadLocation + "/RequiredInfo/Skia-599x336.png")
+                |> GridPainter.determineImageDimensions
+            let result () = (snd dimensions) = 336
+            Assert.True (result ())
+
+        [<Fact>]
+        let ``Can determine image width using SystemDrawing`` () =
+            let dimensions =
+                SystemDrawing (loadLocation + "/RequiredInfo/SystemDrawing-338x307.png")
+                |> GridPainter.determineImageDimensions
+            let result () = (fst dimensions) = 338
+            Assert.True (result ())
+
+        [<Fact>]
+        let ``Can determine image height using SystemDrawing`` () =
+            let dimensions =
+                SystemDrawing (loadLocation + "/RequiredInfo/SystemDrawing-338x307.png")
+                |> GridPainter.determineImageDimensions
+            let result () = (snd dimensions) = 307
+            Assert.True (result ())
+
         (* This test is a pre-test test (a test for the tests if you will...).
         It is here to make sure the property test has what it needs to run.
-        If the property test fails, here is a good place to start.
+        If the property tests fails, here is a good place to start.
         See script.fs (in Test Centre) for information on populating the
         LoadingTestArea folder. *)
         [<Fact>]

From 0fed76eb90ab4bb9f18b62671024c15f8cbf9676 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sun, 30 Dec 2018 17:39:24 +0000
Subject: [PATCH 11/31] add dimension tests images

---
 .../RequiredInfo/Skia-599x336.png                | Bin 0 -> 1607 bytes
 .../RequiredInfo/SystemDrawing-338x307.png       | Bin 0 -> 1098 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 TestCentre/LoadingTestArea/RequiredInfo/Skia-599x336.png
 create mode 100644 TestCentre/LoadingTestArea/RequiredInfo/SystemDrawing-338x307.png

diff --git a/TestCentre/LoadingTestArea/RequiredInfo/Skia-599x336.png b/TestCentre/LoadingTestArea/RequiredInfo/Skia-599x336.png
new file mode 100644
index 0000000000000000000000000000000000000000..c737fa099ea1359ebbf08ac1f4b4b6a6b72c4244
GIT binary patch
literal 1607
zcmeAS@N?(olHy`uVBq!ia0y~yU<zkoU<}}31By(#7QGNiF%}28J29*~C-V}>VM%xN
zb!1@J*w6hZkrl}2EbxddW?<ku48n}Z^H-!WFtFb7ba4!+h<kg@kdZ-w=YWBUKjW^-
zw$6E$j})KZjbvbuDq>|2n550nFd>GKq2&n|gMtdsR>hr63>+s#85}&;F)%odDj5xz
n(Zn#CNk&VC!BiZkePb4gnNcnKP>~T>_%nFA`njxgN@xNA^<H#a

literal 0
HcmV?d00001

diff --git a/TestCentre/LoadingTestArea/RequiredInfo/SystemDrawing-338x307.png b/TestCentre/LoadingTestArea/RequiredInfo/SystemDrawing-338x307.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc71c54a0aa15ec69766078608667384a76452e9
GIT binary patch
literal 1098
zcmeAS@N?(olHy`uVBq!ia0y~yU<6@f4mO}ja&5N&kYX$ja(7}_cTVOdki(Mh=<CS9
zu(6-}Pa-Rj&spFRS<Jw|cNl~jkLRyQVPIgs@9E+gQW5v|iXkI|f&hc!@A8fPocr3!
zK7_GpZTL2m`+)sKCKn~v4i_$gP7wtmO$U{r29G5S6FnG}MkPjrWHd1h=4{~c%+5DJ
WW9xK*E4P68pTX1B&t;ucLK6Vuvkbog

literal 0
HcmV?d00001


From e7f6607fba1943c3bd85888b065b94864d6a30ae Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sun, 30 Dec 2018 17:42:53 +0000
Subject: [PATCH 12/31] update comments

---
 DeathSocket/Domain.fs      | 4 ++--
 DeathSocket/GridPainter.fs | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/DeathSocket/Domain.fs b/DeathSocket/Domain.fs
index 18bc1a6..1044c5b 100644
--- a/DeathSocket/Domain.fs
+++ b/DeathSocket/Domain.fs
@@ -107,8 +107,8 @@
 
         /// A Discriminated Union representing a type of image. The type refers
         /// to the graphics library used to read the image file.
-        /// The graphics library determines how the image is stored in memory
-        /// and the functions you can perform on it.
+        /// The graphics library determines how the image is read and
+        /// manipulated in memory and the functions you can perform on it.
         /// When creating an ImageType, pass in the file path of the image
         /// as a string. If you are on Windows or using Mono, SystemDrawing is
         /// the recommended choice. If you using Xamarin, SkiaSharp is the
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 985a6e6..7240dd5 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -75,8 +75,6 @@ namespace DeathSocket
         let scaleLineThickness (previewDimension: double) (actualDimension: double) (lineThickness: double) =
             setLineThickness previewDimension actualDimension lineThickness
 
-        // NOT TESTED
-
         /// <summary>
         /// Reads an (jpg or png) image and return its width and height as a
         /// tuple, (width * hight).

From 6bec79cf26b59099a3f39d38f538cd7f76e44f31 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Sun, 30 Dec 2018 17:49:54 +0000
Subject: [PATCH 13/31] leave comment about SkiaSharp 1.68 not working.

---
 DeathSocket/ImageServices.fs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index 2562a7d..d75ed25 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -34,7 +34,7 @@
         use bitmap = SKBitmap.Decode (skStream)
         (bitmap.Width, bitmap.Height)
 
-    // Not working since update NuGet to 1.68
+    // Does not work when using SkiaSharp NuGet v. 1.68
     let drawSkiaGrid (spec: SkiaSpec) =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
         use skStream = new SKManagedStream (fileStream)
@@ -73,6 +73,7 @@
         use saveStream = File.OpenWrite (spec.savePath)
         data.SaveTo (saveStream)
 
+    // Does not work when using SkiaSharp NuGet v. 1.68
     let drawSkiaRGBGrid spec =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
         use skStream = new SKManagedStream (fileStream)

From a3d9da44578146f810c7fe9f52a532f1aa9996f3 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 09:27:01 +0000
Subject: [PATCH 14/31] update comments and add 'skia stream' functionality

---
 DeathSocket/Domain.fs        |  80 ++++++++++++++++++++-----
 DeathSocket/GridPainter.fs   |  46 ++++++++++++++-
 DeathSocket/ImageServices.fs | 110 ++++++++++++++++++++++++++++++++---
 3 files changed, 212 insertions(+), 24 deletions(-)

diff --git a/DeathSocket/Domain.fs b/DeathSocket/Domain.fs
index 1044c5b..834f72c 100644
--- a/DeathSocket/Domain.fs
+++ b/DeathSocket/Domain.fs
@@ -8,9 +8,9 @@
         open SkiaSharp
         open System.Threading
 
-        /// The specification used to note the orignial file's location and the
-        /// changes the user would like to make to it. (including the save
-        /// location of the modified version). Use this spec if you are using
+        /// This specification is used to note the orignial file's location and
+        /// the changes the user would like to make to it. (including the save
+        /// location of the modified version). Use this spec. if you are using
         /// System.Drawing.
         type BrushSpec =
             { /// The original path of the image which the grid is being added to.
@@ -27,11 +27,11 @@
               ///The number of columns the grid will have.
               columns: int }
 
-        /// The specification used to note the orignial file's location and the
-        /// changes the user would like to make to it (including the save
+        /// This specification is used to note the orignial file's location and
+        /// the changes the user would like to make to it (including the save
         /// location of the modified version). This specification includes
-        /// individual RGBA values to describe the grid's colour. Use this spec.
-        /// if you are using System.Drawing.
+        /// individual RGBA values to describe the grid's colour. Use this
+        /// spec. if you are using System.Drawing.
         type RGBASpec =
             { /// The original path of the image which the grid is being added to.
               originalPath: string
@@ -53,10 +53,10 @@
               ///The number of columns the grid will have.
               columns: int }
 
-        /// The specification used to note the orignial file's location and the
-        /// changes the user would like to make to it (including the save
+        /// This specification is used to note the orignial file's location and
+        /// the changes the user would like to make to it (including the save
         /// location of the modified version). Use this spec. if you are using
-        /// the Skia-Sharp library.
+        /// the SkiaSharp library.
         type SkiaSpec =
             { /// The original path of the image which the grid is being added to.
               originalPath: string
@@ -71,11 +71,53 @@
               ///The number of columns the grid will have.
               columns: int }
 
-        /// The specification used to note the orignial file's location and the
-        /// changes the user would like to make to it (including the save
+        /// This specification is used to create a gridded image as an SKData
+        /// buffer. This spec. allows you to use one of the pre-formed
+        /// SKColors. This makes it quicker and easier to develop your code 
+        /// when compared to SkiaRGBStream. That requires setting individual
+        /// RGB values. You this spec. if you are using the SkiaSharp library.
+        type SkiaBufferSpec =
+            { /// The location of the image the grid will be applied to
+              filePath: string
+              /// The (SkiaSharp) colour used to draw the grid.
+              skColour: SKColor
+              /// The thickness of the line on the grid.
+              penWidth: float32
+              /// The number of rows the grid will have.
+              rows: int
+              ///The number of columns the grid will have.
+              columns: int }
+
+        /// This specification is used to create a gridded image as a SKData
+        /// buffer. This spec. allows you to specify the colour of the grid
+        /// using individual RGB values. This gives you greater control of your
+        /// colour choice than a SkiaStreamSpec, which requires a pre-formed
+        /// SKColor value. you this spec. if you are using the SkiaSharp
+        /// library.
+        type SkiaRGBBufferSpec =
+            { /// The location of the image the grid will be applied to
+              filePath: string
+              /// The amount of red (RGB) the grid's line will have.
+              /// (0 = no red, 255 = red turned up to eleven).
+              red: float32
+              /// The amount of green (RGB) the grid's line will have.
+              /// (0 = no green, 255 = green turned up to eleven).
+              green: float32
+              /// The amount of blue (RGB) the grid's line will have.
+              /// (0 = no blue, 255 = blue turned up to eleven).
+              blue: float32
+              /// The thickness of the line on the grid.
+              penWidth: float32
+              /// The number of rows the grid will have.
+              rows: int
+              ///The number of columns the grid will have.
+              columns: int }
+
+        /// This specification is used to note the orignial file's location and
+        /// the changes the user would like to make to it (including the save
         /// location of the modified version). This specification includes
         /// individual RGB values to describe the grid's colour. Use this spec.
-        /// if you are using the Skia-Sharp library.
+        /// if you are using the SkiaSharp library.
         type SkiaRGBSpec =
             { /// The original path of the image which the grid is being added to.
               originalPath: string
@@ -100,12 +142,20 @@
         /// A Discriminated Union representing the various specification types
         /// Death Socket can use to apply a grid to an image.
         type ImageSpec =
+            /// Spec. which uses System.Drawing and its built-in (colour) Brush.
             | Brush of BrushSpec
+            /// Spec. which uses System.Drawing and individual RGBA values.
             | RGBA of RGBASpec
+            /// Spec. which uses SkiaSharp and its built-in SKColors.
             | Skia of SkiaSpec
+            /// Spec. which uses SkiaSharp and individual RGB values.
             | SkiaRGB of SkiaRGBSpec
+            /// Spec. which uses SkiaSharp and its built-in SKColors.
+            | SkiaBuffer of SkiaBufferSpec
+            /// Spec. which uses SkiaSharp and individual RGB values.
+            | SkiaRGBBuffer of SkiaRGBBufferSpec
 
-        /// A Discriminated Union representing a type of image. The type refers
+        /// A Discriminated Union denoting a type of image. The type refers
         /// to the graphics library used to read the image file.
         /// The graphics library determines how the image is read and
         /// manipulated in memory and the functions you can perform on it.
@@ -114,5 +164,7 @@
         /// the recommended choice. If you using Xamarin, SkiaSharp is the
         /// recommended choice.
         type ImageType =
+            /// Denotes an image created using SkiaSharp
             | SkiaSharp of string
+            /// Denotes an image created using System.Drawing
             | SystemDrawing of string
\ No newline at end of file
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 7240dd5..2e8126e 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -15,10 +15,13 @@ namespace DeathSocket
 
         open Validation
         open ImageServices
+        open SkiaSharp
 
         /// <summary>
         /// Uses the information included in spec to create a gridded image.
         /// It then asynchronously saves it. Uses .jpg or .png formats only.
+        /// Please note: Any buffer-based spec's (E.G. SkiaBufferSpec) will be
+        /// ignored by this function.
         /// </summary>
         /// <param name="spec">
         /// The specification used to generate the new gridded image. The
@@ -46,6 +49,7 @@ namespace DeathSocket
                     | SkiaRGB sR ->
                         validateIO sR.originalPath sR.savePath |> ignore
                         drawSkiaRGBGrid sR
+                    | _ -> printfn "[DEATH SOCKET INFO] Inappropriate ImageSpec used here. Please use none buffer-based spec's when using this function."
                 with
                 | :? FileNotFoundException as ex ->
                     printfn "File could not be found at %s" ex.Message
@@ -104,7 +108,7 @@ namespace DeathSocket
                 reraise ()
 
         // System.Drawing Functions
-        // ========================================================================
+        // ====================================================================
 
         /// <summary>
         /// Determines the (Pen) points needed to draw the appropriate number
@@ -162,7 +166,45 @@ namespace DeathSocket
             makeBrushFromRGBASpec spec
 
         // SkiaSharp Functions
-        // ========================================================================
+        // ====================================================================
+
+        // NOT TESTED
+
+        /// <summary>
+        /// Uses the information included in spec to create a SKData buffer.
+        /// The buffer will contain a gridded image which you can then use in
+        /// any way you see fit. Accepted image formats are limited to .jpg
+        /// and .png. Please note: Any non buffer-based spec's (E.G. SkiaSpec)
+        /// will be ignored by this function.
+        /// </summary>
+        /// <param name="spec">
+        /// The specification used to generate the new SKData buffer. The
+        /// ImageSpec is a discriminated union, consisting of a SkiaBuffer and
+        /// a SkiaRGBBuffer spec.
+        /// </param>
+        /// <remarks>
+        /// Make sure the image, which is used to create the SKData buffer,
+        /// is not in use or needed by another program/process.
+        /// This is because it is locked whilst in this function.
+        /// </remarks>
+        let createSKDataAsync (spec: ImageSpec) =
+            async {
+                try
+                    match spec with
+                    | SkiaBuffer s ->
+                        validateFilePath s.filePath |> ignore
+                        return createSkiaBuffer s
+                    | SkiaRGBBuffer sR ->
+                        validateFilePath sR.filePath |> ignore
+                        return createSkiaRGBBuffer sR
+                    | _ -> 
+                        printfn "[DEATH SOCKET INFO] Inappropriate ImageSpec used here. Please use buffer-based spec's when using this function. Returning an empty SKData object."
+                        return SKData.Empty
+                with
+                | :? FileNotFoundException as ex ->
+                    printfn "%s" ex.Message |> ignore
+                    return SKData.Empty
+            }
 
         /// <summary>
         /// Determines the (SKPoints) points needed to draw the appropriate
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index d75ed25..26ca891 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -8,13 +8,25 @@
     open SkiaSharp
     open System
 
+    (* Why the Use of Repeated Code
+    ===========================================================================
+    In this file, you will find code which seems duplicated. The areas in
+    question are mostly the graphics/drawing parts of the file. Before you
+    consider refactoring this code, please note the memory footprint of this
+    library. By using "use", the objects created are diposed of properly. This,
+    also, means it is difficult to pass/return them from one function to the
+    next. Therefore, the decision made was to accept the duplicated code in
+    exchange for a smaller memory footprint. Several (large) undisposed images
+    lurking in an end users RAM can grid their computer to a halt. On top of
+    that, they have no means to make alterations to the code. *)
+
     let setLineThickness pDimension aDimension lineWidth =
         if (pDimension <= 0.0 || aDimension <= 0.0 || lineWidth <= 0.0) then
             raise (new DivideByZeroException ("[ERROR] The images height and width must be greater than 0."))
         else lineWidth / (pDimension / aDimension)
 
-    // SkiaSharp Functions
-    // ========================================================================
+    (* SkiaSharp Functions
+    ======================================================================== *)
 
     let createSKHorizontalLines width height rows =
         let interval = float32 (height / rows)
@@ -113,8 +125,87 @@
         use saveStream = File.OpenWrite (spec.savePath)
         data.SaveTo (saveStream)
 
-    // System.Drawing Functions
-    // ========================================================================
+    // Does not work when using SkiaSharp NuGet v. 1.68
+    let createSkiaBuffer (spec: SkiaBufferSpec) =
+        use fileStream = File.Open (spec.filePath, FileMode.Open)
+        use skStream = new SKManagedStream (fileStream)
+        use bitmap = SKBitmap.Decode (skStream)
+        use shader =
+            SKShader.CreateBitmap (bitmap, SKShaderTileMode.Mirror, SKShaderTileMode.Mirror)
+        let imageInfo = new SKImageInfo (bitmap.Width, bitmap.Height)
+        use surface = SKSurface.Create (imageInfo)
+        use canvas = surface.Canvas
+        canvas.Clear (SKColors.White)
+
+        use imageFill = new SKPaint ()
+        imageFill.Style <- SKPaintStyle.Fill
+        imageFill.Shader <- shader
+        canvas.DrawPaint (imageFill)
+
+        use stroke = new SKPaint ()
+        stroke.Style <- SKPaintStyle.Stroke
+        stroke.StrokeWidth <- spec.penWidth
+        stroke.Color <- spec.skColour
+        let horizontalLines =
+            createSKHorizontalLines (bitmap.Width) (bitmap.Height) (spec.rows)
+        let verticalLines =
+            createSKVerticalLines (bitmap.Width) (bitmap.Height) (spec.columns)
+        for hLine in horizontalLines do
+            canvas.DrawLine (hLine.[0], hLine.[1], stroke)
+        for vLine in verticalLines do
+            canvas.DrawLine (vLine.[0], vLine.[1], stroke)
+
+        use snapshot = surface.Snapshot ()
+        let data =
+            match Path.GetExtension (spec.filePath) with
+            | ".jpg" | ".JPG" -> snapshot.Encode (SKEncodedImageFormat.Jpeg, 100)
+            | ".png"| ".PNG" -> snapshot.Encode (SKEncodedImageFormat.Png, 100)
+            | _ -> invalidArg "filePath" "The file type must be a .jpg or .png file."
+        // (data) Buffer returned -- does not dispose automatically.
+        data
+
+    // Does not work when using SkiaSharp NuGet v. 1.68
+    let createSkiaRGBBuffer (spec: SkiaRGBBufferSpec) =
+        use fileStream = File.Open (spec.filePath, FileMode.Open)
+        use skStream = new SKManagedStream (fileStream)
+        use bitmap = SKBitmap.Decode (skStream)
+        use shader =
+            SKShader.CreateBitmap (bitmap, SKShaderTileMode.Mirror, SKShaderTileMode.Mirror)
+        let imageInfo = new SKImageInfo (bitmap.Width, bitmap.Height)
+        use surface = SKSurface.Create (imageInfo)
+        use canvas = surface.Canvas
+        canvas.Clear (SKColors.White)
+
+        use imageFill = new SKPaint ()
+        imageFill.Style <- SKPaintStyle.Fill
+        imageFill.Shader <- shader
+        canvas.DrawPaint (imageFill)
+
+        use stroke = new SKPaint ()
+        stroke.Style <- SKPaintStyle.Stroke
+        stroke.StrokeWidth <- spec.penWidth
+        stroke.Color <-
+            new SKColor ((byte spec.red), (byte spec.green), (byte spec.blue))
+        let horizontalLines =
+            createSKHorizontalLines (bitmap.Width) (bitmap.Height) (spec.rows)
+        let verticalLines =
+            createSKVerticalLines (bitmap.Width) (bitmap.Height) (spec.columns)
+        for hLine in horizontalLines do
+            canvas.DrawLine (hLine.[0], hLine.[1], stroke)
+        for vLine in verticalLines do
+            canvas.DrawLine (vLine.[0], vLine.[1], stroke)
+
+        use snapshot = surface.Snapshot ()
+        let data =
+            match Path.GetExtension (spec.filePath) with
+            | ".jpg" | ".JPG" -> snapshot.Encode (SKEncodedImageFormat.Jpeg, 100)
+            | ".png"| ".PNG" -> snapshot.Encode (SKEncodedImageFormat.Png, 100)
+            | _ -> invalidArg "filePath" "The file type must be a .jpg or .png file."
+        // (data) Buffer returned -- does not dispose automatically.
+        data
+
+    (* System.Drawing Functions
+    ======================================================================== *)
 
     let createHorizontalLines width height rows =
         let interval = height / rows
@@ -135,13 +226,15 @@
     (* Note on Use of Temp. File in Functions which Add A Grid Overlay
     ===========================================================================
     The temp. file is used in the functions below are there to convert images
-    with indexed pixels. Instead of listing them all, just assume any function
-    with a "*Spec" type as a parameter will use this "temp" file. *)
+    with indexed pixels. Instead of listing them all (future additions), just 
+    assume any function with a "*Spec" type as a parameter will use this "temp"
+    file. *)
 
     let drawBrushSpecGrid (spec: BrushSpec) =
         use original = Bitmap.FromFile spec.originalPath
         use temp = new Bitmap(original)
-        use clone = temp.Clone(new Rectangle(0, 0, temp.Width, temp.Height), PixelFormat.Format32bppArgb)
+        use clone =
+            temp.Clone(new Rectangle(0, 0, temp.Width, temp.Height), PixelFormat.Format32bppArgb)
         use graphics = Graphics.FromImage(clone)
         use pen = new Pen (spec.colour, width = spec.penWidth)
         graphics.DrawImage(original,new Rectangle(0, 0, clone.Width, clone.Height))
@@ -156,7 +249,8 @@
     let drawRGBAGrid (spec: RGBASpec) =
         use original = Bitmap.FromFile spec.originalPath
         use temp = new Bitmap (original)
-        use clone = temp.Clone (new Rectangle(0, 0, temp.Width, temp.Height), PixelFormat.Format32bppArgb)
+        use clone =
+            temp.Clone (new Rectangle(0, 0, temp.Width, temp.Height), PixelFormat.Format32bppArgb)
         use graphics = Graphics.FromImage(clone)
         use pen = new Pen ((makeBrushFromRGBASpec spec), width = spec.penWidth)
         graphics.DrawImage (original,new Rectangle(0, 0, clone.Width, clone.Height))

From 2806a22346f23dee6d17da78b358dbdea044297c Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 10:20:12 +0000
Subject: [PATCH 15/31] adjust references in scratchpad.fsx and comments.

---
 DeathSocket/GridPainter.fs | 26 ++++++++++++++++++--------
 DeathSocket/ScratchPad.fsx |  4 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 2e8126e..fdb7f25 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -119,7 +119,9 @@ namespace DeathSocket
         /// <param name="width">The width of the image.</param>
         /// <param name="height">The height of the image.</param>
         /// <param name="rows">The number of rows the grid should have.</param>
-        /// <remarks>You will probably only need these when dealing with GUI's.</remarks>
+        /// <remarks>
+        /// You will probably only need these when dealing with GUI's.
+        /// </remarks>
         let determineHorizontalLines (width: int) (height: int) (rows: int) =
             createHorizontalLines width height rows
 
@@ -131,8 +133,12 @@ namespace DeathSocket
         /// </summary>
         /// <param name="width">The width of the image.</param>
         /// <param name="height">The height of the image.</param>
-        /// <param name="columns">The number of columns the grid should have.</param>
-        /// <remarks>You will probably only need these when dealing with GUI's.</remarks>
+        /// <param name="columns">
+        /// The number of columns the grid should have.
+        /// </param>
+        /// <remarks>
+        /// You will probably only need these when dealing with GUI's.
+        /// </remarks>
         let determineVerticalLines (width: int) (height: int) (columns: int) =
             createVerticalLines width height columns
 
@@ -169,7 +175,7 @@ namespace DeathSocket
         // ====================================================================
 
         // NOT TESTED
-
+        
         /// <summary>
         /// Uses the information included in spec to create a SKData buffer.
         /// The buffer will contain a gridded image which you can then use in
@@ -215,8 +221,10 @@ namespace DeathSocket
         /// <param name="width">The width of the image.</param>
         /// <param name="height">The height of the image.</param>
         /// <param name="rows">The number of rows the grid should have.</param>
-        /// <remarks>This function is part of the SkiaSharp functions provided
-        /// by Death Socket.</remarks>
+        /// <remarks>
+        /// This function is part of the SkiaSharp functions provided
+        /// by Death Socket.
+        /// </remarks>
         let determineSKHorizontalLines (width: int) (height: int) (rows: int) =
             createSKHorizontalLines width height rows
 
@@ -230,7 +238,9 @@ namespace DeathSocket
         /// <param name="height">The height of the image.</param>
         /// <param name="columns">The number of columns the grid should have.
         /// </param>
-        /// <remarks>This function is part of the SkiaSharp functions provided
-        /// by Death Socket.</remarks>
+        /// <remarks>
+        /// This function is part of the SkiaSharp functions provided by Death
+        /// Socket.
+        /// </remarks>
         let determineSKVerticalLines (width: int) (height: int) (columns: int) =
             createSKVerticalLines width height columns
\ No newline at end of file
diff --git a/DeathSocket/ScratchPad.fsx b/DeathSocket/ScratchPad.fsx
index 444f05f..5e24201 100644
--- a/DeathSocket/ScratchPad.fsx
+++ b/DeathSocket/ScratchPad.fsx
@@ -1,7 +1,7 @@
 // These paths need adjusting to match your computer.
-#r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/lib/netstandard1.3/SkiaSharp.dll"
+#r @"C:/Users/craig/.nuget/packages/skiasharp/1.60.3/lib/netstandard1.3/SkiaSharp.dll"
 // Currently not working...
-// #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/runtimes/win-x64/native/libSkiaSharp.dll"
+//#r @"C:/Users/craig/.nuget/packages/skiasharp/1.60.3/runtimes/win-x64/native/libSkiaSharp.dll"
 
 #load "Domain.fs"
 #load "Validation.fs"

From 61bef0a01e64db68e98138d8149ffefdc49162fe Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 11:14:29 +0000
Subject: [PATCH 16/31] add unit tests for invalid input (createSkiaDataAsync)

---
 DeathSocket/ColourServices.fs |  2 -
 DeathSocket/GridPainter.fs    |  8 +--
 DeathSocket/ImageServices.fs  |  4 +-
 TestCentre/LibraryTests.fs    | 91 +++++++++++++++++++++++++++++++++--
 4 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/DeathSocket/ColourServices.fs b/DeathSocket/ColourServices.fs
index 4fba086..1226438 100644
--- a/DeathSocket/ColourServices.fs
+++ b/DeathSocket/ColourServices.fs
@@ -2,8 +2,6 @@
 
     open System.Drawing
     open DeathSocket.Domain
-    open System
-    open SkiaSharp
 
     let makeBrushFromRGBASpec (spec: RGBASpec) =
         let a = int spec.alpha
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index fdb7f25..b1df029 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -107,8 +107,8 @@ namespace DeathSocket
                 printfn "%s" ex.Message
                 reraise ()
 
-        // System.Drawing Functions
-        // ====================================================================
+        (* System.Drawing Functions
+        ==================================================================== *)
 
         /// <summary>
         /// Determines the (Pen) points needed to draw the appropriate number
@@ -171,8 +171,8 @@ namespace DeathSocket
         let makeSolidBrushFromRGBASpec (spec: RGBASpec) =
             makeBrushFromRGBASpec spec
 
-        // SkiaSharp Functions
-        // ====================================================================
+        (* SkiaSharp Functions
+        ==================================================================== *)
 
         // NOT TESTED
         
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index 26ca891..2033b4d 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -8,7 +8,7 @@
     open SkiaSharp
     open System
 
-    (* Why the Use of Repeated Code
+    (* Note on the Use of Repeated Code
     ===========================================================================
     In this file, you will find code which seems duplicated. The areas in
     question are mostly the graphics/drawing parts of the file. Before you
@@ -17,7 +17,7 @@
     also, means it is difficult to pass/return them from one function to the
     next. Therefore, the decision made was to accept the duplicated code in
     exchange for a smaller memory footprint. Several (large) undisposed images
-    lurking in an end users RAM can grid their computer to a halt. On top of
+    lurking in an end users RAM can grind their computer to a halt. On top of
     that, they have no means to make alterations to the code. *)
 
     let setLineThickness pDimension aDimension lineWidth =
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index bb00d34..b0a3de0 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -221,11 +221,96 @@
 
     module UnitTests =
 
-        open TestingHelpers
-        open Xunit
-        open DeathSocket
         open System
         open System.IO
+        open System.Drawing
+        open Xunit
+        open DeathSocket
+        open SkiaSharp
+        open TestingHelpers
+
+        [<Fact>]
+        let ``An empty SKData object is returned when createSKDataAsync cannot find file when using SkiaBuffer`` () =
+            let result =
+                SkiaBuffer ({ filePath = "invalid-file-path"
+                              penWidth = float32 1
+                              skColour = SKColors.Empty
+                              rows = 1
+                              columns = 1 })
+                |> GridPainter.createSKDataAsync
+                |> Async.RunSynchronously
+            Assert.Equal(SKData.Empty, result)
+
+        [<Fact>]
+        let ``An empty SKData object is returned when createSKDataAsync cannot find file when using SkiaRGBBuffer`` () =
+            let result =
+                SkiaRGBBuffer ({ filePath = "invalid-file-path"
+                                 penWidth = float32 1
+                                 red = float32 1
+                                 green = float32 1
+                                 blue = float32 1
+                                 rows = 1
+                                 columns = 1 })
+                |> GridPainter.createSKDataAsync
+                |> Async.RunSynchronously
+            Assert.Equal(SKData.Empty, result)
+
+        [<Fact>]
+        let ``An empty SKData object is returned when calling createSKDataAsync with SkiaRGB`` () =
+            let result =
+                SkiaRGB ({ originalPath = "not needed"
+                           savePath= "not needed"
+                           red = float32 1
+                           green = float32 1
+                           blue = float32 1
+                           penWidth = float32 1
+                           rows = 1
+                           columns = 1})
+                |> GridPainter.createSKDataAsync
+                |> Async.RunSynchronously
+            Assert.Equal(SKData.Empty, result)
+
+        [<Fact>]
+        let ``An empty SKData object is returned when calling createSKDataAsync with Skia`` () =
+            let result =
+                Skia ({ originalPath = "not needed"
+                        savePath= "not needed"
+                        skColour = SKColors.Empty
+                        penWidth = float32 1
+                        rows = 1
+                        columns = 1 })
+                |> GridPainter.createSKDataAsync
+                |> Async.RunSynchronously
+            Assert.Equal(SKData.Empty, result)
+
+        [<Fact>]
+        let ``An empty SKData object is returned when calling createSKDataAsync with Brush`` () =
+            let result =
+                Brush ({ originalPath = "not needed"
+                         savePath= "not needed"
+                         colour = Brushes.AliceBlue
+                         penWidth = float32 1
+                         rows = 1
+                         columns = 1 })
+                |> GridPainter.createSKDataAsync
+                |> Async.RunSynchronously
+            Assert.Equal(SKData.Empty, result)
+
+        [<Fact>]
+        let ``An empty SKData object is returned when calling createSKDataAsync with RGBA`` () =
+            let result =
+                RGBA ({ originalPath = "not needed"
+                        savePath= "not needed"
+                        red = float 1
+                        green = float 1
+                        blue = float 1
+                        alpha = float 1
+                        penWidth = float32 1
+                        rows = 1
+                        columns = 1 })
+                |> GridPainter.createSKDataAsync
+                |> Async.RunSynchronously
+            Assert.Equal(SKData.Empty, result)
 
         [<Fact>]
         let ``Can determine image width using SkiaSharp`` () =

From 591b46a18843aee46f4e7b60d38e12af8211dbd8 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 11:31:54 +0000
Subject: [PATCH 17/31] add test for checking SKData with SkiaBuffer.

---
 TestCentre/LibraryTests.fs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index b0a3de0..ee19b4a 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -34,6 +34,9 @@
         let loadLocation = __SOURCE_DIRECTORY__ + "/LoadingTestArea"
         let saveLocation  = __SOURCE_DIRECTORY__ + "/SavingTestArea"
 
+        let fixedSkiaImagePath =
+            (loadLocation + "/RequiredInfo/Skia-599x336.png")
+
         let allColours =
             let properties =
                 typeof<Brushes>.GetProperties
@@ -105,6 +108,7 @@
         open DeathSocket.GridPainter
         open TestingHelpers
         open FsCheck.Xunit
+        open SkiaSharp
 
         (* With regards to the "saving images" tests, you should end up with
         one image left over in the SavingTestArea folder. Comment out the
@@ -219,6 +223,18 @@
             let result = determineSKVerticalLines (newNum()) (newNum()) (newNum())
             result.Length > 0
 
+        [<Property>]
+        let ``Can create a populated SKData buffer when calling createSKDataAsync with SkiaBuffer`` () =
+            let result () =
+                SkiaBuffer ({ filePath = fixedSkiaImagePath
+                              skColour = randomSKColour ()
+                              penWidth = float32 (newPenWidth())
+                              rows = newNum ()
+                              columns = newNum () })
+                |> createSKDataAsync
+                |> Async.RunSynchronously
+            (result ()).IsEmpty = false
+
     module UnitTests =
 
         open System

From e1e089a559e7162b01f8ccce9a79656c085bb373 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 11:34:41 +0000
Subject: [PATCH 18/31] add test for checking SKData with SkiaRGBBuffer.

---
 TestCentre/LibraryTests.fs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index ee19b4a..a3bdb4f 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -235,6 +235,20 @@
                 |> Async.RunSynchronously
             (result ()).IsEmpty = false
 
+        [<Property>]
+        let ``Can create a populated SKData buffer when calling createSKDataAsync with SkiaRGBBuffer`` () =
+            let result () =
+                SkiaRGBBuffer ({ filePath = fixedSkiaImagePath
+                                 red = float32 (newNum())
+                                 green = float32 (newNum())
+                                 blue = float32 (newNum())
+                                 penWidth = float32 (newPenWidth())
+                                 rows = newNum ()
+                                 columns = newNum () })
+                |> createSKDataAsync
+                |> Async.RunSynchronously
+            (result ()).IsEmpty = false
+
     module UnitTests =
 
         open System

From 9652e6f44473d67cd654edffd72c5a8669320bb7 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 11:38:24 +0000
Subject: [PATCH 19/31] refactor tests -- use programmed image paths.

---
 TestCentre/LibraryTests.fs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index a3bdb4f..6c44075 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -36,6 +36,8 @@
 
         let fixedSkiaImagePath =
             (loadLocation + "/RequiredInfo/Skia-599x336.png")
+        let fixedSystemDrawingImagePath = 
+            (loadLocation + "/RequiredInfo/SystemDrawing-338x307.png")
 
         let allColours =
             let properties =
@@ -345,7 +347,7 @@
         [<Fact>]
         let ``Can determine image width using SkiaSharp`` () =
             let dimensions =
-                SkiaSharp (loadLocation + "/RequiredInfo/Skia-599x336.png")
+                SkiaSharp (fixedSkiaImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (fst dimensions) = 599
             Assert.True (result ())
@@ -353,7 +355,7 @@
         [<Fact>]
         let ``Can determine image height using SkiaSharp`` () =
             let dimensions =
-                SkiaSharp (loadLocation + "/RequiredInfo/Skia-599x336.png")
+                SkiaSharp (fixedSkiaImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (snd dimensions) = 336
             Assert.True (result ())
@@ -361,7 +363,7 @@
         [<Fact>]
         let ``Can determine image width using SystemDrawing`` () =
             let dimensions =
-                SystemDrawing (loadLocation + "/RequiredInfo/SystemDrawing-338x307.png")
+                SystemDrawing (fixedSystemDrawingImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (fst dimensions) = 338
             Assert.True (result ())
@@ -369,7 +371,7 @@
         [<Fact>]
         let ``Can determine image height using SystemDrawing`` () =
             let dimensions =
-                SystemDrawing (loadLocation + "/RequiredInfo/SystemDrawing-338x307.png")
+                SystemDrawing (fixedSystemDrawingImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (snd dimensions) = 307
             Assert.True (result ())

From 02a7b3b3d8c31af521971ed1ba2475f9f8fc1869 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 11:53:07 +0000
Subject: [PATCH 20/31] remove unused code.

---
 DeathSocket/GridPainter.fs | 2 --
 TestCentre/LibraryTests.fs | 1 -
 2 files changed, 3 deletions(-)

diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index b1df029..59a68b2 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -174,8 +174,6 @@ namespace DeathSocket
         (* SkiaSharp Functions
         ==================================================================== *)
 
-        // NOT TESTED
-        
         /// <summary>
         /// Uses the information included in spec to create a SKData buffer.
         /// The buffer will contain a gridded image which you can then use in
diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index 6c44075..3b124dd 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -110,7 +110,6 @@
         open DeathSocket.GridPainter
         open TestingHelpers
         open FsCheck.Xunit
-        open SkiaSharp
 
         (* With regards to the "saving images" tests, you should end up with
         one image left over in the SavingTestArea folder. Comment out the

From f10a22945e7835e808a3016fbc8ff1c7611459fe Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 12:11:45 +0000
Subject: [PATCH 21/31] update assembly info. to 0.7

---
 DeathSocket/DeathSocket.fsproj | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index ab27a1b..6500931 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>0.6-alpha</Version>
+    <Version>0.7-alpha</Version>
     <Authors>Craig Oates</Authors>
     <Product>Death Socket</Product>
     <Description>A .Net Standard library which you can plug into to project and draw gridded overlays onto you images. Please note, Death Socket uses System.Drawing brushes and not System.Media brushes. For futher information, visit the projects repository on GitHub. To get a sense of what Death Socket can do, there is a console program you can download seperately (on GitHub).</Description>
@@ -15,9 +15,10 @@
     <RepositoryUrl>https://github.com/CraigOates/Death-Socket/tree/master</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>deathsocket craig oates image overlay f#</PackageTags>
-    <PackageReleaseNotes>This release deprecated the "applyGrid" functions and refactored them into one single function.</PackageReleaseNotes>
-    <AssemblyVersion>0.6.0.0</AssemblyVersion>
+    <PackageReleaseNotes>This release adds ability to create an SKData buffer, scale the line thickness of the pen when drawing lines (mostly with System.Drawing) and determine an images dimensions. Functions marked as obsolete (0.6 and below) have been removed, also.</PackageReleaseNotes>
+    <AssemblyVersion>0.7.0.0</AssemblyVersion>
     <PackageIconUrl>https://github.com/CraigOates/Death-Socket/blob/master/.github/Images/death-socket-logo.png</PackageIconUrl>
+    <FileVersion>0.7.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

From a6845b68116939ef921a3451037d82aa485a9dfa Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 12:12:50 +0000
Subject: [PATCH 22/31] update Test Centre's assembly info. to 0.7

---
 TestCentre/AssemblyInfo.fs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestCentre/AssemblyInfo.fs b/TestCentre/AssemblyInfo.fs
index 301bac2..d206d61 100644
--- a/TestCentre/AssemblyInfo.fs
+++ b/TestCentre/AssemblyInfo.fs
@@ -34,8 +34,8 @@ open System.Runtime.InteropServices
 // 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.0.0.0")>]
-[<assembly: AssemblyFileVersion("1.0.0.0")>]
+[<assembly: AssemblyVersion("0.7.0.0")>]
+[<assembly: AssemblyFileVersion("0.7.0.0")>]
 
 do
     ()
\ No newline at end of file

From c04598ad685c182904109e627d3c18e6e5df18ac Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 15:07:31 +0000
Subject: [PATCH 23/31] refactored scale line thickness functionality.

---
 DeathSocket/Domain.fs        |  6 +++++-
 DeathSocket/GridPainter.fs   |  8 ++++++--
 DeathSocket/ImageServices.fs | 25 ++++++++++++++++++++-----
 DeathSocket/Validation.fs    | 23 +++++++++++++++++++++--
 4 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/DeathSocket/Domain.fs b/DeathSocket/Domain.fs
index 834f72c..a6d9276 100644
--- a/DeathSocket/Domain.fs
+++ b/DeathSocket/Domain.fs
@@ -167,4 +167,8 @@
             /// Denotes an image created using SkiaSharp
             | SkiaSharp of string
             /// Denotes an image created using System.Drawing
-            | SystemDrawing of string
\ No newline at end of file
+            | SystemDrawing of string
+
+        type internal longestDimension =
+            | Width
+            | Height
\ No newline at end of file
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index 59a68b2..f109803 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -55,6 +55,7 @@ namespace DeathSocket
                     printfn "File could not be found at %s" ex.Message
             }
 
+        // NOT TESTED.
         /// <summary>
         /// Determines the current scale an image is viewed at (E.G. scaled
         /// preview in image viewer). The (pen) line thickness is then updated
@@ -76,8 +77,11 @@ namespace DeathSocket
         /// SkiaSharp based functions already scale the grid lines for you. So,
         /// you should not need to use this function when using them.
         /// </remarks>
-        let scaleLineThickness (previewDimension: double) (actualDimension: double) (lineThickness: double) =
-            setLineThickness previewDimension actualDimension lineThickness
+        let scaleLineThickness (previewDimensions: int * int) (actualDimensions: int * int) (lineThickness: double) =
+            validateDimensions previewDimensions |> ignore
+            validateDimensions actualDimensions |> ignore
+            validateLineThickness |> ignore
+            adjustLineThickness previewDimensions actualDimensions lineThickness
 
         /// <summary>
         /// Reads an (jpg or png) image and return its width and height as a
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index 2033b4d..dd5c295 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -1,12 +1,13 @@
 module internal ImageServices
 
+    open System
     open System.IO
     open System.Drawing
     open System.Drawing.Imaging
     open DeathSocket
+    open Validation
     open ColourServices
     open SkiaSharp
-    open System
 
     (* Note on the Use of Repeated Code
     ===========================================================================
@@ -20,10 +21,24 @@
     lurking in an end users RAM can grind their computer to a halt. On top of
     that, they have no means to make alterations to the code. *)
 
-    let setLineThickness pDimension aDimension lineWidth =
-        if (pDimension <= 0.0 || aDimension <= 0.0 || lineWidth <= 0.0) then
-            raise (new DivideByZeroException ("[ERROR] The images height and width must be greater than 0."))
-        else lineWidth / (pDimension / aDimension)
+    let determineImageScale pDimension aDimension =
+        (double aDimension) / (double pDimension)
+
+    let determineLineScale (lineWidth: double) (scale: double) =
+        lineWidth / scale
+
+    let adjustLineThickness pDimensions aDimensions lineWidth =
+        match (validateLongestDimension pDimensions aDimensions) with
+        | Width ->
+            let thickness =
+                determineImageScale (fst pDimensions) (fst aDimensions)
+                |> determineLineScale lineWidth
+            thickness
+        | Height ->
+            let thickness =
+                determineImageScale (snd pDimensions) (snd aDimensions)
+                |> determineLineScale lineWidth
+            thickness
 
     (* SkiaSharp Functions
     ======================================================================== *)
diff --git a/DeathSocket/Validation.fs b/DeathSocket/Validation.fs
index edc208a..8e3f707 100644
--- a/DeathSocket/Validation.fs
+++ b/DeathSocket/Validation.fs
@@ -1,11 +1,12 @@
 module internal Validation
 
     open System.IO
+    open DeathSocket
 
     let validateFilePath path =
         match File.Exists path with
         | true -> ()
-        | false -> raise (new FileNotFoundException (path + " could not be found."))
+        | false -> raise (new FileNotFoundException ("No file found at " + path))
 
     let validateSaveFileType file =
         match Path.GetExtension file with
@@ -17,4 +18,22 @@
 
     let validateIO iPath oPath =
         validateFilePath iPath
-        validateSaveFileType oPath
\ No newline at end of file
+        validateSaveFileType oPath
+
+    let validateDimensions dimensions =
+        match dimensions with
+        | (0, _) -> invalidArg "Width" "Width must be greater than 0."
+        | (_, 0) -> invalidArg "Height" "Height must be greater than 0."
+        | (_, _) -> ()
+
+    let validateLineThickness thickness =
+        match thickness with
+        | thickness when thickness <= 0.0 -> invalidArg "LineThickness" "LineThickness must be greater than 0."
+        | _ -> ()
+
+    let validateLongestDimension pDims aDims =
+        let width = (fst pDims) - (fst aDims)
+        let height = (snd pDims) - (snd aDims)
+        match width >= height with
+        | true -> Width
+        | false -> Height
\ No newline at end of file

From 981d632468312e0fc3a8aea3825e7b042cd4e49c Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 15:15:47 +0000
Subject: [PATCH 24/31] change Validation to ValidationServices.

---
 DeathSocket/DeathSocket.fsproj |  2 +-
 DeathSocket/GridPainter.fs     |  2 +-
 DeathSocket/ImageServices.fs   |  2 +-
 DeathSocket/ScratchPad.fsx     |  4 ++--
 DeathSocket/Validation.fs      | 39 ----------------------------------
 5 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 DeathSocket/Validation.fs

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index 6500931..077a558 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <Compile Include="Domain.fs" />
-    <Compile Include="Validation.fs" />
+    <Compile Include="ValidationServices.fs" />
     <Compile Include="ColourServices.fs" />
     <Compile Include="ImageServices.fs" />
     <Compile Include="GridPainter.fs" />
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index f109803..cd4479d 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -13,7 +13,7 @@ namespace DeathSocket
     /// functions.
     module GridPainter =
 
-        open Validation
+        open ValidationServices
         open ImageServices
         open SkiaSharp
 
diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index dd5c295..4c1ae10 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -5,7 +5,7 @@
     open System.Drawing
     open System.Drawing.Imaging
     open DeathSocket
-    open Validation
+    open ValidationServices
     open ColourServices
     open SkiaSharp
 
diff --git a/DeathSocket/ScratchPad.fsx b/DeathSocket/ScratchPad.fsx
index 5e24201..274d958 100644
--- a/DeathSocket/ScratchPad.fsx
+++ b/DeathSocket/ScratchPad.fsx
@@ -4,7 +4,7 @@
 //#r @"C:/Users/craig/.nuget/packages/skiasharp/1.60.3/runtimes/win-x64/native/libSkiaSharp.dll"
 
 #load "Domain.fs"
-#load "Validation.fs"
+#load "ValidationServices.fs"
 #load "ColourServices.fs"
 #load "ImageServices.fs"
 #load "GridPainter.fs"
@@ -12,7 +12,7 @@
 open System
 open System.Drawing
 open SkiaSharp
-open Validation
+open ValidationServices
 open ImageServices
 open DeathSocket
 
diff --git a/DeathSocket/Validation.fs b/DeathSocket/Validation.fs
deleted file mode 100644
index 8e3f707..0000000
--- a/DeathSocket/Validation.fs
+++ /dev/null
@@ -1,39 +0,0 @@
-module internal Validation
-
-    open System.IO
-    open DeathSocket
-
-    let validateFilePath path =
-        match File.Exists path with
-        | true -> ()
-        | false -> raise (new FileNotFoundException ("No file found at " + path))
-
-    let validateSaveFileType file =
-        match Path.GetExtension file with
-        | ".jpg" -> ()
-        | ".JPG" -> ()
-        | ".png" -> ()
-        | ".PNG" -> ()
-        | _ -> invalidArg "savePath" "The file type must be a .jpg or .png file."
-
-    let validateIO iPath oPath =
-        validateFilePath iPath
-        validateSaveFileType oPath
-
-    let validateDimensions dimensions =
-        match dimensions with
-        | (0, _) -> invalidArg "Width" "Width must be greater than 0."
-        | (_, 0) -> invalidArg "Height" "Height must be greater than 0."
-        | (_, _) -> ()
-
-    let validateLineThickness thickness =
-        match thickness with
-        | thickness when thickness <= 0.0 -> invalidArg "LineThickness" "LineThickness must be greater than 0."
-        | _ -> ()
-
-    let validateLongestDimension pDims aDims =
-        let width = (fst pDims) - (fst aDims)
-        let height = (snd pDims) - (snd aDims)
-        match width >= height with
-        | true -> Width
-        | false -> Height
\ No newline at end of file

From be1b9a17d958c509e2bff43004ffa1458648e5c1 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 15:22:10 +0000
Subject: [PATCH 25/31] move (some) ImageServies code to ImagePrep.

---
 DeathSocket/ImageServices.fs | 56 +-----------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs
index 4c1ae10..9949829 100644
--- a/DeathSocket/ImageServices.fs
+++ b/DeathSocket/ImageServices.fs
@@ -1,12 +1,11 @@
 module internal ImageServices
 
-    open System
     open System.IO
     open System.Drawing
     open System.Drawing.Imaging
     open DeathSocket
-    open ValidationServices
     open ColourServices
+    open ImagePrep
     open SkiaSharp
 
     (* Note on the Use of Repeated Code
@@ -21,46 +20,9 @@
     lurking in an end users RAM can grind their computer to a halt. On top of
     that, they have no means to make alterations to the code. *)
 
-    let determineImageScale pDimension aDimension =
-        (double aDimension) / (double pDimension)
-
-    let determineLineScale (lineWidth: double) (scale: double) =
-        lineWidth / scale
-
-    let adjustLineThickness pDimensions aDimensions lineWidth =
-        match (validateLongestDimension pDimensions aDimensions) with
-        | Width ->
-            let thickness =
-                determineImageScale (fst pDimensions) (fst aDimensions)
-                |> determineLineScale lineWidth
-            thickness
-        | Height ->
-            let thickness =
-                determineImageScale (snd pDimensions) (snd aDimensions)
-                |> determineLineScale lineWidth
-            thickness
-
     (* SkiaSharp Functions
     ======================================================================== *)
 
-    let createSKHorizontalLines width height rows =
-        let interval = float32 (height / rows)
-        [|for point in 1 .. (rows - 1) ->
-            [| SKPoint ((float32 0), (interval * (float32 point)))
-               SKPoint ((float32 width), (interval * (float32 point)))|]|]
-
-    let createSKVerticalLines width height columns =
-        let interval = float32 (width / columns)
-        [| for point in 1 .. (columns - 1) ->
-            [| SKPoint ((interval * (float32 point)), (float32 0))
-               SKPoint ((interval * (float32 point)), (float32 height))|]|]
-
-    let determineSkiaDimensions filePath =
-        use fileStream = File.Open (filePath, FileMode.Open)
-        use skStream = new SKManagedStream (fileStream)
-        use bitmap = SKBitmap.Decode (skStream)
-        (bitmap.Width, bitmap.Height)
-
     // Does not work when using SkiaSharp NuGet v. 1.68
     let drawSkiaGrid (spec: SkiaSpec) =
         use fileStream = File.Open (spec.originalPath, FileMode.Open)
@@ -222,22 +184,6 @@
     (* System.Drawing Functions
     ======================================================================== *)
 
-    let createHorizontalLines width height rows =
-        let interval = height / rows
-        [| for point in 1 .. (rows - 1) ->
-            [|Point (0, (interval * point))
-              Point (width, (interval * point) )|]|]
-
-    let createVerticalLines width height columns =
-        let interval = width / columns
-        [| for point in 1 .. (columns - 1) ->
-            [| Point ((interval * point), 0)
-               Point ((interval * point), height)|]|]
-
-    let determineSystemDrawingDimensions filePath =
-        use bitmap = Bitmap.FromFile filePath
-        (bitmap.Width, bitmap.Height)
-
     (* Note on Use of Temp. File in Functions which Add A Grid Overlay
     ===========================================================================
     The temp. file is used in the functions below are there to convert images

From 1be66fecca0811fd4be97d454fff4d866307fb87 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 15:37:06 +0000
Subject: [PATCH 26/31] update DeathSocket.fsproj.

---
 DeathSocket/DeathSocket.fsproj    |  1 +
 DeathSocket/GridPainter.fs        |  1 +
 DeathSocket/ImagePrep.fs          | 66 +++++++++++++++++++++++++++++++
 DeathSocket/ValidationServices.fs | 31 +++++++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 DeathSocket/ImagePrep.fs
 create mode 100644 DeathSocket/ValidationServices.fs

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index 077a558..02ea7ad 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -25,6 +25,7 @@
     <Compile Include="Domain.fs" />
     <Compile Include="ValidationServices.fs" />
     <Compile Include="ColourServices.fs" />
+    <Compile Include="ImagePrep.fs" />
     <Compile Include="ImageServices.fs" />
     <Compile Include="GridPainter.fs" />
     <None Include="ScratchPad.fsx" />
diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs
index cd4479d..9045f8d 100644
--- a/DeathSocket/GridPainter.fs
+++ b/DeathSocket/GridPainter.fs
@@ -14,6 +14,7 @@ namespace DeathSocket
     module GridPainter =
 
         open ValidationServices
+        open ImagePrep
         open ImageServices
         open SkiaSharp
 
diff --git a/DeathSocket/ImagePrep.fs b/DeathSocket/ImagePrep.fs
new file mode 100644
index 0000000..799d454
--- /dev/null
+++ b/DeathSocket/ImagePrep.fs
@@ -0,0 +1,66 @@
+module internal ImagePrep
+
+    open System.IO
+    open DeathSocket
+    open SkiaSharp
+    open System.Drawing
+
+    let determineLongestDimension pDims aDims =
+        let width = (fst pDims) - (fst aDims)
+        let height = (snd pDims) - (snd aDims)
+        match width > height with
+        | true -> Width
+        | false -> Height
+
+    let determineImageScale pDimension aDimension =
+        (double aDimension) / (double pDimension)
+
+    let determineLineScale (lineWidth: double) (scale: double) =
+        lineWidth / scale
+
+    let adjustLineThickness pDimensions aDimensions lineWidth =
+        match (determineLongestDimension pDimensions aDimensions) with
+        | Width ->
+            let thickness =
+                determineImageScale (fst pDimensions) (fst aDimensions)
+                |> determineLineScale lineWidth
+            thickness
+        | Height ->
+            let thickness =
+                determineImageScale (snd pDimensions) (snd aDimensions)
+                |> determineLineScale lineWidth
+            thickness
+
+    let createSKHorizontalLines width height rows =
+        let interval = float32 (height / rows)
+        [|for point in 1 .. (rows - 1) ->
+            [| SKPoint ((float32 0), (interval * (float32 point)))
+               SKPoint ((float32 width), (interval * (float32 point)))|]|]
+
+    let createSKVerticalLines width height columns =
+        let interval = float32 (width / columns)
+        [| for point in 1 .. (columns - 1) ->
+            [| SKPoint ((interval * (float32 point)), (float32 0))
+               SKPoint ((interval * (float32 point)), (float32 height))|]|]
+
+    let determineSkiaDimensions filePath =
+        use fileStream = File.Open (filePath, FileMode.Open)
+        use skStream = new SKManagedStream (fileStream)
+        use bitmap = SKBitmap.Decode (skStream)
+        (bitmap.Width, bitmap.Height)
+
+    let createHorizontalLines width height rows =
+        let interval = height / rows
+        [| for point in 1 .. (rows - 1) ->
+            [|Point (0, (interval * point))
+              Point (width, (interval * point) )|]|]
+
+    let createVerticalLines width height columns =
+        let interval = width / columns
+        [| for point in 1 .. (columns - 1) ->
+            [| Point ((interval * point), 0)
+               Point ((interval * point), height)|]|]
+
+    let determineSystemDrawingDimensions filePath =
+        use bitmap = Bitmap.FromFile filePath
+        (bitmap.Width, bitmap.Height)
\ No newline at end of file
diff --git a/DeathSocket/ValidationServices.fs b/DeathSocket/ValidationServices.fs
new file mode 100644
index 0000000..a2f3edc
--- /dev/null
+++ b/DeathSocket/ValidationServices.fs
@@ -0,0 +1,31 @@
+module internal ValidationServices
+
+    open System.IO
+
+    let validateFilePath path =
+        match File.Exists path with
+        | true -> ()
+        | false -> raise (new FileNotFoundException ("No file found at " + path))
+
+    let validateSaveFileType file =
+        match Path.GetExtension file with
+        | ".jpg" -> ()
+        | ".JPG" -> ()
+        | ".png" -> ()
+        | ".PNG" -> ()
+        | _ -> invalidArg "savePath" "The file type must be a .jpg or .png file."
+
+    let validateIO iPath oPath =
+        validateFilePath iPath
+        validateSaveFileType oPath
+
+    let validateDimensions dimensions =
+        match dimensions with
+        | (0, _) -> invalidArg "Width" "Width must be greater than 0."
+        | (_, 0) -> invalidArg "Height" "Height must be greater than 0."
+        | (_, _) -> ()
+
+    let validateLineThickness thickness =
+        match thickness with
+        | thickness when thickness <= 0.0 -> invalidArg "LineThickness" "LineThickness must be greater than 0."
+        | _ -> ()
\ No newline at end of file

From c38c4b4d5d2ef999f53caf7a32f96ffc6c706ded Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 15:44:03 +0000
Subject: [PATCH 27/31] update ScratchPad.

---
 DeathSocket/ImagePrep.fs   |  4 ++++
 DeathSocket/ScratchPad.fsx | 24 +++---------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/DeathSocket/ImagePrep.fs b/DeathSocket/ImagePrep.fs
index 799d454..25ec5f0 100644
--- a/DeathSocket/ImagePrep.fs
+++ b/DeathSocket/ImagePrep.fs
@@ -31,6 +31,8 @@
                 |> determineLineScale lineWidth
             thickness
 
+    (* SkiaSharp Functions
+    ======================================================================== *)
     let createSKHorizontalLines width height rows =
         let interval = float32 (height / rows)
         [|for point in 1 .. (rows - 1) ->
@@ -49,6 +51,8 @@
         use bitmap = SKBitmap.Decode (skStream)
         (bitmap.Width, bitmap.Height)
 
+    (* System.Drawing Functions
+    ======================================================================== *)
     let createHorizontalLines width height rows =
         let interval = height / rows
         [| for point in 1 .. (rows - 1) ->
diff --git a/DeathSocket/ScratchPad.fsx b/DeathSocket/ScratchPad.fsx
index 274d958..399af83 100644
--- a/DeathSocket/ScratchPad.fsx
+++ b/DeathSocket/ScratchPad.fsx
@@ -6,6 +6,7 @@
 #load "Domain.fs"
 #load "ValidationServices.fs"
 #load "ColourServices.fs"
+#load "ImagePrep.fs"
 #load "ImageServices.fs"
 #load "GridPainter.fs"
 
@@ -13,6 +14,7 @@ open System
 open System.Drawing
 open SkiaSharp
 open ValidationServices
+open ImagePrep
 open ImageServices
 open DeathSocket
 
@@ -41,33 +43,13 @@ let skVerticalLines = createSKVerticalLines 120 450 22
 (* You will need to provide the image and specify its load/save location.
 Death Socket assumes either JPEG or PNG files.*)
 
-// Internal function call. Not accessible outside this project.
-let skiaSharpDimensions =
-    determineSkiaDimensions (desktop + "/test.jpg")
-
-// Internal function call. Not accessible outside this project.
-let systemDrawingDimensions =
-    determineSystemDrawingDimensions (desktop + "/test.jpg")
-
-// Internal function calls. Not accessible outside this project.
-let width = double (fst skiaSharpDimensions)
-let width2 = double (fst systemDrawingDimensions)
-
-// Internal function calls. Not accessible outside this project.
-let height = double (snd skiaSharpDimensions)
-let height2 = double (snd systemDrawingDimensions)
-
-// Public function for the internal ones above.
 let dimensions =
     //SkiaSharp (desktop + "/test.jpg")
     SystemDrawing (desktop + "/test.jpg")
     |> GridPainter.determineImageDimensions
 
-let width3 = fst dimensions
-let height3 = snd dimensions
-
 // Change the line thickness (the last parameter) to whatever you want.
-let scaledPen = GridPainter.scaleLineThickness width height 8.0
+let scaledPen = GridPainter.scaleLineThickness (100, 100) dimensions 8.0
 
 // Brush Specification (uses System.Drawing)
 Brush ({ originalPath = desktop + "/test.jpg"

From 78511b232ad5b352bbd4dabf4698e6fe1b822777 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 16:18:08 +0000
Subject: [PATCH 28/31] add extra test image and update Test Centre.

---
 TestCentre/LibraryTests.fs                    | 101 ++++++++++--------
 .../RequiredInfo/ImageTest1.png               | Bin 0 -> 1098 bytes
 .../RequiredInfo/ImageTest2.png               | Bin 0 -> 1098 bytes
 .../RequiredInfo/ImageTest3.png               | Bin 0 -> 1098 bytes
 4 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 TestCentre/LoadingTestArea/RequiredInfo/ImageTest1.png
 create mode 100644 TestCentre/LoadingTestArea/RequiredInfo/ImageTest2.png
 create mode 100644 TestCentre/LoadingTestArea/RequiredInfo/ImageTest3.png

diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index 3b124dd..f158f0f 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -34,10 +34,17 @@
         let loadLocation = __SOURCE_DIRECTORY__ + "/LoadingTestArea"
         let saveLocation  = __SOURCE_DIRECTORY__ + "/SavingTestArea"
 
-        let fixedSkiaImagePath =
+        let validSkiaImagePath = 
             (loadLocation + "/RequiredInfo/Skia-599x336.png")
-        let fixedSystemDrawingImagePath = 
+        let validSystemDrawingImagePath = 
             (loadLocation + "/RequiredInfo/SystemDrawing-338x307.png")
+        let validImagePath =
+            (loadLocation + "/RequiredInfo/ImageTest1.png")
+        let validImagePath2 =
+            (loadLocation + "/RequiredInfo/ImageTest2.png")
+        let validImagePath3 =
+            (loadLocation + "/RequiredInfo/ImageTest3.png")
+        let invalidImagePath = "invalid.png"
 
         let allColours =
             let properties =
@@ -227,7 +234,7 @@
         [<Property>]
         let ``Can create a populated SKData buffer when calling createSKDataAsync with SkiaBuffer`` () =
             let result () =
-                SkiaBuffer ({ filePath = fixedSkiaImagePath
+                SkiaBuffer ({ filePath = validImagePath
                               skColour = randomSKColour ()
                               penWidth = float32 (newPenWidth())
                               rows = newNum ()
@@ -239,7 +246,7 @@
         [<Property>]
         let ``Can create a populated SKData buffer when calling createSKDataAsync with SkiaRGBBuffer`` () =
             let result () =
-                SkiaRGBBuffer ({ filePath = fixedSkiaImagePath
+                SkiaRGBBuffer ({ filePath = validImagePath3
                                  red = float32 (newNum())
                                  green = float32 (newNum())
                                  blue = float32 (newNum())
@@ -263,7 +270,7 @@
         [<Fact>]
         let ``An empty SKData object is returned when createSKDataAsync cannot find file when using SkiaBuffer`` () =
             let result =
-                SkiaBuffer ({ filePath = "invalid-file-path"
+                SkiaBuffer ({ filePath = invalidImagePath
                               penWidth = float32 1
                               skColour = SKColors.Empty
                               rows = 1
@@ -275,7 +282,7 @@
         [<Fact>]
         let ``An empty SKData object is returned when createSKDataAsync cannot find file when using SkiaRGBBuffer`` () =
             let result =
-                SkiaRGBBuffer ({ filePath = "invalid-file-path"
+                SkiaRGBBuffer ({ filePath = invalidImagePath
                                  penWidth = float32 1
                                  red = float32 1
                                  green = float32 1
@@ -289,8 +296,8 @@
         [<Fact>]
         let ``An empty SKData object is returned when calling createSKDataAsync with SkiaRGB`` () =
             let result =
-                SkiaRGB ({ originalPath = "not needed"
-                           savePath= "not needed"
+                SkiaRGB ({ originalPath = validImagePath2
+                           savePath= validImagePath
                            red = float32 1
                            green = float32 1
                            blue = float32 1
@@ -304,8 +311,8 @@
         [<Fact>]
         let ``An empty SKData object is returned when calling createSKDataAsync with Skia`` () =
             let result =
-                Skia ({ originalPath = "not needed"
-                        savePath= "not needed"
+                Skia ({ originalPath = validImagePath3
+                        savePath= validImagePath
                         skColour = SKColors.Empty
                         penWidth = float32 1
                         rows = 1
@@ -317,8 +324,8 @@
         [<Fact>]
         let ``An empty SKData object is returned when calling createSKDataAsync with Brush`` () =
             let result =
-                Brush ({ originalPath = "not needed"
-                         savePath= "not needed"
+                Brush ({ originalPath = validImagePath
+                         savePath= validImagePath
                          colour = Brushes.AliceBlue
                          penWidth = float32 1
                          rows = 1
@@ -330,8 +337,8 @@
         [<Fact>]
         let ``An empty SKData object is returned when calling createSKDataAsync with RGBA`` () =
             let result =
-                RGBA ({ originalPath = "not needed"
-                        savePath= "not needed"
+                RGBA ({ originalPath = validImagePath
+                        savePath= validImagePath
                         red = float 1
                         green = float 1
                         blue = float 1
@@ -343,10 +350,28 @@
                 |> Async.RunSynchronously
             Assert.Equal(SKData.Empty, result)
 
+        [<Fact>]
+        let ``Argument Exception is thrown when actualDimensions are set to 0 when calling scaleLineThickness`` () =
+            let result () =
+                GridPainter.scaleLineThickness (1, 0) (0, 0) 1.0
+            Assert.Throws<ArgumentException>(fun () -> result () |> ignore)
+
+        [<Fact>]
+        let ``Argument Exception is thrown when lineThickness is set to 0 when calling scaleLineThickness`` () =
+            let result () =
+                GridPainter.scaleLineThickness (1, 0)(1, 0) 0.0
+            Assert.Throws<ArgumentException>(fun () -> result () |> ignore)
+
+        [<Fact>]
+        let ``Argument Exception is thrown when previewDimensions are set to 0 when calling scaleLineThickness`` () =
+            let result () =
+                GridPainter.scaleLineThickness (0, 0) (1, 0) 1.0
+            Assert.Throws<ArgumentException>(fun () -> result () |> ignore)
+
         [<Fact>]
         let ``Can determine image width using SkiaSharp`` () =
             let dimensions =
-                SkiaSharp (fixedSkiaImagePath)
+                SkiaSharp (validSkiaImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (fst dimensions) = 599
             Assert.True (result ())
@@ -354,7 +379,7 @@
         [<Fact>]
         let ``Can determine image height using SkiaSharp`` () =
             let dimensions =
-                SkiaSharp (fixedSkiaImagePath)
+                SkiaSharp (validSkiaImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (snd dimensions) = 336
             Assert.True (result ())
@@ -362,7 +387,7 @@
         [<Fact>]
         let ``Can determine image width using SystemDrawing`` () =
             let dimensions =
-                SystemDrawing (fixedSystemDrawingImagePath)
+                SystemDrawing (validSystemDrawingImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (fst dimensions) = 338
             Assert.True (result ())
@@ -370,11 +395,21 @@
         [<Fact>]
         let ``Can determine image height using SystemDrawing`` () =
             let dimensions =
-                SystemDrawing (fixedSystemDrawingImagePath)
+                SystemDrawing (validSystemDrawingImagePath)
                 |> GridPainter.determineImageDimensions
             let result () = (snd dimensions) = 307
             Assert.True (result ())
 
+        [<Fact>]
+        let ``Divide By Zero Exception is thrown when 0 rows is used when determining horizontal lines`` () =
+            let result () = GridPainter.determineHorizontalLines 100 100 0
+            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
+
+        [<Fact>]
+        let ``Divide By Zero Exception is thrown when 0 columns is used when determining vertical lines`` () =
+            let result () = GridPainter.determineVerticalLines 100 100 0
+            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
+
         (* This test is a pre-test test (a test for the tests if you will...).
         It is here to make sure the property test has what it needs to run.
         If the property tests fails, here is a good place to start.
@@ -394,32 +429,4 @@
         for extra context. *)
         [<Fact>]
         let ``SavingTestArea folder can be found`` () =
-            Assert.True (Directory.Exists saveLocation)
-
-        [<Fact>]
-        let ``Divide By Zero Exception is thrown when 0 rows is used when determining horizontal lines`` () =
-            let result () = GridPainter.determineHorizontalLines 100 100 0
-            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
-
-        [<Fact>]
-        let ``Divide By Zero Exception is thrown when 0 columns is used when determining vertical lines`` () =
-            let result () = GridPainter.determineVerticalLines 100 100 0
-            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
-
-        [<Fact>]
-        let ``Divide By Zero Exception is thrown when previewDimension is set to 0 when calling scaleLineThickness`` () =
-            let result () =
-                GridPainter.scaleLineThickness 0.0 1.0 1.0
-            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
-
-        [<Fact>]
-        let ``Divide By Zero Exception is thrown when actualDimension is set to 0 when calling scaleLineThickness`` () =
-            let result () =
-                GridPainter.scaleLineThickness 1.0 0.0 1.0
-            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
-
-        [<Fact>]
-        let ``Divide By Zero Exception is thrown when lineThickness is set to 0 when calling scaleLineThickness`` () =
-            let result () =
-                GridPainter.scaleLineThickness 1.0 1.0 0.0
-            Assert.Throws<DivideByZeroException>(fun () -> result () |> ignore)
\ No newline at end of file
+            Assert.True (Directory.Exists saveLocation)
\ No newline at end of file
diff --git a/TestCentre/LoadingTestArea/RequiredInfo/ImageTest1.png b/TestCentre/LoadingTestArea/RequiredInfo/ImageTest1.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc71c54a0aa15ec69766078608667384a76452e9
GIT binary patch
literal 1098
zcmeAS@N?(olHy`uVBq!ia0y~yU<6@f4mO}ja&5N&kYX$ja(7}_cTVOdki(Mh=<CS9
zu(6-}Pa-Rj&spFRS<Jw|cNl~jkLRyQVPIgs@9E+gQW5v|iXkI|f&hc!@A8fPocr3!
zK7_GpZTL2m`+)sKCKn~v4i_$gP7wtmO$U{r29G5S6FnG}MkPjrWHd1h=4{~c%+5DJ
WW9xK*E4P68pTX1B&t;ucLK6Vuvkbog

literal 0
HcmV?d00001

diff --git a/TestCentre/LoadingTestArea/RequiredInfo/ImageTest2.png b/TestCentre/LoadingTestArea/RequiredInfo/ImageTest2.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc71c54a0aa15ec69766078608667384a76452e9
GIT binary patch
literal 1098
zcmeAS@N?(olHy`uVBq!ia0y~yU<6@f4mO}ja&5N&kYX$ja(7}_cTVOdki(Mh=<CS9
zu(6-}Pa-Rj&spFRS<Jw|cNl~jkLRyQVPIgs@9E+gQW5v|iXkI|f&hc!@A8fPocr3!
zK7_GpZTL2m`+)sKCKn~v4i_$gP7wtmO$U{r29G5S6FnG}MkPjrWHd1h=4{~c%+5DJ
WW9xK*E4P68pTX1B&t;ucLK6Vuvkbog

literal 0
HcmV?d00001

diff --git a/TestCentre/LoadingTestArea/RequiredInfo/ImageTest3.png b/TestCentre/LoadingTestArea/RequiredInfo/ImageTest3.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc71c54a0aa15ec69766078608667384a76452e9
GIT binary patch
literal 1098
zcmeAS@N?(olHy`uVBq!ia0y~yU<6@f4mO}ja&5N&kYX$ja(7}_cTVOdki(Mh=<CS9
zu(6-}Pa-Rj&spFRS<Jw|cNl~jkLRyQVPIgs@9E+gQW5v|iXkI|f&hc!@A8fPocr3!
zK7_GpZTL2m`+)sKCKn~v4i_$gP7wtmO$U{r29G5S6FnG}MkPjrWHd1h=4{~c%+5DJ
WW9xK*E4P68pTX1B&t;ucLK6Vuvkbog

literal 0
HcmV?d00001


From 9aed4ba6093ee994f1fe7d595591f5c2471f74dc Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 16:40:26 +0000
Subject: [PATCH 29/31] add scaling pen thickness tests.

---
 TestCentre/LibraryTests.fs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs
index f158f0f..17abe0c 100644
--- a/TestCentre/LibraryTests.fs
+++ b/TestCentre/LibraryTests.fs
@@ -421,6 +421,24 @@
             let imagesAreThere = if length < 100 then false else true
             Assert.True imagesAreThere
 
+        [<Fact>]
+        let ``Pen thickness scales down to match preview image dimensions`` () =
+            let result () =
+                GridPainter.scaleLineThickness (100, 100) (200, 200) 10.0
+            Assert.Equal (5.0, (result ()))
+
+        [<Fact>]
+        let ``Pen thickness scales up to match preview image dimensions`` () =
+            let result () =
+                GridPainter.scaleLineThickness (200, 200) (100, 100) 10.0
+            Assert.Equal (20.0, (result ()))
+
+        [<Fact>]
+        let ``Pen thickness remains the same when preview image matches actual dimensions`` () =
+            let result () =
+                GridPainter.scaleLineThickness (100, 100) (100, 100) 10.0
+            Assert.Equal (10.0, (result ()))
+
         (* This test is a pre-test test. If the property tests fails, here is a
         good place to start. The easiest way to get this test to pass is to
         create a folder called "SavingTestArea" in this projects folder

From 50a46b9e4e920b83a85d697d98b30d247b625c5d Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 16:44:33 +0000
Subject: [PATCH 30/31] update assembly info. to 0.7.1.

---
 DeathSocket/DeathSocket.fsproj | 6 +++---
 TestCentre/AssemblyInfo.fs     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index 02ea7ad..c1078c2 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -15,10 +15,10 @@
     <RepositoryUrl>https://github.com/CraigOates/Death-Socket/tree/master</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>deathsocket craig oates image overlay f#</PackageTags>
-    <PackageReleaseNotes>This release adds ability to create an SKData buffer, scale the line thickness of the pen when drawing lines (mostly with System.Drawing) and determine an images dimensions. Functions marked as obsolete (0.6 and below) have been removed, also.</PackageReleaseNotes>
-    <AssemblyVersion>0.7.0.0</AssemblyVersion>
+    <PackageReleaseNotes>This release fixes the pen thickness scaling bugs in 0.7.</PackageReleaseNotes>
+    <AssemblyVersion>0.7.1.0</AssemblyVersion>
     <PackageIconUrl>https://github.com/CraigOates/Death-Socket/blob/master/.github/Images/death-socket-logo.png</PackageIconUrl>
-    <FileVersion>0.7.0.0</FileVersion>
+    <FileVersion>0.7.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestCentre/AssemblyInfo.fs b/TestCentre/AssemblyInfo.fs
index d206d61..d033100 100644
--- a/TestCentre/AssemblyInfo.fs
+++ b/TestCentre/AssemblyInfo.fs
@@ -34,8 +34,8 @@ open System.Runtime.InteropServices
 // 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("0.7.0.0")>]
-[<assembly: AssemblyFileVersion("0.7.0.0")>]
+[<assembly: AssemblyVersion("0.7.1.0")>]
+[<assembly: AssemblyFileVersion("0.7.1.0")>]
 
 do
     ()
\ No newline at end of file

From bd9fc5d29f68ee6ea80deaa32424cbb20b909a32 Mon Sep 17 00:00:00 2001
From: Craig Oates <craig@craigoates.net>
Date: Mon, 31 Dec 2018 16:46:44 +0000
Subject: [PATCH 31/31] update NuGet package name to 0.7.1.

---
 DeathSocket/DeathSocket.fsproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index c1078c2..bb8c781 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>0.7-alpha</Version>
+    <Version>0.7.1-alpha</Version>
     <Authors>Craig Oates</Authors>
     <Product>Death Socket</Product>
     <Description>A .Net Standard library which you can plug into to project and draw gridded overlays onto you images. Please note, Death Socket uses System.Drawing brushes and not System.Media brushes. For futher information, visit the projects repository on GitHub. To get a sense of what Death Socket can do, there is a console program you can download seperately (on GitHub).</Description>