From aea8b2af60e48ed31c86c738e975f582a9211289 Mon Sep 17 00:00:00 2001
From: Emiliano Magliocca <emiliano.magliocca@outlook.com>
Date: Tue, 5 May 2020 09:59:27 +0300
Subject: [PATCH] Fix ApplyTileFoundProcessor

---
 .../Services/SearchAndReplaceService.cs       | 32 ++++++++++++++-----
 Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj      |  8 +----
 build-pipelines.yml                           |  5 +++
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Yugen.Mosaic.Uwp/Services/SearchAndReplaceService.cs b/Yugen.Mosaic.Uwp/Services/SearchAndReplaceService.cs
index 1b35664..38e4819 100644
--- a/Yugen.Mosaic.Uwp/Services/SearchAndReplaceService.cs
+++ b/Yugen.Mosaic.Uwp/Services/SearchAndReplaceService.cs
@@ -1,11 +1,10 @@
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Yugen.Mosaic.Uwp.Interfaces;
 using Yugen.Mosaic.Uwp.Models;
-using Size = SixLabors.ImageSharp.Size;
 
 namespace Yugen.Mosaic.Uwp.Services
 {
@@ -30,17 +29,34 @@ public SearchAndReplaceService(Image<Rgba32> outputImage, Size tileSize, int tX,
 
         public virtual void SearchAndReplace() { }
 
-        // TODO: check this out
+        // TODO: c.DrawImage crash (System.NullReferenceException) 
+        // with the current SixLabors.ImageSharp.Drawing preview version
+        //internal void ApplyTileFoundProcessor(int x, int y, Image<Rgba32> source)
+        //{
+        //    _outputImage.Mutate(c =>
+        //    {
+        //        var point = new Point(x * source.Width, y * source.Height);
+        //        try
+        //        {
+        //            c.DrawImage(source, point, 1);
+        //        }
+        //        catch { }
+        //    });
+        //}
+
         internal void ApplyTileFoundProcessor(int x, int y, Image<Rgba32> source)
         {
-            _outputImage.Mutate(c =>
+            Parallel.For(0, source.Height, h =>
             {
-                var point = new Point(x * source.Width, y * source.Height);
-                try
+                Span<Rgba32> rowSpan = source.GetPixelRowSpan(h);
+
+                for (var w = 0; w < source.Width; w++)
                 {
-                    c.DrawImage(source, point, 1);
+                    var pixel = new Rgba32();
+                    rowSpan[w].ToRgba32(ref pixel);
+
+                    _outputImage[x * source.Width + w, y * source.Height + h] = pixel;
                 }
-                catch { }
             });
         }
     }
diff --git a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
index 5a1d3c2..4e52cc0 100644
--- a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
+++ b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
@@ -18,8 +18,6 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>
-    </PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
@@ -38,7 +36,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -62,7 +59,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <OutputPath>bin\ARM\Release\</OutputPath>
@@ -87,7 +83,6 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <OutputPath>bin\ARM64\Release\</OutputPath>
@@ -111,7 +106,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -270,7 +264,7 @@
       <Version>1.0.0-rc0001</Version>
     </PackageReference>
     <PackageReference Include="SixLabors.ImageSharp.Drawing">
-      <Version>1.0.0-unstable0436</Version>
+      <Version>1.0.0-unstable0446</Version>
     </PackageReference>
     <PackageReference Include="WriteableBitmapEx">
       <Version>1.6.5</Version>
diff --git a/build-pipelines.yml b/build-pipelines.yml
index 3b5d779..ea5e35c 100644
--- a/build-pipelines.yml
+++ b/build-pipelines.yml
@@ -37,6 +37,11 @@ steps:
       
 - task: NuGetToolInstaller@1
 
+- task: NuGetCommand@2
+  inputs:
+    command: 'custom'
+    arguments: 'sources add -Name myget -Source https://www.myget.org/F/sixlabors/api/v3/index.json'
+
 - task: NuGetCommand@2
   inputs:
     restoreSolution: '$(solution)'