Added Reset, tweaked Gotham and fixed ToArray() bug.

Author: JimBobSquarePants

src/ImageProcessor.Web/Config/ImageProcessorConfig.cs

@@ -257,7 +257,7 @@ private void LoadGraphicsProcessors()
                     // Add the available settings.
                     foreach (IGraphicsProcessor processor in this.GraphicsProcessors)
                     {
-                        processor.Settings = this.GetPluginSettings(processor.Name);
+                        processor.Settings = this.GetPluginSettings(processor.GetType().Name);
                     }
                 }
                 catch (ReflectionTypeLoadException ex)

src/ImageProcessor/Helpers/Extensions/StringExtensions.cs

@@ -114,11 +114,11 @@ public static string ToSHA512Fingerprint(this string expression)
         /// </summary>
         /// <param name="expression">The <see cref="T:System.String">String</see> instance that this method extends.</param>
         /// <returns>An array of integers scraped from the String.</returns>
-        public static int[] ToIntegerArray(this string expression)
+        public static int[] ToPositiveIntegerArray(this string expression)
         {
             Contract.Requires(!string.IsNullOrWhiteSpace(expression));
 
-            Regex regex = new Regex(@"(-|)\d+", RegexOptions.Compiled);
+            Regex regex = new Regex(@"\d+", RegexOptions.Compiled);
 
             MatchCollection matchCollection = regex.Matches(expression);
 

src/ImageProcessor/ImageFactory.cs

@@ -30,6 +30,11 @@ public class ImageFactory : IDisposable
         /// </summary>
         private const int DefaultJpegQuality = 90;
 
+        /// <summary>
+        /// The backup image format.
+        /// </summary>
+        private ImageFormat backupImageFormat;
+
         /// <summary>
         /// A value indicating whether this instance of the given entity has been disposed.
         /// </summary>
@@ -117,6 +122,7 @@ public ImageFactory Load(MemoryStream memoryStream)
 
             // Set the other properties.
             this.JpegQuality = DefaultJpegQuality;
+            this.backupImageFormat = ImageFormat.Jpeg;
             this.ImageFormat = ImageFormat.Jpeg;
             this.ShouldProcess = true;
 
@@ -167,14 +173,47 @@ public ImageFactory Load(string imagePath)
 
                     // Set the other properties.
                     this.JpegQuality = DefaultJpegQuality;
-                    this.ImageFormat = ImageUtils.GetImageFormat(imageName);
+                    ImageFormat imageFormat = ImageUtils.GetImageFormat(imageName);
+                    this.backupImageFormat = imageFormat;
+                    this.ImageFormat = imageFormat;
                     this.ShouldProcess = true;
                 }
             }
 
             return this;
         }
 
+        /// <summary>
+        /// Resets the ImageFactory to its original loaded state.
+        /// </summary>
+        /// <returns>
+        /// The current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
+        /// </returns>
+        public ImageFactory Reset()
+        {
+            if (this.ShouldProcess)
+            {
+                MemoryStream memoryStream = (MemoryStream)this.Image.Tag;
+
+                // Set our new image as the memorystream value.
+                Image newImage = Image.FromStream(memoryStream);
+
+                // Store the stream in the image Tag property so we can dispose of it later.
+                newImage.Tag = memoryStream;
+
+                // Dispose and reassign the image.
+                this.Image.Dispose();
+                this.Image = newImage;
+
+                // Set the other properties.
+                this.JpegQuality = DefaultJpegQuality;
+                this.ImageFormat = this.backupImageFormat;
+            }
+
+            return this;
+        }
+
+
         #region Manipulation
         /// <summary>
         /// Adds a query-string to the image factory to allow auto-processing of remote files.
@@ -441,7 +480,7 @@ public ImageFactory Rotate(RotateLayer rotateLayer)
         /// <returns>
         /// The current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
         /// </returns>
-        public ImageFactory Saturate(int percentage)
+        public ImageFactory Saturation(int percentage)
         {
             if (this.ShouldProcess)
             {
@@ -451,7 +490,7 @@ public ImageFactory Saturate(int percentage)
                     percentage = 0;
                 }
 
-                Saturate saturate = new Saturate { DynamicParameter = percentage };
+                Saturation saturate = new Saturation { DynamicParameter = percentage };
 
                 this.Image = saturate.ProcessImage(this);
             }
@@ -504,7 +543,10 @@ public ImageFactory Watermark(TextLayer textLayer)
         /// Saves the current image to the specified file path.
         /// </summary>
         /// <param name="filePath">The path to save the image to.</param>
