diff --git a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
index b939ff457b..bdd85bbbe3 100644
--- a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.1.0")]
-[assembly: AssemblyFileVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]
diff --git a/src/ImageProcessor/Imaging/Convolution.cs b/src/ImageProcessor/Imaging/Convolution.cs
index 7663188e3a..be3f585e9e 100644
--- a/src/ImageProcessor/Imaging/Convolution.cs
+++ b/src/ImageProcessor/Imaging/Convolution.cs
@@ -384,10 +384,10 @@ namespace ImageProcessor.Imaging
blue += this.Threshold;
alpha += this.Threshold;
- resultBuffer[byteOffset] = blue.ToByte(); // (byte)((blue > 255) ? 255 : ((blue < 0) ? 0 : blue));
- resultBuffer[byteOffset + 1] = green.ToByte(); // (byte)((green > 255) ? 255 : ((green < 0) ? 0 : green));
- resultBuffer[byteOffset + 2] = red.ToByte(); // (byte)((red > 255) ? 255 : ((red < 0) ? 0 : red));
- resultBuffer[byteOffset + 3] = alpha.ToByte(); // (byte)((alpha > 255) ? 255 : ((alpha < 0) ? 0 : alpha));
+ resultBuffer[byteOffset] = blue.ToByte();
+ resultBuffer[byteOffset + 1] = green.ToByte();
+ resultBuffer[byteOffset + 2] = red.ToByte();
+ resultBuffer[byteOffset + 3] = alpha.ToByte();
}
}
diff --git a/src/ImageProcessor/Imaging/Filters/ComicMatrixFilter.cs b/src/ImageProcessor/Imaging/Filters/ComicMatrixFilter.cs
index 408a4b6e54..2f46693cb4 100644
--- a/src/ImageProcessor/Imaging/Filters/ComicMatrixFilter.cs
+++ b/src/ImageProcessor/Imaging/Filters/ComicMatrixFilter.cs
@@ -99,11 +99,6 @@ namespace ImageProcessor.Imaging.Filters
// Draw the edges.
edgeBitmap = DrawEdges((Bitmap)image, 120);
- //GaussianLayer gaussianLayer = new GaussianLayer(1);
- //Convolution convolution = new Convolution(gaussianLayer.Sigma) { Threshold = gaussianLayer.Threshold };
- //double[,] kernel = convolution.CreateGuassianBlurFilter(gaussianLayer.Size);
- //edgeBitmap = convolution.ProcessKernel(edgeBitmap, kernel);
-
using (Graphics graphics = Graphics.FromImage(highBitmap))
{
graphics.DrawImage(highBitmap, rectangle, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, attributes);
@@ -146,11 +141,13 @@ namespace ImageProcessor.Imaging.Filters
using (Graphics graphics = Graphics.FromImage(newImage))
{
+ // graphics.Clear(Color.Transparent);
+
// Overlay the image.
graphics.DrawImage(highBitmap, 0, 0);
graphics.DrawImage(lowBitmap, 0, 0);
graphics.DrawImage(edgeBitmap, 0, 0);
-
+
// Draw an edge around the image.
using (Pen blackPen = new Pen(Color.Black))
{
@@ -503,13 +500,10 @@ namespace ImageProcessor.Imaging.Filters
alpha = 0;
}
- blue = blue > 255 ? 255 : (blue < 0 ? 0 : blue);
- green = green > 255 ? 255 : (green < 0 ? 0 : green);
- red = red > 255 ? 255 : (red < 0 ? 0 : red);
- resultBuffer[byteOffset] = (byte)blue;
- resultBuffer[byteOffset + 1] = (byte)green;
- resultBuffer[byteOffset + 2] = (byte)red;
- resultBuffer[byteOffset + 3] = (byte)alpha;
+ resultBuffer[byteOffset] = blue.ToByte();
+ resultBuffer[byteOffset + 1] = green.ToByte();
+ resultBuffer[byteOffset + 2] = red.ToByte();
+ resultBuffer[byteOffset + 3] = alpha.ToByte();
}
}
@@ -550,7 +544,7 @@ namespace ImageProcessor.Imaging.Filters
Rectangle rectangle = new Rectangle(Point.Empty, source.Size);
- // Lockbits the source.
+ // Lock the source.
BitmapData bitmapDataSource = source.LockBits(rectangle, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
// Declare an array to hold the bytes of the bitmap.
@@ -562,10 +556,10 @@ namespace ImageProcessor.Imaging.Filters
// Copy the RGB values into the array.
Marshal.Copy(bitmapDataSource.Scan0, sourceRgbValues, 0, bytes);
- // Unlockbits the source.
+ // Unlock the source.
source.UnlockBits(bitmapDataSource);
- // Lockbits the destination.
+ // Lock the destination.
BitmapData bitmapDataDestination = destination.LockBits(rectangle, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
// Allocate a buffer for image
diff --git a/src/ImageProcessor/Processors/Crop.cs b/src/ImageProcessor/Processors/Crop.cs
index 7662158d0c..24e718ae24 100644
--- a/src/ImageProcessor/Processors/Crop.cs
+++ b/src/ImageProcessor/Processors/Crop.cs
@@ -159,7 +159,6 @@ namespace ImageProcessor.Processors
// Work out the percentages.
float left = cropLayer.Left * sourceWidth;
float top = cropLayer.Top * sourceWidth;
-
float width = (1 - cropLayer.Left - cropLayer.Right) * sourceWidth;
float height = (1 - cropLayer.Top - cropLayer.Bottom) * sourceHeight;
@@ -257,7 +256,6 @@ namespace ImageProcessor.Processors
return CropMode.Pixels;
}
-
///
/// Returns the correct for the given string.
///
diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs
index 2532340320..53d7fac066 100644
--- a/src/ImageProcessor/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@ using System.Security;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.2.0")]
-[assembly: AssemblyFileVersion("1.8.2.0")]
+[assembly: AssemblyVersion("1.8.3.0")]
+[assembly: AssemblyFileVersion("1.8.3.0")]
diff --git a/src/Nuget/ImageProcessor.1.8.1.0.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.1.8.1.0.nupkg.REMOVED.git-id
deleted file mode 100644
index b6c1a7cb0f..0000000000
--- a/src/Nuget/ImageProcessor.1.8.1.0.nupkg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-997f2cbadc5add62068ac4744395cb619835b25b
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.1.8.1.1.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.1.8.1.1.nupkg.REMOVED.git-id
deleted file mode 100644
index bcabe5ff24..0000000000
--- a/src/Nuget/ImageProcessor.1.8.1.1.nupkg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-247fa919ace01d934bd0a19d37587ad26195b33e
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.1.8.3.0.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.1.8.3.0.nupkg.REMOVED.git-id
new file mode 100644
index 0000000000..67df116dfd
--- /dev/null
+++ b/src/Nuget/ImageProcessor.1.8.3.0.nupkg.REMOVED.git-id
@@ -0,0 +1 @@
+b334b903dac55dfc5156a814c1fce9cc1f10f744
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.Web.3.0.0.3.nupkg b/src/Nuget/ImageProcessor.Web.3.0.0.3.nupkg
deleted file mode 100644
index bd6920945f..0000000000
Binary files a/src/Nuget/ImageProcessor.Web.3.0.0.3.nupkg and /dev/null differ
diff --git a/src/Nuget/ImageProcessor.Web.3.0.0.3.nuspec b/src/Nuget/ImageProcessor.Web.3.0.0.3.nuspec
deleted file mode 100644
index 6ec4feb00d..0000000000
--- a/src/Nuget/ImageProcessor.Web.3.0.0.3.nuspec
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- ImageProcessor.Web
- 3.0.0.3
- ImageProcessor.Web
- James South
- James South
- http://jimbobsquarepants.github.com/ImageProcessor/
- http://raw.github.com/JimBobSquarePants/ImageProcessor/master/src/Nuget/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.
-
- This package also requires Microsoft.Bcl.Async on .NET 4.0 which will be added on install if applicable.
-
- 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
-
- - Fixing 404 bug
- - Improved cleanup to remove orphaned files
-
- James South
- en-GB
- 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 Fluent GDI Gaussian Blur Sharpen
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.Web.3.1.0.0.nupkg b/src/Nuget/ImageProcessor.Web.3.1.0.0.nupkg
new file mode 100644
index 0000000000..f92a6682e7
Binary files /dev/null and b/src/Nuget/ImageProcessor.Web.3.1.0.0.nupkg differ
diff --git a/src/TestWebsites/NET4/config/imageprocessor/processing.config b/src/TestWebsites/NET4/config/imageprocessor/processing.config
index 0479642b23..654a9fbd65 100644
--- a/src/TestWebsites/NET4/config/imageprocessor/processing.config
+++ b/src/TestWebsites/NET4/config/imageprocessor/processing.config
@@ -1,9 +1,9 @@
-
+
-
+
@@ -30,6 +30,7 @@
+
diff --git a/src/TestWebsites/NET45/Test_Website_MVC5_NET45/Test_Website_MVC5_NET45.csproj b/src/TestWebsites/NET45/Test_Website_MVC5_NET45/Test_Website_MVC5_NET45.csproj
index 70a1d9f830..f2d8bbe56a 100644
--- a/src/TestWebsites/NET45/Test_Website_MVC5_NET45/Test_Website_MVC5_NET45.csproj
+++ b/src/TestWebsites/NET45/Test_Website_MVC5_NET45/Test_Website_MVC5_NET45.csproj
@@ -176,6 +176,9 @@
+
+
+
diff --git a/src/TestWebsites/NET45/Test_Website_MVC5_NET45/config/imageprocessor/processing.config b/src/TestWebsites/NET45/Test_Website_MVC5_NET45/config/imageprocessor/processing.config
index 5f864d3e46..654a9fbd65 100644
--- a/src/TestWebsites/NET45/Test_Website_MVC5_NET45/config/imageprocessor/processing.config
+++ b/src/TestWebsites/NET45/Test_Website_MVC5_NET45/config/imageprocessor/processing.config
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj b/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj
index bcffd722d4..defde9102b 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj
+++ b/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj
@@ -42,6 +42,10 @@
+
+ True
+ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
+
..\..\..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll
@@ -57,6 +61,30 @@
+
+ True
+ ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll
+
+
+ True
+ ..\..\..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll
+
+
+ True
+ ..\..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll
+
+
+ True
+ ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll
+
+
+ True
+ ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll
+
+
+ True
+ ..\..\..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll
+
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config
index 5f864d3e46..654a9fbd65 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config
+++ b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/packages.config b/src/TestWebsites/NET45/Test_Website_NET45/packages.config
index 7fbbd36f30..43581dac26 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/packages.config
+++ b/src/TestWebsites/NET45/Test_Website_NET45/packages.config
@@ -1,10 +1,14 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master
index ea8581b346..ba076a8eb5 100644
--- a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master
+++ b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master
@@ -21,8 +21,6 @@
<%--Framework Scripts--%>
-
-
diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Test_Website_Webforms_NET45.csproj b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Test_Website_Webforms_NET45.csproj
index 01dc269ac0..424aabccdd 100644
--- a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Test_Website_Webforms_NET45.csproj
+++ b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Test_Website_Webforms_NET45.csproj
@@ -52,6 +52,7 @@
+
diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config
index 779f5e6142..82587616f0 100644
--- a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config
+++ b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config
@@ -62,11 +62,11 @@
-
+
-
+
@@ -86,6 +86,10 @@
+
+
+
+
diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/processing.config b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/processing.config
index 0479642b23..654a9fbd65 100644
--- a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/processing.config
+++ b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/processing.config
@@ -1,9 +1,9 @@
-
+
-
+
@@ -30,6 +30,7 @@
+