- Implemented ClearImage method

- Implemented FillRect method
- Added support for saving BMP, GIF, and PNG formats

Author: kiddailey

ASPNetImage.suo

@@ -2,6 +2,7 @@
 using System.Drawing.Imaging;
 using System.Drawing;
 using System.IO;
+using System.Drawing.Drawing2D;
 
 namespace ASPNetImage
 {
@@ -254,6 +255,17 @@ public string Filename
             }
         }
 
+        /// <summary>
+        /// Gets the classes .NET image instance
+        /// </summary>
+        public Image RawNetImage
+        {
+            get
+            {
+                return this._image;
+            }
+        }
+
         /// <summary>
         /// Gets or sets the image format to be used when saving the image. Not currently
         /// supported and only JPG format is output.
@@ -461,10 +473,6 @@ public void Chord(int intX1, int intY1, int intX2, int intY2, int intX3, int int
         {
         }
 
-        public void ClearImage()
-        {
-        }
-
         public void ClearTexture()
         {
         }
@@ -509,10 +517,6 @@ public void FillPath()
         {
         }
 
-        public void FillRect(int intLeft, int intTop, int intRight, int intBottom)
-        {
-        }
-
         public void FishEye(int intDegree)
         {
         }
@@ -532,6 +536,20 @@ public int GetPixel(int intX, int intY)
 
         public void GradientOneWay(int intBeginColor, int intEndColor, int intDirection)
         {
+            //Graphics graphicsDest = Graphics.FromImage(this._image);
+            //LinearGradientBrush thisBrush;
+            
+            //switch (intDirection)
+            //{
+            //    case 0:
+            //        // up
+            //        thisBrush = new LinearGradientBrush(
+            //            new Point(this._image.Width / 2, this._image.Height - 1), 
+            //            new Point(this._image.Width / 2, 0), 
+            //            Color.FromArgb(intBeginColor), 
+            //            Color.FromArgb(intEndColor));
+
+            //}
         }
 
         public void GradientTwoWay(int intBeginColor, int intEndColor, int intDirection, int intInOut)
@@ -670,6 +688,22 @@ public void Wave(int intGraphicSize, int intWaveSize)
 
         #endregion
 
+        /// <summary>
+        /// Clears the entire image with the current BackgroundColor
+        /// </summary>
+        public void ClearImage()
+        {
+            Graphics graphicsDest = Graphics.FromImage(this._image);
+            graphicsDest.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceCopy;
+            Color brushColor = Color.FromArgb(this.BackgroundColor);
+            Brush coloredBrush = new SolidBrush(brushColor);
+            graphicsDest.FillRectangle(coloredBrush, 0, 0, this._image.Width, this._image.Height);
+            graphicsDest.DrawImage(this._image, 0, 0);
+
+            graphicsDest.Dispose();
+            coloredBrush.Dispose();
+        }
+
         /// <summary>
         /// Crops the image with the specified dimensions
         /// </summary>
@@ -690,6 +724,26 @@ public void CropImage(int startX, int startY, int width, int height)
             graphicsCrop.Dispose();
         }
 
+        /// <summary>
+        /// Fills the specified rectangle with the current PenColor
+        /// </summary>
+        /// <param name="intLeft"></param>
+        /// <param name="intTop"></param>
+        /// <param name="intRight"></param>
+        /// <param name="intBottom"></param>
+        public void FillRect(int intLeft, int intTop, int intRight, int intBottom)
+        {
+            Graphics graphicsDest = Graphics.FromImage(this._image);
+            graphicsDest.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceCopy;
+            Color brushColor = Color.FromArgb(this.PenColor);
+            Brush coloredBrush = new SolidBrush(brushColor);
+            graphicsDest.FillRectangle(coloredBrush, intLeft, intTop, intRight - intLeft, intBottom - intTop);
+            graphicsDest.DrawImage(this._image, 0, 0);
+
+            graphicsDest.Dispose();
+            coloredBrush.Dispose();
+        }
+
         /// <summary>
         /// Flips the image vertically (intDirection == 2) or horizontally (intDirection == 1)
         /// </summary>
@@ -893,18 +947,76 @@ public bool SaveImage()
                 EncoderParameter imageEncoderParameter;
                 EncoderParameters imageEncoderParameters;
 