-        public void Save(string filePath)
+        /// <returns>
+        /// The current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
+        /// </returns>
+        public ImageFactory Save(string filePath)
         {
             if (this.ShouldProcess)
             {
@@ -527,16 +569,18 @@ public void Save(string filePath)
                             ImageCodecInfo.GetImageEncoders().FirstOrDefault(
                                 ici => ici.MimeType.Equals("image/jpeg", StringComparison.OrdinalIgnoreCase));
 
-// ReSharper disable AssignNullToNotNullAttribute
+                        // ReSharper disable AssignNullToNotNullAttribute
                         this.Image.Save(filePath, imageCodecInfo, encoderParameters);
-// ReSharper restore AssignNullToNotNullAttribute
+                        // ReSharper restore AssignNullToNotNullAttribute
                     }
                 }
                 else
                 {
                     this.Image.Save(filePath, this.ImageFormat);
                 }
             }
+
+            return this;
         }
 
         /// <summary>
@@ -545,7 +589,10 @@ public void Save(string filePath)
         /// <param name="memoryStream">
         /// The <see cref="T:System.IO.MemoryStream"/> to save the image information to.
         /// </param>
-        public void Save(MemoryStream memoryStream)
+        /// <returns>
+        /// The current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
+        /// </returns>
+        public ImageFactory Save(MemoryStream memoryStream)
         {
             if (this.ShouldProcess)
             {
@@ -573,6 +620,8 @@ public void Save(MemoryStream memoryStream)
                     this.Image.Save(memoryStream, this.ImageFormat);
                 }
             }
+
+            return this;
         }
 
         #region IDisposable Members

src/ImageProcessor/Imaging/Filters/ColorMatrixes.cs

@@ -10,6 +10,7 @@ namespace ImageProcessor.Imaging.Filters
     #region Using
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
     using System.Linq;
     using System.Text;
     using System.Drawing.Imaging; 
@@ -80,6 +81,7 @@ internal static ColorMatrix Polaroid
         /// <summary>
         /// Gets Lomograph.
         /// </summary>
+        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
         internal static ColorMatrix Lomograph
         {
             get
@@ -115,25 +117,6 @@ internal static ColorMatrix GreyScale
             }
         }
 
-        /// <summary>
-        /// Gets Gotham.
-        /// </summary>
-        internal static ColorMatrix Gotham
-        {
-            get
-            {
-                return new ColorMatrix(
-                    new float[][]
-                            {
-                                new float[] { .9f, .9f, .9f, 0, 0 }, 
-                                new float[] { .9f, .9f, .9f, 0, 0 }, 
-                                new float[] { .9f, .9f, .9f, 0, 0 }, 
-                                new float[] { 0, 0, 0, 1, 0 },
-                                new float[] { -.5f, -.5f, -.45f, 0, 1 }
-                            });
-            }
-        }
-
         /// <summary>
         /// Gets Invert.
         /// </summary>
@@ -156,6 +139,7 @@ internal static ColorMatrix Invert
         /// <summary>
         /// Gets HiSatch.
         /// </summary>
+        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
         internal static ColorMatrix HiSatch
         {
             get
@@ -175,6 +159,7 @@ internal static ColorMatrix HiSatch
         /// <summary>
         /// Gets LoSatch.
         /// </summary>
+        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
         internal static ColorMatrix LoSatch
         {
             get

src/ImageProcessor/Imaging/Filters/ComicMatrixFilter.cs

@@ -9,9 +9,11 @@ namespace ImageProcessor.Imaging.Filters
 {
     #region Using
     using System;
+    using System.Diagnostics.CodeAnalysis;
     using System.Drawing;
     using System.Drawing.Drawing2D;
     using System.Drawing.Imaging;
+    using System.Runtime.InteropServices;
     #endregion
 
     /// <summary>
@@ -20,8 +22,9 @@ namespace ImageProcessor.Imaging.Filters
     internal class ComicMatrixFilter : IMatrixFilter
     {
         /// <summary>
-        /// Enumurates Argb colour channels.
+        /// Enumerates Argb color channels.
         /// </summary>
+        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "Reviewed. Suppression is OK here.")]
         private enum ChannelArgb
         {
             /// <summary>
@@ -148,6 +151,7 @@ public Image TransformImage(ImageFactory factory, Image image, Image newImage)
                     patternBitmap.Dispose();
                 }
             }
+
             return image;
         }
 
