Browse Source

Updated rotate method and Nuget manifests

Former-commit-id: 718461336432ed3936dbf9b8a30d4231186267c0
pull/17/head
JimBobSquarePants 14 years ago
parent
commit
5064e69d5b
  1. 4
      src/ImageProcessor.Web/Properties/AssemblyInfo.cs
  2. 30
      src/ImageProcessor/ImageFactory.cs
  3. 1
      src/ImageProcessor/ImageProcessor.csproj
  4. 4
      src/ImageProcessor/ImageProcessor.sln
  5. 40
      src/ImageProcessor/Imaging/RotateLayer.cs
  6. 13
      src/ImageProcessor/Processors/Filter.cs
  7. 171
      src/ImageProcessor/Processors/Rotate.cs
  8. 2
      src/ImageProcessor/Processors/Watermark.cs
  9. 4
      src/ImageProcessor/Properties/AssemblyInfo.cs
  10. 1
      src/ImageProcessor/UpgradeLog.htm.REMOVED.git-id
  11. BIN
      src/Nuget/ImageProcessor.1.1.0.0.nupkg
  12. BIN
      src/Nuget/ImageProcessor.Web.1.1.0.0.nupkg
  13. 13
      src/Test/Test/Test.csproj

4
src/ImageProcessor.Web/Properties/AssemblyInfo.cs