-                imageCodecInfo = GetEncoderInfo("image/jpeg");
-                imageEncoder = Encoder.Quality;
-                imageEncoderParameters = new EncoderParameters(1);
-                imageEncoderParameter = new EncoderParameter(imageEncoder, this.JPEGQuality);
-                imageEncoderParameters.Param[0] = imageEncoderParameter;
+                switch (this.ImageFormat)
+                {
+                    case ImageFormats.BMP:
+
+                        this.Filename = Path.ChangeExtension(this.Filename, "bmp");
+
+                        try
+                        {
+                            this._image.Save(this.Filename, System.Drawing.Imaging.ImageFormat.Bmp);
+                        }
+                        catch (Exception e)
+                        {
+                            this._error = e.ToString();
+                        }
+                        break;
+
+                    case ImageFormats.GIF:
+
+                        this.Filename = Path.ChangeExtension(this.Filename, "gif");
+
+                        try
+                        {
+                            this._image.Save(this.Filename, System.Drawing.Imaging.ImageFormat.Gif);
+                        }
+                        catch (Exception e)
+                        {
+                            this._error = e.ToString();
+                        }
+                        break;
+
+                    case ImageFormats.PNG:
+
+                        this.Filename = Path.ChangeExtension(this.Filename, "png");
+
+                        try
+                        {
+                            this._image.Save(this.Filename, System.Drawing.Imaging.ImageFormat.Png);
+                        }
+                        catch (Exception e)
+                        {
+                            this._error = e.ToString();
+                        }
+
+                        break;
+
+                    case ImageFormats.JPEG:
+                    default:
 
-                this.Filename = Path.ChangeExtension(this.Filename, "jpg");
+                        imageCodecInfo = GetEncoderInfo("image/jpeg");
+                        imageEncoder = Encoder.Quality;
+                        imageEncoderParameters = new EncoderParameters(1);
+                        imageEncoderParameter = new EncoderParameter(imageEncoder, this.JPEGQuality);
+                        imageEncoderParameters.Param[0] = imageEncoderParameter;
+
+                        this.Filename = Path.ChangeExtension(this.Filename, "jpg");
+
+                        try
+                        {
+                            this._image.Save(this.Filename, imageCodecInfo, imageEncoderParameters);
+                        }
+                        catch (Exception e)
+                        {
+                            this._error = e.ToString();
+                        }
+
+                        break;
+                }
 
                 try
                 {
-                    this._image.Save(this.Filename, imageCodecInfo, imageEncoderParameters);
-
                     if (File.Exists(this.Filename))
                     {
                         if (this.AutoClear)

ASPNetImage/Source/NetImage.cs

@@ -3,6 +3,8 @@
 using System.Text;
 using ASPNetImage;
 using NUnit.Framework;
+using System.Security.Cryptography;
+using System.Drawing;
 
 namespace UnitTests
 {
@@ -67,6 +69,64 @@ public void TestAutoClear()
             }
         }
 
+        /// <summary>
+        /// Tests the ClearImage method by taking an all white image, clearing it to all black, 
+        /// and then compare it to a known all-black image using a SHA hash comparison
+        /// </summary>
+        [Test]
+        public void TestClearImage()
+        {
+            string outputFilePath = "../../Output/ClearImage.png";
+
+            ASPNetImage.NetImage thisImage = new NetImage();
+            thisImage.LoadImage("../../Resources/1024x768-white.png");
+            thisImage.ImageFormat = NetImage.ImageFormats.PNG;
+            thisImage.Filename = outputFilePath;
+            thisImage.BackgroundColor = System.Drawing.Color.FromArgb(0, 0, 0).ToArgb();
+            thisImage.ClearImage();
+            thisImage.AutoClear = false;
+            thisImage.SaveImage();
+
+            ASPNetImage.NetImage clearedImage = new NetImage();
+            clearedImage.LoadImage("../../Resources/1024x768-black.png");
+
+            Bitmap modifiedImage = new Bitmap(thisImage.RawNetImage);
+            Bitmap comparisonImage = new Bitmap(clearedImage.RawNetImage);
+
+            ImageConverter thisConverter = new ImageConverter();
+            byte[] modifiedImageBytes = new byte[0];
+            byte[] comparisonImageBytes = new byte[0];
+            modifiedImageBytes = (byte[])thisConverter.ConvertTo(modifiedImage, modifiedImageBytes.GetType());
+            comparisonImageBytes = (byte[])thisConverter.ConvertTo(comparisonImage, comparisonImageBytes.GetType());
+
+            SHA256Managed hasher = new SHA256Managed();
+            byte[] modifiedImageHash = hasher.ComputeHash(modifiedImageBytes);
+            byte[] comparisonImageHash = hasher.ComputeHash(comparisonImageBytes);
+
+            bool isMatch = true;
+            for (int i = 0; i < modifiedImageHash.Length && i < comparisonImageHash.Length && isMatch; i++)
+            {
+                if (modifiedImageHash[i] != comparisonImageHash[i])
+                    isMatch = false;
+            }
+
+            Assert.IsTrue(isMatch);
+        }
+
+        [Test]
+        public void TestFillRect()
+        {
+            string outputFilePath = "../../Output/FillRect.png";
+
+            ASPNetImage.NetImage thisImage = new NetImage();
+            thisImage.LoadImage("../../Resources/1024x768-white.png");
+            thisImage.ImageFormat = NetImage.ImageFormats.PNG;
+            thisImage.Filename = outputFilePath;
+            thisImage.PenColor = System.Drawing.Color.FromArgb(0, 0, 0).ToArgb();
+            thisImage.FillRect(10, 10, 20, 20);
+            thisImage.SaveImage();
+        }
+
         [Test]
         public void TestCrop()
         {

ASPNetImage/bin/Debug/ASPNetImage.dll

@@ -36,6 +36,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>