Merging v2 branch

Former-commit-id: 1608798677ced0acfefc47aa1d2a3d55ca9f4d05
SixLabors · Sep 7, 2014 · cfe1758 · cfe1758
1 parent 65accb9
commit cfe1758
Show file tree

Hide file tree

Showing 26 changed files with 436 additions and 267 deletions.
diff --git a/build/Build.ImageProcessor.Plugins.Cair.proj b/build/Build.ImageProcessor.Plugins.Cair.proj
@@ -0,0 +1,54 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildCommunityTasksPath>.\</MSBuildCommunityTasksPath>
+  </PropertyGroup>
+
+  <Import Project=".\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+
+  <!--
+ ****************************************************
+ VARIABLES
+ *****************************************************
+ -->
+
+  <PropertyGroup>
+    <BuildConfiguration>Release</BuildConfiguration>
+    <BuildFolder>_BuildOutput\</BuildFolder>
+    <IncludeSymbols>False</IncludeSymbols>
+    <BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
+    <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)ImageProcessor.Plugins.Cair\lib\net45</SolutionBinFolderAbsolutePath>
+    <BuildInputDir>..\src\Plugins\ImageProcessor\ImageProcessor.Plugins.Cair\</BuildInputDir>
+  </PropertyGroup>
+
+  <!--
+ ****************************************************
+ TARGETS
+ *****************************************************
+ -->
+
+ <Target Name="Build" DependsOnTargets="BuildImageProcessorPluginsCair">
+    <Message Text="Build finished" />
+ </Target>
+
+  <Target Name="BuildImageProcessorPluginsCair" DependsOnTargets="SetVersionNumber">
+    <Message Text="Compiling ImageProcessor.Plugins.Cair project to build\$(BuildFolder)" Importance="High" />
+
+	<MSBuild Projects="$(BuildInputDir)\ImageProcessor.Plugins.Cair.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False" />
+
+    <Message Text="Finished compiling project" Importance="High" />
+  </Target>
+
+  <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
+    <Message Text="Creating Version File: $(BUILD_RELEASE)"/>
+    <ItemGroup>
+      <AssemblyFiles Include="$(BuildInputDir)Properties\AssemblyInfo.cs;" />
+	  </ItemGroup>
+
+    <FileUpdate Files="@(AssemblyFiles)"
+        Multiline="true"
+        Singleline="false"
+        Regex="(AssemblyVersion|AssemblyFileVersionAttribute|AssemblyFileVersion)\(&quot;([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)?&quot;\)"
+        ReplacementText="$1(&quot;$(BUILD_RELEASE)&quot;)" />
+
+  </Target>
+</Project>
diff --git a/build/Build.bat b/build/Build.bat
@@ -4,21 +4,26 @@ SET version=2.0.1.0
 SET webversion=4.0.0.0
 SET webconfigversion=2.0.0.0
 SET webppluginversion=1.0.1.0
+SET cairpluginversion=1.0.0.0
 
-ECHO Building ImageProcessor %version%, ImageProcessor.Web %webversion%, ImageProcessor.Web.Config %webconfigversion%, and ImageProcessor.Plugins.WebP %webppluginversion%
+ECHO Building ImageProcessor %version%, ImageProcessor.Web %webversion%, ImageProcessor.Web.Config %webconfigversion%
+
+ECHO Building ImageProcessor.Plugins.WebP %webppluginversion%, ImageProcessor.Plugins.Cair %cairpluginversion%
 
 ECHO Removing _BuildOutput directory so everything is nice and clean
 RD _BuildOutput /q /s
 
 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.proj" /p:BUILD_RELEASE=%version% /p:BUILD_COMMENT=%comment%
 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.Web.proj" /p:BUILD_RELEASE=%webversion% /p:BUILD_COMMENT=%comment%
 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.Plugins.WebP.proj" /p:BUILD_RELEASE=%webppluginversion% /p:BUILD_COMMENT=%comment%
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.Plugins.Cair.proj" /p:BUILD_RELEASE=%cairpluginversion% /p:BUILD_COMMENT=%comment%
 
 ECHO Packing the NuGet release files
 ..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.nuspec -Version %version%
 ..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Web.nuspec -Version %webversion%
 ..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Web.Config.nuspec -Version %webconfigversion%
 ..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Plugins.WebP.nuspec -Version %webppluginversion%
