From a90bea039a45419915d90b936bb82f6596376718 Mon Sep 17 00:00:00 2001 From: James South Date: Tue, 11 Nov 2014 10:25:16 +0000 Subject: [PATCH] IP v2.1.0 and IP.Web v4.1.0 Added new methods Pixelate DetectEdges EntropyCrop Mask Overlay Added new Wu Quantizer for processing indexed png files. Added new IImageServices for adding custom image providers. Numerous performance improvements and bug fixes. Former-commit-id: 4f639f696c669c833456b3e4daa97f70add6e939 Former-commit-id: c3ed74e3d1c88ac8bb83f0428c0fc8ea6010282c --- .../ImageProcessor.Plugins.Cair.nuspec | 48 ++++++++-------- .../ImageProcessor.Plugins.WebP.nuspec | 50 ++++++++--------- .../NuSpecs/ImageProcessor.Web.Config.nuspec | 56 +++++++++---------- build/NuSpecs/ImageProcessor.Web.nuspec | 50 ++++++++--------- build/NuSpecs/ImageProcessor.nuspec | 40 ++++++------- .../Helpers/CommonParameterParserUtility.cs | 2 +- src/ImageProcessor.Web/Processors/Rotate.cs | 2 +- 7 files changed, 124 insertions(+), 124 deletions(-) diff --git a/build/NuSpecs/ImageProcessor.Plugins.Cair.nuspec b/build/NuSpecs/ImageProcessor.Plugins.Cair.nuspec index 02b2c8e3e3..229c2bb9f5 100644 --- a/build/NuSpecs/ImageProcessor.Plugins.Cair.nuspec +++ b/build/NuSpecs/ImageProcessor.Plugins.Cair.nuspec @@ -1,31 +1,31 @@  - - ImageProcessor.Plugins.Cair - 1.0.0.0 - ImageProcessor.Plugins.Cair - James South - James South - http://imageprocessor.org - http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png - false - Adds support to ImageProcessor for Content Aware Image Resizing. + + ImageProcessor.Plugins.Cair + 1.0.0.0 + ImageProcessor.Plugins.Cair + James South + James South + http://imageprocessor.org + http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png + false + 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 - Adds support to ImageProcessor for Content Aware Image Resizing. - - James South - en-GB - 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 - - - - - - - - - + Adds support to ImageProcessor for Content Aware Image Resizing. + + James South + en-GB + 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 Pixilate EdgeDetect Mask Overlay + + + + + + + + + \ No newline at end of file diff --git a/build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec b/build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec index 7e742502bc..64239ac24d 100644 --- a/build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec +++ b/build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec @@ -1,32 +1,32 @@  - - ImageProcessor.Plugins.WebP - 1.0.1.0 - ImageProcessor.Plugins.WebP - James South - James South - http://imageprocessor.org - http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png - false - Adds support to ImageProcessor for the WebP image format. + + ImageProcessor.Plugins.WebP + 1.0.1.0 + ImageProcessor.Plugins.WebP + James South + James South + http://imageprocessor.org + http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png + false + 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 - Adds support to ImageProcessor for the WebP image format. - - James South - en-GB - 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 - - - - - - - - - - + Adds support to ImageProcessor for the WebP image format. + + James South + en-GB + 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 Pixilate EdgeDetect Mask Overlay + + + + + + + + + + \ No newline at end of file diff --git a/build/NuSpecs/ImageProcessor.Web.Config.nuspec b/build/NuSpecs/ImageProcessor.Web.Config.nuspec index 7a20f3db3e..9f190539f4 100644 --- a/build/NuSpecs/ImageProcessor.Web.Config.nuspec +++ b/build/NuSpecs/ImageProcessor.Web.Config.nuspec @@ -1,35 +1,35 @@  - - ImageProcessor.Web.Config - 2.1.0.0 - ImageProcessor.Web.Config - James South - James South - http://imageprocessor.org - http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png - false - Adds configuration to your ImageProcessor.Web solution to allow you to override the default settings. + + ImageProcessor.Web.Config + 2.1.0.0 + ImageProcessor.Web.Config + James South + James South + http://imageprocessor.org + http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png + false + 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 - ImageProcessor.Web configuration settings for ASP.NET websites. - - James South - en-GB - 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 - - - - - - - - - - - - - + ImageProcessor.Web configuration settings for ASP.NET websites. + + James South + en-GB + 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 Pixilate EdgeDetect Mask Overlay + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/NuSpecs/ImageProcessor.Web.nuspec b/build/NuSpecs/ImageProcessor.Web.nuspec index 0e5b1eeaca..e3bdef1319 100644 --- a/build/NuSpecs/ImageProcessor.Web.nuspec +++ b/build/NuSpecs/ImageProcessor.Web.nuspec @@ -1,34 +1,34 @@  - - ImageProcessor.Web - 4.1.0.0 - ImageProcessor.Web - James South - James South - http://imageprocessor.org - http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png - false - 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. + + ImageProcessor.Web + 4.1.0.0 + ImageProcessor.Web + James South + James South + http://imageprocessor.org + http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png + false + 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 - An extension to ImageProcessor that allows on-the-fly processing of image files in an ASP.NET website - - James South - en-GB - 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 - - - - - - - - - - + An extension to ImageProcessor that allows on-the-fly processing of image files in an ASP.NET website + + James South + en-GB + 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 Pixilate EdgeDetect Mask Overlay + + + + + + + + + + \ No newline at end of file diff --git a/build/NuSpecs/ImageProcessor.nuspec b/build/NuSpecs/ImageProcessor.nuspec index 18b8b467f7..db9351f2e9 100644 --- a/build/NuSpecs/ImageProcessor.nuspec +++ b/build/NuSpecs/ImageProcessor.nuspec @@ -1,29 +1,29 @@  - - ImageProcessor - 2.1.0.0 - ImageProcessor - James South - James South - http://imageprocessor.org - http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png - false - 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. + + ImageProcessor + 2.1.0.0 + ImageProcessor + James South + James South + http://imageprocessor.org + http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png + false + 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. - A library for manipulating image files written in C#. - - James South - en-GB - 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 - - - - - + A library for manipulating image files written in C#. + + James South + en-GB + 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 Pixilate EdgeDetect Mask Overlay + + + + + \ No newline at end of file diff --git a/src/ImageProcessor.Web/Helpers/CommonParameterParserUtility.cs b/src/ImageProcessor.Web/Helpers/CommonParameterParserUtility.cs index 0f252a5702..a7113d37f2 100644 --- a/src/ImageProcessor.Web/Helpers/CommonParameterParserUtility.cs +++ b/src/ImageProcessor.Web/Helpers/CommonParameterParserUtility.cs @@ -39,7 +39,7 @@ namespace ImageProcessor.Web.Helpers /// /// The regular expression to search strings for angles. /// - private static readonly Regex AngleRegex = new Regex(@"([^.](&,=)?rotate|angle)(=|-)(-)?\d+(.?\d+)?", RegexOptions.Compiled); + private static readonly Regex AngleRegex = new Regex(@"(^(rotate|angle)|[^.](&,)?rotate|angle)(=|-)[^&|,]+", RegexOptions.Compiled); /// /// The regular expression to search strings for values between 1 and 100. diff --git a/src/ImageProcessor.Web/Processors/Rotate.cs b/src/ImageProcessor.Web/Processors/Rotate.cs index 155b4a2869..fd2deb42b6 100644 --- a/src/ImageProcessor.Web/Processors/Rotate.cs +++ b/src/ImageProcessor.Web/Processors/Rotate.cs @@ -22,7 +22,7 @@ namespace ImageProcessor.Web.Processors /// /// The regular expression to search strings for. /// - private static readonly Regex QueryRegex = new Regex(@"([^.](&,=)?rotate|angle)(=|-)[^&|,]+", RegexOptions.Compiled); + private static readonly Regex QueryRegex = new Regex(@"(^(rotate|angle)|[^.](&,)?rotate|angle)(=|-)[^&|,]+", RegexOptions.Compiled); /// /// Initializes a new instance of the class.