From 297ef37126588a50c213abd95b2dcf855f13df94 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Thu, 21 Nov 2019 13:57:31 -0500
Subject: [PATCH] Update ImageProcessor to 2.7

---
 WebCms/Config/imageprocessor/cache.config     | 10 +--
 .../Config/imageprocessor/processing.config   | 87 ++++++++++---------
 WebCms/Config/imageprocessor/security.config  |  6 +-
 WebCms/Web.config                             | 16 ++--
 WebCms/WebCms.csproj                          |  8 +-
 WebCms/packages.config                        |  6 +-
 6 files changed, 69 insertions(+), 64 deletions(-)

diff --git a/WebCms/Config/imageprocessor/cache.config b/WebCms/Config/imageprocessor/cache.config
index 841ac21..1bd6cd7 100644
--- a/WebCms/Config/imageprocessor/cache.config
+++ b/WebCms/Config/imageprocessor/cache.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <caching currentCache="DiskCache">
   <caches>
-    <cache name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" browserMaxDays="7" trimCache="false">
-      <settings>
-        <setting key="VirtualCachePath" value="~/app_data/cache"/>
-      </settings>
-    </cache>
+    <cache trimCache="false" name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" memoryMaxMinutes="1" browserMaxDays="7">
+      
+    <settings>
+        <setting key="VirtualCachePath" value="~/app_data/cache" />
+      </settings></cache>
   </caches>
 </caching>
\ No newline at end of file
diff --git a/WebCms/Config/imageprocessor/processing.config b/WebCms/Config/imageprocessor/processing.config
index 363d0e5..009fc7a 100644
--- a/WebCms/Config/imageprocessor/processing.config
+++ b/WebCms/Config/imageprocessor/processing.config
@@ -1,62 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
-  <presets>
-  </presets>
-  <plugins>
-    <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web"/>
-    <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true"/>
-    <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" enabled="true"/>
-    <plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web"/>
-    <plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web"/>
-    <plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web" enabled="true"/>
-    <plugin name="DetectEdges" type="ImageProcessor.Web.Processors.DetectEdges, ImageProcessor.Web"/>
-    <plugin name="EntropyCrop" type="ImageProcessor.Web.Processors.EntropyCrop, ImageProcessor.Web"/>
-    <plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web"/>
-    <plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web"/>
-    <plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" enabled="true"/>
-    <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web"/>
+<processing preserveExifMetaData="true" metaDataMode="None" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
+  
+  
+<presets>
+  </presets><plugins>
+    <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" />
+    <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true" />
+    <plugin name="Background" type="ImageProcessor.Web.Processors.Background, ImageProcessor.Web">
+      <settings>
+        <setting key="VirtualPath" value="~/images/imageprocessor/background/" />
+      </settings>
+    </plugin>
+    <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" enabled="true" />
+    <plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web" />
+    <plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web" />
+    <plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web" enabled="true" />
+    <plugin name="DetectEdges" type="ImageProcessor.Web.Processors.DetectEdges, ImageProcessor.Web" />
+    <plugin name="EntropyCrop" type="ImageProcessor.Web.Processors.EntropyCrop, ImageProcessor.Web" />
+    <plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web" />
+    <plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web" />
+    <plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" enabled="true" />
+    <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web" />
     <plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
       <settings>
-        <setting key="MaxSize" value="22"/>
-        <setting key="MaxSigma" value="5.1"/>
-        <setting key="MaxThreshold" value="100"/>
+        <setting key="MaxSize" value="22" />
+        <setting key="MaxSigma" value="5.1" />
+        <setting key="MaxThreshold" value="100" />
       </settings>
     </plugin>
     <plugin name="GaussianSharpen" type="ImageProcessor.Web.Processors.GaussianSharpen, ImageProcessor.Web">
       <settings>
-        <setting key="MaxSize" value="22"/>
-        <setting key="MaxSigma" value="5.1"/>
-        <setting key="MaxThreshold" value="100"/>
+        <setting key="MaxSize" value="22" />
+        <setting key="MaxSigma" value="5.1" />
+        <setting key="MaxThreshold" value="100" />
       </settings>
     </plugin>
-    <plugin name="Halftone" type="ImageProcessor.Web.Processors.Halftone, ImageProcessor.Web"/>
-    <plugin name="Hue" type="ImageProcessor.Web.Processors.Hue, ImageProcessor.Web"/>
+    <plugin name="Halftone" type="ImageProcessor.Web.Processors.Halftone, ImageProcessor.Web" />
+    <plugin name="Hue" type="ImageProcessor.Web.Processors.Hue, ImageProcessor.Web" />
     <plugin name="Mask" type="ImageProcessor.Web.Processors.Mask, ImageProcessor.Web">
       <settings>
-        <setting key="VirtualPath" value="~/images/imageprocessor/mask/"/>
+        <setting key="VirtualPath" value="~/images/imageprocessor/mask/" />
       </settings>
     </plugin>
-    <plugin name="Meta" type="ImageProcessor.Web.Processors.Meta, ImageProcessor.Web"/>
+    <plugin name="Meta" type="ImageProcessor.Web.Processors.Meta, ImageProcessor.Web" />
     <plugin name="Overlay" type="ImageProcessor.Web.Processors.Overlay, ImageProcessor.Web">
       <settings>
-        <setting key="VirtualPath" value="~/images/imageprocessor/overlay/"/>
+        <setting key="VirtualPath" value="~/images/imageprocessor/overlay/" />
       </settings>
     </plugin>