+..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Plugins.Cair.nuspec -Version %cairpluginversion%
 PAUSE
 
 IF ERRORLEVEL 1 GOTO :showerror

diff --git a/build/NuSpecs/ImageProcessor.Plugins.Cair.nuspec b/build/NuSpecs/ImageProcessor.Plugins.Cair.nuspec
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>ImageProcessor.Plugins.Cair</id>
+    <version>1.0.0.0</version>
+    <title>ImageProcessor.Plugins.Cair</title>
+    <authors>James South</authors>
+    <owners>James South</owners>
+    <projectUrl>http://imageprocessor.org</projectUrl>
+    <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>
+      Adds support to ImageProcessor for Content Aware Image Resizing.
+
+      If you use ImageProcessor please get in touch via my twitter @james_m_south
+
+      Feedback is always welcome
+    </description>
+    <summary>Adds support to ImageProcessor for Content Aware Image Resizing.</summary>
+    <releaseNotes />
+    <copyright>James South</copyright>
+    <language>en-GB</language>
+    <tags>
+      Image Imaging ASP Performance Processing HttpModule Cache Resize AutoRotate Rotate RoundedCorners
+      Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg
+      Bitmap Png WebP Tiff Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF Cair SeamCarving
+    </tags>
+    <dependencies>
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="ImageProcessor" version="2.0.0.0" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\_BuildOutput\ImageProcessor.Plugins.Cair\lib\net45\ImageProcessor.Plugins.Cair.dll" target="lib\net45\ImageProcessor.Plugins.Cair.dll" />
+  </files>
+</package>
diff --git a/build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec b/build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec
@@ -1,32 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>ImageProcessor.Plugins.WebP</id>
-        <version>1.0.0.0</version>
-        <title>ImageProcessor.Plugins.WebP</title>
-        <authors>James South</authors>
-        <owners>James South</owners>
-        <projectUrl>http://imageprocessor.org</projectUrl>
-        <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Adds support to ImageProcessor for the WebP image format.
+  <metadata>
+    <id>ImageProcessor.Plugins.WebP</id>
+    <version>1.0.0.0</version>
+    <title>ImageProcessor.Plugins.WebP</title>
+    <authors>James South</authors>
+    <owners>James South</owners>
+    <projectUrl>http://imageprocessor.org</projectUrl>
+    <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>
+      Adds support to ImageProcessor for the WebP image format.
 
-If you use ImageProcessor please get in touch via my twitter @james_m_south
+      If you use ImageProcessor please get in touch via my twitter @james_m_south
 
-Feedback is always welcome</description>
-        <summary>Adds support to ImageProcessor for the WebP image format.</summary>
-        <releaseNotes />
-        <copyright>James South</copyright>
-        <language>en-GB</language>
-        <tags>Image Imaging ASP Performance Processing HttpModule Cache Resize Rotate RoundedCorners Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg Bitmap Png WebP Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated</tags>
-        <dependencies>
-            <group targetFramework=".NETFramework4.5">
-                <dependency id="ImageProcessor" version="2.0.0.0" />
-            </group>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="..\_BuildOutput\ImageProcessor.Plugins.WebP\lib\net45\ImageProcessor.Plugins.WebP.dll" target="lib\net45\ImageProcessor.Plugins.WebP.dll" />
-        <file src="..\content\ImageProcessor.Plugins.WebP\web.config.transform" target="content\web.config.transform" />
-    </files>
+      Feedback is always welcome
+    </description>
+    <summary>Adds support to ImageProcessor for the WebP image format.</summary>
+    <releaseNotes />
+    <copyright>James South</copyright>
+    <language>en-GB</language>
+    <tags>
+      Image Imaging ASP Performance Processing HttpModule Cache Resize AutoRotate Rotate RoundedCorners
+      Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg
+      Bitmap Png WebP Tiff Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF Cair SeamCarving
+    </tags>
+    <dependencies>
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="ImageProcessor" version="2.0.0.0" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\_BuildOutput\ImageProcessor.Plugins.WebP\lib\net45\ImageProcessor.Plugins.WebP.dll" target="lib\net45\ImageProcessor.Plugins.WebP.dll" />
+    <file src="..\content\ImageProcessor.Plugins.WebP\web.config.transform" target="content\web.config.transform" />
+  </files>
 </package>
