ImageProcessor.Plugins.Cair v1.0.0

Former-commit-id: 1e5dbabd84e93e80b32c3a4bfb106109d3b46dcc

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>

build/Build.bat

@@ -4,8 +4,11 @@ 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
@@ -13,12 +16,14 @@ 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

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>

build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec

@@ -9,16 +9,22 @@
     <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.
+    <description>
+      Adds support to ImageProcessor for the WebP image format.
 
       If you use ImageProcessor please get in touch via my twitter @james_m_south
 
-Feedback is always welcome</description>
+      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>
+    <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" />

build/NuSpecs/ImageProcessor.Web.Config.nuspec

@@ -9,16 +9,22 @@
     <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.
+    <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
 
-Feedback is always welcome</description>
+      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>
+    <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" />

build/NuSpecs/ImageProcessor.Web.nuspec

@@ -9,18 +9,24 @@
     <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.
+    <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.
 
       If you use ImageProcessor please get in touch via my twitter @james_m_south
 
-Feedback is always welcome</description>
+      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>
+    <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" />

build/NuSpecs/ImageProcessor.nuspec

@@ -9,18 +9,24 @@
     <projectUrl>http://imageprocessor.org</projectUrl>
     <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Image Processor is an easy to use and extend processing library written in C#. Its fluent API makes common imaging tasks very simple to perform.
+    <description>
+      Image Processor is an easy to use and extend processing library written in C#. Its fluent API makes common imaging tasks very simple to perform.
 
       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 on my twitter @james_m_south.
 
-Feedback is always welcome.</description>
+      Feedback is always welcome.
+    </description>
     <summary>A library for manipulating image files written in C#.</summary>
     <releaseNotes />
     <copyright>James South</copyright>
     <language>en-GB</language>
-        <tags>Image Imaging ASP Performance Processing 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>
+    <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>
   </metadata>
   <files>
     <file src="..\_BuildOutput\ImageProcessor\lib\net45\ImageProcessor.dll" target="lib\net45\ImageProcessor.dll" />

src/ImageProcessorConsole/Program.cs

@@ -12,11 +12,13 @@ namespace ImageProcessorConsole
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Drawing;
     using System.IO;
     using System.Linq;
     using ImageProcessor;
     using ImageProcessor.Plugins.Cair;
+    using ImageProcessor.Plugins.Cair.Imaging;
 
     /// <summary>
     /// The program.
@@ -48,6 +50,11 @@ namespace ImageProcessorConsole
             {
                 byte[] photoBytes = File.ReadAllBytes(fileInfo.FullName);
 
+                Console.WriteLine("Processing: " + fileInfo.Name);
+
+                Stopwatch stopwatch = new Stopwatch();
+                stopwatch.Start();
+
                 // ImageProcessor
                 using (MemoryStream inStream = new MemoryStream(photoBytes))
                 {
@@ -55,15 +62,24 @@ namespace ImageProcessorConsole
                     {
                         Size size = new Size(800, 0);
 
+                        ContentAwareResizeLayer layer = new ContentAwareResizeLayer(size)
+                        {
+                            ConvolutionType = ConvolutionType.Sobel
+                        };
+
                         // Load, resize, set the format and quality and save an image.
                         imageFactory.Load(inStream)
                             //.BackgroundColor(Color.White)
                             //.Resize(new Size((int)(size.Width * 1.1), 0))
-                            .ContentAwareResize(size)
+                            .ContentAwareResize(layer)
                             //.Constrain(size)
                             .Save(Path.GetFullPath(Path.Combine(Path.GetDirectoryName(path), @"..\..\images\output", fileInfo.Name)));
+
+                        stopwatch.Stop();
                     }
                 }
+
+                Console.WriteLine("Processed: " + fileInfo.Name + " in " + stopwatch.ElapsedMilliseconds + "ms");
             }
         }
 

src/ImageProcessorConsole/images/output/2006-citybus.jpg.REMOVED.git-id

@@ -1 +1 @@
-33f7e25da5675197f18bb2fa2c9fe5fa366e84ec
+c6cb11afaf9fdb9181772246e5c873d8f7d1b99c

src/ImageProcessorConsole/images/output/2008.jpg.REMOVED.git-id

@@ -1 +1 @@
-f24f17627804b11d823240d49c91ec17fb7fd55d
+10b48cac44776a023df7585ba2c68c3f51b0f803

