From 48c1bef091123b837273f4288f1c064a43978742 Mon Sep 17 00:00:00 2001
From: Tyler Young <tyler.young@impromptu.ninja>
Date: Fri, 12 Jun 2020 18:58:28 -0400
Subject: [PATCH] upgrades SixLabors.ImageSharp

---
 Content.Client/Content.Client.csproj         | 4 ++--
 Content.Client/Parallax/ParallaxGenerator.cs | 6 +++---
 Content.Client/Parallax/ParallaxManager.cs   | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 452d2dbd09..aa5f3e6552 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -12,8 +12,8 @@
   <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
   <ItemGroup>
     <PackageReference Include="Nett" Version="0.13.0" />
-    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0007" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0002" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0009" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="YamlDotNet" Version="8.1.0" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
diff --git a/Content.Client/Parallax/ParallaxGenerator.cs b/Content.Client/Parallax/ParallaxGenerator.cs
index aa5b39aca1..e7eeb0c606 100644
--- a/Content.Client/Parallax/ParallaxGenerator.cs
+++ b/Content.Client/Parallax/ParallaxGenerator.cs
@@ -11,7 +11,7 @@ using Robust.Shared.Random;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Primitives;
+using Color = Robust.Shared.Maths.Color;
 
 namespace Content.Client.Parallax
 {
@@ -28,7 +28,7 @@ namespace Content.Client.Parallax
             sawmill.Debug("Timing start!");
             var sw = new Stopwatch();
             sw.Start();
-            var image = new Image<Rgba32>(Configuration.Default, size.Width, size.Height, Rgba32.Black);
+            var image = new Image<Rgba32>(Configuration.Default, size.Width, size.Height, new Rgba32(0,0,0,0));
             var count = 0;
             foreach (var layer in generator.Layers)
             {
@@ -320,7 +320,7 @@ namespace Content.Client.Parallax
             public override void Apply(Image<Rgba32> bitmap)
             {
                 // Temporary buffer so we don't mess up blending.
-                using (var buffer = new Image<Rgba32>(Configuration.Default, bitmap.Width, bitmap.Height, Rgba32.Black))
+                using (var buffer = new Image<Rgba32>(Configuration.Default, bitmap.Width, bitmap.Height, new Rgba32(0,0,0,0)))
                 {
                     if (Masked)
                     {
diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs
index 34e15cd2b5..0e6ff0e827 100644
--- a/Content.Client/Parallax/ParallaxManager.cs
+++ b/Content.Client/Parallax/ParallaxManager.cs
@@ -13,7 +13,6 @@ using Robust.Shared.Log;
 using Robust.Shared.Utility;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Primitives;
 
 namespace Content.Client.Parallax
 {