diff --git a/build/NuSpecs/ImageProcessor.Web.Config.nuspec b/build/NuSpecs/ImageProcessor.Web.Config.nuspec
@@ -1,35 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>ImageProcessor.Web.Config</id>
-        <version>1.1.0.0</version>
-        <title>ImageProcessor.Web.Config</title>
-        <authors>James South</authors>
-        <owners>James South</owners>
-        <projectUrl>http://imageprocessor.org</projectUrl>
-        <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Adds configuration to your ImageProcessor.Web solution to allow you to override the default settings.
+  <metadata>
+    <id>ImageProcessor.Web.Config</id>
+    <version>1.1.0.0</version>
+    <title>ImageProcessor.Web.Config</title>
+    <authors>James South</authors>
+    <owners>James South</owners>
+    <projectUrl>http://imageprocessor.org</projectUrl>
+    <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>
+      Adds configuration to your ImageProcessor.Web solution to allow you to override the default settings.
 
-If you use ImageProcessor please get in touch via my twitter @james_m_south
+      If you use ImageProcessor please get in touch via my twitter @james_m_south
 
-Feedback is always welcome</description>
-        <summary>ImageProcessor.Web configuration settings for ASP.NET websites.</summary>
-        <releaseNotes />
-        <copyright>James South</copyright>
-        <language>en-GB</language>
-        <tags>Image Imaging ASP Performance Processing HttpModule Cache Resize Rotate RoundedCorners Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg Bitmap Png WebP Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated</tags>
-        <dependencies>
-            <group targetFramework=".NETFramework4.5">
-                <dependency id="ImageProcessor" version="2.0.0.0" />
-                <dependency id="ImageProcessor.Web" version="4.0.0.0" />
-            </group>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="..\..\src\ImageProcessor.Web\Configuration\Resources\cache.config" target="content\config\imageprocessor\cache.config" />
-        <file src="..\..\src\ImageProcessor.Web\Configuration\Resources\processing.config" target="content\config\imageprocessor\processing.config" />
-        <file src="..\..\src\ImageProcessor.Web\Configuration\Resources\security.config" target="content\config\imageprocessor\security.config" />
-        <file src="..\content\ImageProcessor.Web.Config\web.config.transform" target="content\web.config.transform" />
-    </files>
+      Feedback is always welcome
+    </description>
+    <summary>ImageProcessor.Web configuration settings for ASP.NET websites.</summary>
+    <releaseNotes />
+    <copyright>James South</copyright>
+    <language>en-GB</language>
+    <tags>
+      Image Imaging ASP Performance Processing HttpModule Cache Resize AutoRotate Rotate RoundedCorners
+      Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg
+      Bitmap Png WebP Tiff Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF Cair SeamCarving
+    </tags>
+    <dependencies>
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="ImageProcessor" version="2.0.0.0" />
+        <dependency id="ImageProcessor.Web" version="4.0.0.0" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\src\ImageProcessor.Web\Configuration\Resources\cache.config" target="content\config\imageprocessor\cache.config" />
+    <file src="..\..\src\ImageProcessor.Web\Configuration\Resources\processing.config" target="content\config\imageprocessor\processing.config" />
+    <file src="..\..\src\ImageProcessor.Web\Configuration\Resources\security.config" target="content\config\imageprocessor\security.config" />
+    <file src="..\content\ImageProcessor.Web.Config\web.config.transform" target="content\web.config.transform" />
+  </files>
 </package>