@ -31,5 +31,5 @@ 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("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]

30
src/ImageProcessor/ImageFactory.cs

@ -312,15 +312,33 @@ namespace ImageProcessor
/// <summary>
/// Rotates the current image by the given angle.
/// </summary>
/// <param name="angle">The angle by which to rotate the image.</param>
/// <param name="angle">
/// The angle by which to rotate the image.
/// </param>
/// <param name="backgroundColour">
/// The background Colour.
/// </param>
/// <returns>
/// The current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
/// </returns>
public ImageFactory Rotate(int angle)
public ImageFactory Rotate(int angle, Color backgroundColour = default(Color))
{
if (this.ShouldProcess)
{
Rotate rotate = new Rotate { DynamicParameter = angle };
// Sanitize the input.
if (angle > 360 || angle < 0)
{
angle = 0;
}
RotateLayer rotateLayer = new RotateLayer { Angle = angle };
if (backgroundColour != default(Color))
{
rotateLayer.BackgroundColor = backgroundColour;
}
Rotate rotate = new Rotate { DynamicParameter = rotateLayer };
this.Image = rotate.ProcessImage(this);
}
@ -385,7 +403,7 @@ namespace ImageProcessor
// Fix the colour palette of gif images.
this.FixGifs();
if (this.ImageFormat == ImageFormat.Jpeg)
if (object.Equals(this.ImageFormat, ImageFormat.Jpeg))
{
// Jpegs can be saved with different settings to include a quality setting for the JPEG compression.
// This improves output compression and quality.
@ -418,7 +436,7 @@ namespace ImageProcessor
// Fix the colour palette of gif images.
this.FixGifs();
if (this.ImageFormat == ImageFormat.Jpeg)
if (object.Equals(this.ImageFormat, ImageFormat.Jpeg))
{
// Jpegs can be saved with different settings to include a quality setting for the JPEG compression.
// This improves output compression and quality.
@ -500,7 +518,7 @@ namespace ImageProcessor
{
// Fix the colour palette of gif images.
// TODO: Why does the palette not get fixed when resized to the same dimensions.
if (this.ImageFormat == ImageFormat.Gif)
if (object.Equals(this.ImageFormat, ImageFormat.Gif))
{
OctreeQuantizer quantizer = new OctreeQuantizer(255, 8);
this.Image = quantizer.Quantize(this.Image);

1
src/ImageProcessor/ImageProcessor.csproj

@ -76,6 +76,7 @@
<Compile Include="Imaging\OctreeQuantizer.cs" />
<Compile Include="Imaging\Quantizer.cs" />
<Compile Include="Imaging\ResponseType.cs" />
<Compile Include="Imaging\RotateLayer.cs" />
<Compile Include="Imaging\TextLayer.cs" />
<Compile Include="Processors\Alpha.cs" />
<Compile Include="Processors\Rotate.cs" />

4
src/ImageProcessor/ImageProcessor.sln

@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor", "ImageProcessor.csproj", "{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "..\Test\Test\Test.csproj", "{30327C08-7574-4D7E-AC95-6A58753C6855}"

40
src/ImageProcessor/Imaging/RotateLayer.cs

@ -0,0 +1,40 @@
// -----------------------------------------------------------------------
// <copyright file="RotateLayer.cs" company="James South">
// TODO: Update copyright text.
// </copyright>
// -----------------------------------------------------------------------
namespace ImageProcessor.Imaging
{
#region Using
using System.Drawing;
#endregion
/// <summary>
/// Enacapsulates the properties required to rotate an image.
/// </summary>
internal class RotateLayer
{
#region Constructors
/// <summary>
/// Initializes a new instance of the <see cref="RotateLayer"/> class.
/// </summary>
public RotateLayer()
{
this.BackgroundColor = Color.Transparent;
}
#endregion
#region Properties
/// <summary>
/// Gets or sets the angle at which to rotate the image.
/// </summary>
public int Angle { get; set; }
/// <summary>
/// Gets or sets the background color.
/// </summary>
public Color BackgroundColor { get; set; }
#endregion
}
}

13
src/ImageProcessor/Processors/Filter.cs

@ -7,18 +7,11 @@
namespace ImageProcessor.Processors
{
#region Using
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.IO;
using System.Text.RegularExpressions;
using System.Web;
using System.Web.Hosting;
using ImageProcessor.Imaging.Filters;
#endregion
/// <summary>
@ -183,8 +176,10 @@ namespace ImageProcessor.Processors
break;
}
return matrix.ProcessImage(factory, image, newImage);
if (matrix != null)
{
return matrix.ProcessImage(factory, image, newImage);
}
}
catch
{

171
src/ImageProcessor/Processors/Rotate.cs

@ -7,13 +7,12 @@
namespace ImageProcessor.Processors
{
#region Using
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.Text.RegularExpressions;
using ImageProcessor.Helpers.Extensions;
using System;
using System.Drawing.Drawing2D;
using System.Text.RegularExpressions;
using ImageProcessor.Imaging;
#endregion
/// <summary>
@ -24,24 +23,18 @@ namespace ImageProcessor.Processors
/// <summary>
/// The regular expression to search strings for.
/// </summary>
//private static readonly Regex QueryRegex = new Regex(@"rotate=-*([1-9][0-7][0-9]|\d{1,2}(?!\d)|180)|rotate=[^&]*", RegexOptions.Compiled);
private static readonly Regex QueryRegex = new Regex(@"rotate=-*([1-2][0-9][0-9]|3[0-5][0-9]|\d{1}(?!\d)|\d{1,2}(?!\d)|360)|rotate=[^&]*", RegexOptions.Compiled);
private static readonly Regex QueryRegex = new Regex(@"rotate=([1-2][0-9][0-9]|3[0-5][0-9]|\d{1}(?!\d)|\d{1,2}(?!\d)|360)|rotate=[^&]*", RegexOptions.Compiled);
/// <summary>
/// The regular expression to search strings for the angle attribute.
/// </summary>
private static readonly Regex AngleRegex = new Regex(@"rotate=\[-*([1-9][0-7][0-9]|\d{1,2}(?!\d)|180)\]", RegexOptions.Compiled);
private static readonly Regex AngleRegex = new Regex(@"rotate=angle-\[([1-2][0-9][0-9]|3[0-5][0-9]|\d{1}(?!\d)|\d{1,2}(?!\d)|360)\]", RegexOptions.Compiled);
/// <summary>
/// The regular expression to search strings for the color attribute.
/// </summary>
private static readonly Regex ColorRegex = new Regex(@"bgcolor-([0-9a-fA-F]{3}){1,2}", RegexOptions.Compiled);
/// <summary>
/// The format of the image to rotate.
/// </summary>
private ImageFormat imageFormat;
#region IGraphicsProcessor Members
/// <summary>
/// Gets the name.
@ -127,11 +120,25 @@ namespace ImageProcessor.Processors
{
// Set the index on the first instance only.
this.SortOrder = match.Index;
int degrees;
int.TryParse(match.Value.Split('=')[1], out degrees);
RotateLayer rotateLayer = new RotateLayer();
string toParse = match.Value;
if (toParse.Contains("bgcolor"))
{
rotateLayer.Angle = this.ParseAngle(toParse);
rotateLayer.BackgroundColor = this.ParseColor(toParse);
}
else
{
int degrees;
int.TryParse(match.Value.Split('=')[1], out degrees);
rotateLayer.Angle = degrees;
}
this.DynamicParameter = degrees;
this.DynamicParameter = rotateLayer;
}
index += 1;
@ -158,21 +165,20 @@ namespace ImageProcessor.Processors
try
{
int angle = this.DynamicParameter;
RotateLayer rotateLayer = this.DynamicParameter;
int angle = rotateLayer.Angle;
Color backgroundColor = rotateLayer.BackgroundColor;
// Center of the image
float rotateAtX = image.Width / 2;
float rotateAtY = image.Height / 2;
this.imageFormat = factory.ImageFormat;
float rotateAtX = Math.Abs(image.Width / 2);
float rotateAtY = Math.Abs(image.Height / 2);
// Create a rotated image.
newImage = RotateImage(image, rotateAtX, rotateAtY, angle);
newImage = this.RotateImage(image, rotateAtX, rotateAtY, angle, backgroundColor);
newImage.Tag = image.Tag;
image.Dispose();
image = newImage;
}
catch
{
@ -186,67 +192,71 @@ namespace ImageProcessor.Processors
}
#endregion
#region Private Methods
/// <summary>
///
/// Rotates an image to the given angle at the given position.
/// </summary>
/// <param name="image"></param>
/// <param name="rotateAtX"></param>
/// <param name="rotateAtY"></param>
/// <param name="angle"></param>
/// <returns></returns>
/// <remarks> Based on http://www.codeproject.com/Articles/58815/C-Image-PictureBox-Rotations?msg=4155374#xx4155374xx</remarks>
private Bitmap RotateImage(Image image, float rotateAtX, float rotateAtY, float angle)
/// <param name="image">The image to rotate</param>
/// <param name="rotateAtX">The horizontal pixel coordinate at which to rotate the image.</param>
/// <param name="rotateAtY">The vertical pixel coordinate at which to rotate the image.</param>
/// <param name="angle">The angle in degress at which to rotate the image.</param>
/// <param name="backgroundColor">The background color to fill an image with.</param>
/// <returns>The image rotated to the given angle at the given position.</returns>
/// <remarks>
/// Based on http://www.codeproject.com/Articles/58815/C-Image-PictureBox-Rotations?msg=4155374#xx4155374xx
/// </remarks>
private Bitmap RotateImage(Image image, float rotateAtX, float rotateAtY, float angle, Color backgroundColor)
{
int width, height, X, Y;
int width, height, x, y;
// Degrees to radians according to Google.
const double degreeToRadian = 0.0174532925;
const double DegreeToRadian = 0.0174532925;
double widthAsDouble = (double)image.Width;
double heightAsDouble = (double)image.Height;
double widthAsDouble = image.Width;
double heightAsDouble = image.Height;
// Allow for angles over 180
if (angle > 180)
{
angle = angle - 360;
}
}
double degrees = Math.Abs(angle);
double degrees = Math.Abs(angle);
if (degrees <= 90)
{
double radians = degreeToRadian * degrees;
double radians = DegreeToRadian * degrees;
double radiansSin = Math.Sin(radians);
double radiansCos = Math.Cos(radians);
width = (int)(heightAsDouble * radiansSin + widthAsDouble * radiansCos);
height = (int)(widthAsDouble * radiansSin + heightAsDouble * radiansCos);
X = (width - image.Width) / 2;
Y = (height - image.Height) / 2;
width = (int)((heightAsDouble * radiansSin) + (widthAsDouble * radiansCos));
height = (int)((widthAsDouble * radiansSin) + (heightAsDouble * radiansCos));
x = (width - image.Width) / 2;
y = (height - image.Height) / 2;
}
else
{
degrees -= 90;
double radians = degreeToRadian * degrees;
double radians = DegreeToRadian * degrees;
double radiansSin = Math.Sin(radians);
double radiansCos = Math.Cos(radians);
// Fix the 270 bug
if (radiansCos == -1)
// Fix the 270 error
if (Math.Abs(radiansCos - -1.0D) < 0.00001)
{
radiansCos = -1 * -1;
radiansCos = 1;
}
width = (int)(widthAsDouble * radiansSin + heightAsDouble * radiansCos);
height = (int)(heightAsDouble * radiansSin + widthAsDouble * radiansCos);
X = (width - image.Width) / 2;
Y = (height - image.Height) / 2;
width = (int)((widthAsDouble * radiansSin) + (heightAsDouble * radiansCos));
height = (int)((heightAsDouble * radiansSin) + (widthAsDouble * radiansCos));
x = (width - image.Width) / 2;
y = (height - image.Height) / 2;
}
//create a new empty bitmap to hold rotated image
// Create a new empty bitmap to hold rotated image
Bitmap newImage = new Bitmap(width, height);
newImage.SetResolution(image.HorizontalResolution, image.VerticalResolution);
//make a graphics object from the empty bitmap
// Make a graphics object from the empty bitmap
using (Graphics graphics = Graphics.FromImage(newImage))
{
// Reduce the jagged edge.
@ -257,26 +267,67 @@ namespace ImageProcessor.Processors
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
graphics.CompositingQuality = CompositingQuality.HighSpeed;
// Fill the background TODO: Set a color
if (this.imageFormat == ImageFormat.Jpeg)
{
graphics.Clear(Color.White);
}
// Fill the background.
graphics.Clear(backgroundColor);
// Put the rotation point in the "center" of the image
graphics.TranslateTransform(rotateAtX + X, rotateAtY + Y);
graphics.TranslateTransform(rotateAtX + x, rotateAtY + y);
// Rotate the image
graphics.RotateTransform(angle);
// Move the image back
graphics.TranslateTransform(-rotateAtX - X, -rotateAtY - Y);
graphics.TranslateTransform(-rotateAtX - x, -rotateAtY - y);
// Draw passed in image onto graphics object
graphics.DrawImage(image, new PointF(0 + X, 0 + Y));
graphics.DrawImage(image, new PointF(0 + x, 0 + y));
}
return newImage;
}
/// <summary>
/// Returns the correct <see cref="T:System.Int32"/> containing the angle for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The correct <see cref="T:System.Int32"/> containing the angle for the given string.
/// </returns>
private int ParseAngle(string input)
{
foreach (Match match in AngleRegex.Matches(input))
{
// Split on angle-
int angle;
int.TryParse(match.Value.Replace("[", string.Empty).Replace("]", string.Empty).Split('-')[1], out angle);
return angle;
}
// No rotate - matches the RotateLayer default.
return 0;
}
/// <summary>
/// Returns the correct <see cref="T:System.Drawing.Color"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The correct <see cref="T:System.Drawing.Color"/>
/// </returns>
private Color ParseColor(string input)
{
foreach (Match match in ColorRegex.Matches(input))
{
// split on color-hex
return ColorTranslator.FromHtml("#" + match.Value.Split('-')[1]);
}
return Color.Transparent;
}
#endregion
}
}

2
src/ImageProcessor/Processors/Watermark.cs

@ -452,7 +452,7 @@ namespace ImageProcessor.Processors
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The correct <see cref="T:System.Int32"/> containing the font family for the given string.
/// The correct <see cref="T:System.Int32"/> containing the opacity for the given string.
/// </returns>
private int ParseOpacity(string input)
{

4
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.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]

1
src/ImageProcessor/UpgradeLog.htm.REMOVED.git-id

@ -0,0 +1 @@
41192c06780bda40794dac2731a4105f1efe0311

BIN
src/Nuget/ImageProcessor.1.1.0.0.nupkg

Binary file not shown.

BIN
src/Nuget/ImageProcessor.Web.1.1.0.0.nupkg

Binary file not shown.

13
src/Test/Test/Test.csproj

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -15,6 +16,11 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -149,8 +155,13 @@
<ItemGroup>
<Content Include="Views\Home\Responsive.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

Loading…
Cancel
Save