src/ImageProcessorConsole/images/output/2012-citybus.jpg.REMOVED.git-id

@@ -1 +1 @@
-def19dd7469cf2eba1f595e7263d9d48fda85825
+e631eb3491496bb83f99cd41a752f79c9d7f6830

src/ImageProcessorConsole/images/output/Arc-de-Triomphe-France.jpg.REMOVED.git-id

@@ -1 +1 @@
-8cf61b55acca1a3d1a69177ddc439685ee0ba192
+782056919992bb7e453eeee5d9c0034e03b57506

src/ImageProcessorConsole/images/output/Image with gaps.jpg.REMOVED.git-id

@@ -1 +1 @@
-629284a6f834f5d1cf185e3603a50c484dd9121a
+1d9ded0201edcd248140b4ec02f69ccdb4b539e5

src/ImageProcessorConsole/images/output/arc_de_triomphe_paris_france.jpg.REMOVED.git-id

@@ -1 +1 @@
-3d652e0628f2042e7aca0751384ba21f1182ef5f
+2880457cc09cd2897b5f9f377807ec22f8f83013

src/ImageProcessorConsole/images/output/mountain.jpg.REMOVED.git-id

@@ -1 +1 @@
-1c48519b2675b9dd90e8e95d6421148b25b8c317
+34dcced6c7c3e4dd6fae239eba8eddef6234028d

src/ImageProcessorConsole/images/output/rotate.jpg.REMOVED.git-id

@@ -1 +1 @@
-a0aa8338f74f3539c2531f43fa9027a3ce0a39fb
+de6754762f7705f9109ea364f42ca128e454e853

src/ImageProcessorConsole/images/output/shutterstock_19173982_Arc_de_triomphe-square1.jpg.REMOVED.git-id

@@ -1 +1 @@
-04f6093d3345a4c8b48333c32972753dd0949730
+24db72130626e81b9a4262c891dd28e6d97e5a96

src/ImageProcessorConsole/images/output/test.jpg.REMOVED.git-id

@@ -1 +1 @@
-f7b1543810ada7598773d6ee31bc7c0c20afaa9f
+4885438f0b97e3aae59d6e214b5ec455358ae225

src/Plugins/ImageProcessor/ImageProcessor.Plugins.Cair/Processors/ContentAwareResize.cs

@@ -131,13 +131,7 @@ namespace ImageProcessor.Plugins.Cair.Processors
                         arguments = string.Format("{0} -W {1}", arguments, layer.WeightPath);
                     }
 
-                    bool success = this.ProcessCairImage(arguments, timeout);
+                    this.ProcessCairImage(arguments, timeout);
-
-                    if (!success)
-                    {
-                        throw new ImageProcessingException(
-                            "Error processing image with " + this.GetType().Name + " due to timeout.");
-                    }
 
                     // Assign the new image.
                     newImage = new Bitmap(resizedPath);
@@ -184,10 +178,7 @@ namespace ImageProcessor.Plugins.Cair.Processors
         /// <param name="timeout">
         /// The time in milliseconds to attempt to resize the image for.
         /// </param>
-        /// <returns>
+        private void ProcessCairImage(string arguments, int timeout)
-        /// The <see cref="bool"/>.
-        /// </returns>
-        private bool ProcessCairImage(string arguments, int timeout)
         {
             // Set up and start a new process to resize the image.
             ProcessStartInfo start = new ProcessStartInfo(CairBootstrapper.CairExecutablePath, arguments)
@@ -204,18 +195,21 @@ namespace ImageProcessor.Plugins.Cair.Processors
             {
                 if (process != null)
                 {
-                    bool result = process.WaitForExit(timeout);
+                    if (!process.WaitForExit(timeout))
-
-                    if (!result)
                     {
                         process.Kill();
+
+                        throw new ImageProcessingException("Error processing image with " + this.GetType().Name + " due to timeout.");
                     }
 
-                    return result;
+                    string output = string.Format(" {0} {1}", process.StandardError.ReadToEnd(), process.StandardOutput.ReadToEnd());
+
+                    if (process.ExitCode != 0)
+                    {
+                        throw new ImageProcessingException("Error processing image with " + this.GetType().Name + output);
+                    }
                 }
             }
-
-            return false;
         }
     }
 }