diff --git a/build/NuSpecs/ImageProcessor.Web.nuspec b/build/NuSpecs/ImageProcessor.Web.nuspec
@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-    <metadata>
-        <id>ImageProcessor.Web</id>
-        <version>3.2.0.0</version>
-        <title>ImageProcessor.Web</title>
-        <authors>James South</authors>
-        <owners>James South</owners>
-        <projectUrl>http://imageprocessor.org</projectUrl>
-        <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>ImageProcessor.Web adds a configurable HttpModule to your website which allows on-the-fly processing of image files. The module also comes with a file and browser based cache that can handle millions of images, increasing your processing output and saving precious server memory.
+  <metadata>
+    <id>ImageProcessor.Web</id>
+    <version>3.2.0.0</version>
+    <title>ImageProcessor.Web</title>
+    <authors>James South</authors>
+    <owners>James South</owners>
+    <projectUrl>http://imageprocessor.org</projectUrl>
+    <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>
+      ImageProcessor.Web adds a configurable HttpModule to your website which allows on-the-fly processing of image files. The module also comes with a file and browser based cache that can handle millions of images, increasing your processing output and saving precious server memory.
 
-Methods include: Resize, Rotate, Rounded Corners, Flip, Crop, Watermark, Filter, Saturation, Brightness, Contrast, Quality, Format, Vignette, Gaussian Blur, Gaussian Sharpen, and Transparency.
+      Methods include: Resize, Rotate, Rounded Corners, Flip, Crop, Watermark, Filter, Saturation, Brightness, Contrast, Quality, Format, Vignette, Gaussian Blur, Gaussian Sharpen, and Transparency.
 
-If you use ImageProcessor please get in touch via my twitter @james_m_south
+      If you use ImageProcessor please get in touch via my twitter @james_m_south
 
-Feedback is always welcome</description>
-        <summary>An extension to ImageProcessor that allows on-the-fly processing of image files in an ASP.NET website</summary>
-        <releaseNotes />
-        <copyright>James South</copyright>
-        <language>en-GB</language>
-        <tags>Image Imaging ASP Performance Processing HttpModule Cache Resize AutoRotate Rotate RoundedCorners Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg Bitmap Png WebP Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF</tags>
-        <dependencies>
-            <group targetFramework=".NETFramework4.5">
-                <dependency id="ImageProcessor" version="2.0.0.0" />
-            </group>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="..\content\ImageProcessor.Web\web.config.transform" target="content\web.config.transform" />
-        <file src="..\_BuildOutput\ImageProcessor.Web\lib\net45\ImageProcessor.Web.dll" target="lib\net45\ImageProcessor.Web.dll" />
-    </files>
+      Feedback is always welcome
+    </description>
+    <summary>An extension to ImageProcessor that allows on-the-fly processing of image files in an ASP.NET website</summary>
+    <releaseNotes />
+    <copyright>James South</copyright>
+    <language>en-GB</language>
+    <tags>
+      Image Imaging ASP Performance Processing HttpModule Cache Resize AutoRotate Rotate RoundedCorners
+      Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg
+      Bitmap Png WebP Tiff Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF Cair SeamCarving
+    </tags>
+    <dependencies>
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="ImageProcessor" version="2.0.0.0" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\content\ImageProcessor.Web\web.config.transform" target="content\web.config.transform" />
+    <file src="..\_BuildOutput\ImageProcessor.Web\lib\net45\ImageProcessor.Web.dll" target="lib\net45\ImageProcessor.Web.dll" />
+  </files>
 </package>