@@ -185,7 +189,7 @@ private static void TransferOneArgbChannelFromOneBitmapToAnother(Bitmap source,
             byte[] sourceRgbValues = new byte[bytes];
 
             // Copy the RGB values into the array.
-            System.Runtime.InteropServices.Marshal.Copy(bitmapDataSource.Scan0, sourceRgbValues, 0, bytes);
+            Marshal.Copy(bitmapDataSource.Scan0, sourceRgbValues, 0, bytes);
 
             // Unlockbits the source.
             source.UnlockBits(bitmapDataSource);
@@ -197,7 +201,7 @@ private static void TransferOneArgbChannelFromOneBitmapToAnother(Bitmap source,
             byte[] destinationRgbValues = new byte[bytes];
 
             // Copy the RGB values into the array.
-            System.Runtime.InteropServices.Marshal.Copy(bitmapDataDestination.Scan0, destinationRgbValues, 0, bytes);
+            Marshal.Copy(bitmapDataDestination.Scan0, destinationRgbValues, 0, bytes);
 
             int s = (int)sourceChannel;
             int d = (int)destinationChannel;
@@ -210,11 +214,10 @@ private static void TransferOneArgbChannelFromOneBitmapToAnother(Bitmap source,
             }
 
             // Copy the RGB values back to the bitmap
-            System.Runtime.InteropServices.Marshal.Copy(destinationRgbValues, 0, bitmapDataDestination.Scan0, bytes);
+            Marshal.Copy(destinationRgbValues, 0, bitmapDataDestination.Scan0, bytes);
 
             // Unlock bits the destination.
             destination.UnlockBits(bitmapDataDestination);
         }
-
     }
 }

src/ImageProcessor/Imaging/Filters/GothamMatrixFilter.cs

@@ -8,13 +8,12 @@
 namespace ImageProcessor.Imaging.Filters
 {
     #region Using
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
     using System.Drawing;
-    using System.Drawing.Imaging;
     using System.Drawing.Drawing2D;
+    using System.Drawing.Imaging;
+
+    using ImageProcessor.Processors;
+
     #endregion
 
     /// <summary>
@@ -27,7 +26,7 @@ internal class GothamMatrixFilter : IMatrixFilter
         /// </summary>
         public ColorMatrix Matrix
         {
-            get { return ColorMatrixes.Gotham; }
+            get { return ColorMatrixes.GreyScale; }
         }
 
         /// <summary>
@@ -61,21 +60,30 @@ public Image TransformImage(ImageFactory factory, Image image, Image newImage)
 
                         // Paint a burgundy rectangle with a transparency of ~30% over the image.
                         // Paint a blue rectangle with a transparency of 20% over the image.
-                        using (SolidBrush brush = new SolidBrush(Color.FromArgb(77, 43, 4, 18)))
+                        using (SolidBrush brush = new SolidBrush(Color.FromArgb(77, 38, 14, 28)))
                         {
                             Region oldClip = graphics.Clip;
                             graphics.Clip = new Region(rectangle);
                             graphics.FillRectangle(brush, rectangle);
 
                             // Fill the blue.
-                            brush.Color = Color.FromArgb(51, 12, 22, 88);
+                            brush.Color = Color.FromArgb(51, 29, 32, 59);
                             graphics.FillRectangle(brush, rectangle);
                             graphics.Clip = oldClip;
                         }
                     }
                 }
             }
 
+            // Add brightness and contrast to finish the effect.
+            factory.Image = newImage;
+            Brightness brightness = new Brightness { DynamicParameter = 5 };
+            newImage = (Bitmap)brightness.ProcessImage(factory);
+
+            factory.Image = newImage;
+            Contrast contrast = new Contrast { DynamicParameter = 85 };
+            newImage = (Bitmap)contrast.ProcessImage(factory);
+
             // Reassign the image.
             image.Dispose();
             image = newImage;

src/ImageProcessor/Processors/Alpha.cs

@@ -27,28 +27,6 @@ public class Alpha : IGraphicsProcessor
         private static readonly Regex QueryRegex = new Regex(@"alpha=(?:100|[1-9]?[0-9])", RegexOptions.Compiled);
 
         #region IGraphicsProcessor Members
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        public string Name
-        {
-            get
-            {
-                return "Alpha";
-            }
-        }
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        public string Description
-        {
-            get
-            {
-                return "Changes the alpha component of the image to effect its transparency.";
-            }
-        }
-
         /// <summary>
         /// Gets the regular expression to search strings for.
         /// </summary>
@@ -111,7 +89,7 @@ public int MatchRegexIndex(string queryString)
                     {
                         // Set the index on the first instance only.
                         this.SortOrder = match.Index;
-                        int percentage = match.Value.ToIntegerArray()[0];
+                        int percentage = int.Parse(match.Value.Split('=')[1]);
 
                         this.DynamicParameter = percentage;
                     }