-    <plugin name="Pixelate" type="ImageProcessor.Web.Processors.Pixelate, ImageProcessor.Web"/>
-    <plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web" enabled="true"/>
-    <plugin name="ReplaceColor" type="ImageProcessor.Web.Processors.ReplaceColor, ImageProcessor.Web"/>
+    <plugin name="Pixelate" type="ImageProcessor.Web.Processors.Pixelate, ImageProcessor.Web" />
+    <plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web" enabled="true" />
+    <plugin name="ReplaceColor" type="ImageProcessor.Web.Processors.ReplaceColor, ImageProcessor.Web" />
     <plugin name="Resize" type="ImageProcessor.Web.Processors.Resize, ImageProcessor.Web" enabled="true">
       <settings>
-        <setting key="MaxWidth" value="5000"/>
-        <setting key="MaxHeight" value="5000"/>
+        <setting key="MaxWidth" value="5000" />
+        <setting key="MaxHeight" value="5000" />
       </settings>
     </plugin>
-    <plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web"/>
-    <plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web"/>
-    <plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web"/>
-    <plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web"/>
-    <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web"/>
-    <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web"/>
-    <plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web"/>
-  </plugins>
-</processing>
\ No newline at end of file
+    <plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web" />
+    <plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web" />
+    <plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web" />
+    <plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web" />
+    <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" />
+    <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" />
+    <plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" />
+  </plugins></processing>
\ No newline at end of file
diff --git a/WebCms/Config/imageprocessor/security.config b/WebCms/Config/imageprocessor/security.config
index 7bce8ee..3168b75 100644
--- a/WebCms/Config/imageprocessor/security.config
+++ b/WebCms/Config/imageprocessor/security.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <security>
-  <services>
+  
+<services>
     <service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web" />
     <!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
     <!--<service name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web">
@@ -20,5 +21,4 @@
       <whitelist>
       </whitelist>
     </service>
-  </services>
-</security>
\ No newline at end of file
+  </services></security>
\ No newline at end of file
diff --git a/WebCms/Web.config b/WebCms/Web.config
index 2e7b0c0..a9828f1 100644
--- a/WebCms/Web.config
+++ b/WebCms/Web.config
@@ -21,13 +21,13 @@
       You can also find all config options in the "Web.Backload.Default.txt" file (Backload\Config\_Defaults folder).
     -->
     <section name="backload" type="Backload.Configuration.BackloadSection, Backload, Version=2, Culture=neutral, PublicKeyToken=02eaf42ab375d363" requirePermission="false" />
-  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --><sectionGroup name="imageProcessor">
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --><!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+  <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  <sectionGroup name="imageProcessor">
       <section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" />
       <section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" />
       <section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web" />
-    </sectionGroup><!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-  <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
+    </sectionGroup></configSections>
   <umbracoConfiguration>
     <settings configSource="config\umbracoSettings.config" />
     <BaseRestExtensions configSource="config\BaseRestExtensions.config" />
@@ -292,9 +292,9 @@
       <remove name="ClientDependencyModule" />
       <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
       
-    <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
+    
     <remove name="WebDAVModule" />
-      </modules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></modules>
     <handlers accessPolicy="Read, Write, Script, Execute">
       <remove name="WebServiceHandlerFactory-Integrated" />
       <remove name="ScriptHandlerFactory" />
@@ -347,8 +347,8 @@
         <requestLimits maxAllowedContentLength="1000000000" />
       </requestFiltering>
     </security>
-    <validation validateIntegratedModeConfiguration="false" />
-  </system.webServer>
+    
+  <validation validateIntegratedModeConfiguration="false" /></system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <!-- Old asp.net ajax assembly bindings -->
diff --git a/WebCms/WebCms.csproj b/WebCms/WebCms.csproj
index 6de39fe..ba3b977 100644
--- a/WebCms/WebCms.csproj
+++ b/WebCms/WebCms.csproj
@@ -105,11 +105,11 @@
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor.Web, Version=4.8.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.Web.4.8.7\lib\net45\ImageProcessor.Web.dll</HintPath>
+    <Reference Include="ImageProcessor.Web, Version=4.10.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.4.10.0.100\lib\net452\ImageProcessor.Web.dll</HintPath>
     </Reference>
     <Reference Include="interfaces, Version=1.0.6820.12874, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.7.12.2\lib\net45\interfaces.dll</HintPath>
diff --git a/WebCms/packages.config b/WebCms/packages.config
index da9dab1..3f93949 100644
--- a/WebCms/packages.config
+++ b/WebCms/packages.config
@@ -14,9 +14,9 @@
   <package id="Hangfire.Core" version="1.6.20" targetFramework="net452" />
   <package id="Hangfire.SqlServer" version="1.6.20" targetFramework="net452" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net452" />
-  <package id="ImageProcessor" version="2.5.6" targetFramework="net452" />
-  <package id="ImageProcessor.Web" version="4.8.7" targetFramework="net452" />
-  <package id="ImageProcessor.Web.Config" version="2.3.1" targetFramework="net452" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net452" />
+  <package id="ImageProcessor.Web" version="4.10.0.100" targetFramework="net452" />
+  <package id="ImageProcessor.Web.Config" version="2.5.0.100" targetFramework="net452" />
   <package id="jQuery" version="1.12.4" targetFramework="net452" />
   <package id="jQuery.UI.Combined" version="1.12.1" targetFramework="net452" />
   <package id="jquery.validate.unobtrusive.bootstrap" version="1.2.3" targetFramework="net452" />