mirror of https://github.com/SixLabors/ImageSharp
James South
13 years ago
21 changed files with 492 additions and 294 deletions
@ -1,88 +1,136 @@ |
|||||
using System.Collections.Generic; |
// --------------------------------------------------------------------------------------------------------------------
|
||||
using System.Drawing; |
// <copyright file="Constrain.cs" company="James South">
|
||||
using System.Text.RegularExpressions; |
// Copyright (c) James South.
|
||||
using ImageProcessor.Helpers.Extensions; |
// Licensed under the Apache License, Version 2.0.
|
||||
|
// </copyright>
|
||||
|
// <summary>
|
||||
|
// Constrains an image to the given dimensions.
|
||||
|
// </summary>
|
||||
|
// --------------------------------------------------------------------------------------------------------------------
|
||||
|
|
||||
namespace ImageProcessor.Processors |
namespace ImageProcessor.Processors |
||||
{ |
{ |
||||
/// <summary>
|
#region Using
|
||||
/// Constrains an image to the given dimensions.
|
using System.Collections.Generic; |
||||
/// </summary>
|
using System.Drawing; |
||||
public class Constrain : ResizeBase |
using System.Text.RegularExpressions; |
||||
{ |
using ImageProcessor.Helpers.Extensions; |
||||
private static readonly Regex QueryRegex = new Regex(@"constrain=\d+,\d+", RegexOptions.Compiled); |
#endregion
|
||||
|
|
||||
public override Regex RegexPattern |
/// <summary>
|
||||
{ |
/// Constrains an image to the given dimensions.
|
||||
get |
/// </summary>
|
||||
{ |
public class Constrain : ResizeBase |
||||
return QueryRegex; |
{ |
||||
} |
/// <summary>
|
||||
} |
/// The regular expression to search strings for.
|
||||
|
/// </summary>
|
||||
|
private static readonly Regex QueryRegex = new Regex(@"constrain=\d+[,-]\d+", RegexOptions.Compiled); |
||||
public override dynamic DynamicParameter { get; set; } |
|
||||
public override int SortOrder { get; protected set; } |
#region IGraphicsProcessor Members
|
||||
public override Dictionary<string, string> Settings { get; set; } |
/// <summary>
|
||||
|
/// Gets the regular expression to search strings for.
|
||||
public override int MatchRegexIndex(string queryString) |
/// </summary>
|
||||
{ |
public override Regex RegexPattern |
||||
int index = 0; |
{ |
||||
|
get |
||||
// Set the sort order to max to allow filtering.
|
{ |
||||
this.SortOrder = int.MaxValue; |
return QueryRegex; |
||||
|
} |
||||
foreach (Match match in this.RegexPattern.Matches(queryString)) |
} |
||||
{ |
|
||||
if (match.Success) |
/// <summary>
|
||||
{ |
/// Gets or sets DynamicParameter.
|
||||
if (index == 0) |
/// </summary>
|
||||
{ |
public override dynamic DynamicParameter { get; set; } |
||||
// Set the index on the first instance only.
|
|
||||
this.SortOrder = match.Index; |
/// <summary>
|
||||
int[] constraints = match.Value.ToPositiveIntegerArray(); |
/// Gets the order in which this processor is to be used in a chain.
|
||||
|
/// </summary>
|
||||
int x = constraints[0]; |
public override int SortOrder { get; protected set; } |
||||
int y = constraints[1]; |
|
||||
|
/// <summary>
|
||||
this.DynamicParameter = new Size(x, y); |
/// Gets or sets any additional settings required by the processor.
|
||||
} |
/// </summary>
|
||||
|
public override Dictionary<string, string> Settings { get; set; } |
||||
index += 1; |
|
||||
} |
/// <summary>
|
||||
} |
/// The position in the original string where the first character of the captured substring was found.
|
||||
|
/// </summary>
|
||||
return this.SortOrder; |
/// <param name="queryString">
|
||||
} |
/// The query string to search.
|
||||
|
/// </param>
|
||||
public override Image ProcessImage(ImageFactory factory) |
/// <returns>
|
||||
{ |
/// The zero-based starting position in the original string where the captured substring was found.
|
||||
|
/// </returns>
|
||||
double constrainedWidth = DynamicParameter.Width; |
public override int MatchRegexIndex(string queryString) |
||||
double constrainedHeight = DynamicParameter.Height; |
{ |
||||
|
int index = 0; |
||||
var original = factory.Image; |
|
||||
double width = original.Width; |
// Set the sort order to max to allow filtering.
|
||||
double height = original.Height; |
this.SortOrder = int.MaxValue; |
||||
|
|
||||
if (width > constrainedWidth || height > constrainedHeight) |
foreach (Match match in this.RegexPattern.Matches(queryString)) |
||||
{ |
{ |
||||
|
if (match.Success) |
||||
double constraintRatio = constrainedHeight / constrainedWidth; |
{ |
||||
double originalRatio = height / width; |
if (index == 0) |
||||
|
{ |
||||
Size newSize = originalRatio < constraintRatio |
// Set the index on the first instance only.
|
||||
? new Size((int)constrainedWidth, 0) |
this.SortOrder = match.Index; |
||||
: new Size(0, (int)constrainedHeight); |
int[] constraints = match.Value.ToPositiveIntegerArray(); |
||||
|
|
||||
int defaultMaxWidth; |
int x = constraints[0]; |
||||
int defaultMaxHeight; |
int y = constraints[1]; |
||||
int.TryParse(this.Settings["MaxWidth"], out defaultMaxWidth); |
|
||||
int.TryParse(this.Settings["MaxHeight"], out defaultMaxHeight); |
this.DynamicParameter = new Size(x, y); |
||||
|
} |
||||
return ResizeImage(factory, newSize.Width, newSize.Height, defaultMaxWidth, defaultMaxHeight); |
|
||||
} |
index += 1; |
||||
return factory.Image; |
} |
||||
} |
} |
||||
} |
|
||||
|
return this.SortOrder; |
||||
|
} |
||||
|
|
||||
|
/// <summary>
|
||||
|
/// Processes the image.
|
||||
|
/// </summary>
|
||||
|
/// <param name="factory">
|
||||
|
/// The the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class containing
|
||||
|
/// the image to process.
|
||||
|
/// </param>
|
||||
|
/// <returns>
|
||||
|
/// The processed image from the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
|
||||
|
/// </returns>
|
||||
|
public override Image ProcessImage(ImageFactory factory) |
||||
|
{ |
||||
|
double constrainedWidth = this.DynamicParameter.Width; |
||||
|
double constrainedHeight = this.DynamicParameter.Height; |
||||
|
|
||||
|
Image original = factory.Image; |
||||
|
double width = original.Width; |
||||
|
double height = original.Height; |
||||
|
|
||||
|
if (width > constrainedWidth || height > constrainedHeight) |
||||
|
{ |
||||
|
double constraintRatio = constrainedHeight / constrainedWidth; |
||||
|
double originalRatio = height / width; |
||||
|
|
||||
|
Size newSize = originalRatio < constraintRatio |
||||
|
? new Size((int)constrainedWidth, 0) |
||||
|
: new Size(0, (int)constrainedHeight); |
||||
|
|
||||
|
int defaultMaxWidth; |
||||
|
int defaultMaxHeight; |
||||
|
int.TryParse(this.Settings["MaxWidth"], out defaultMaxWidth); |
||||
|
int.TryParse(this.Settings["MaxHeight"], out defaultMaxHeight); |
||||
|
|
||||
|
return this.ResizeImage(factory, newSize.Width, newSize.Height, defaultMaxWidth, defaultMaxHeight); |
||||
|
} |
||||
|
|
||||
|
return factory.Image; |
||||
|
} |
||||
|
#endregion
|
||||
|
} |
||||
} |
} |
||||
@ -1,104 +1,179 @@ |
|||||
using System; |
// --------------------------------------------------------------------------------------------------------------------
|
||||
using System.Collections.Generic; |
// <copyright file="ResizeBase.cs" company="James South">
|
||||
using System.Drawing; |
// Copyright (c) James South.
|
||||
using System.Drawing.Drawing2D; |
// Licensed under the Apache License, Version 2.0.
|
||||
using System.Drawing.Imaging; |
// </copyright>
|
||||
using System.Text.RegularExpressions; |
// <summary>
|
||||
|
// The resize base for inheriting resizable methods from.
|
||||
|
// </summary>
|
||||
|
// --------------------------------------------------------------------------------------------------------------------
|
||||
|
|
||||
namespace ImageProcessor.Processors |
namespace ImageProcessor.Processors |
||||
{ |
{ |
||||
public abstract class ResizeBase : IGraphicsProcessor |
#region Using
|
||||
{ |
using System; |
||||
public abstract Regex RegexPattern { get; } |
using System.Collections.Generic; |
||||
public abstract dynamic DynamicParameter { get; set; } |
using System.Drawing; |
||||
public abstract int SortOrder { get; protected set; } |
using System.Drawing.Drawing2D; |
||||
public abstract Dictionary<string, string> Settings { get; set; } |
using System.Drawing.Imaging; |
||||
public abstract int MatchRegexIndex(string queryString); |
using System.Text.RegularExpressions; |
||||
public abstract Image ProcessImage(ImageFactory factory); |
#endregion
|
||||
|
|
||||
protected Image ResizeImage(ImageFactory factory, int width, int height, int defaultMaxWidth, int defaultMaxHeight) |
/// <summary>
|
||||
{ |
/// The resize base for inheriting resizable methods from.
|
||||
Bitmap newImage = null; |
/// </summary>
|
||||
Image image = factory.Image; |
public abstract class ResizeBase : IGraphicsProcessor |
||||
|
{ |
||||
try |
#region IGraphicsProcessor Members
|
||||
{ |
/// <summary>
|
||||
int sourceWidth = image.Width; |
/// Gets the regular expression to search strings for.
|
||||
int sourceHeight = image.Height; |
/// </summary>
|
||||
|
public abstract Regex RegexPattern { get; } |
||||
int maxWidth = defaultMaxWidth > 0 ? defaultMaxWidth : int.MaxValue; |
|
||||
int maxHeight = defaultMaxHeight > 0 ? defaultMaxHeight : int.MaxValue; |
/// <summary>
|
||||
|
/// Gets or sets DynamicParameter.
|
||||
// If height or width is not passed we assume that the standard ratio is to be kept.
|
/// </summary>
|
||||
if (height == 0) |
public abstract dynamic DynamicParameter { get; set; } |
||||
{ |
|
||||
// Bit of simple fractional maths here.
|
/// <summary>
|
||||
float percentWidth = Math.Abs(width/(float) sourceWidth); |
/// Gets or sets the order in which this processor is to be used in a chain.
|
||||
height = (int) Math.Floor(sourceHeight*percentWidth); |
/// </summary>
|
||||
} |
public abstract int SortOrder { get; protected set; } |
||||
|
|
||||
if (width == 0) |
/// <summary>
|
||||
{ |
/// Gets or sets any additional settings required by the processor.
|
||||
float percentHeight = Math.Abs(height/(float) sourceHeight); |
/// </summary>
|
||||
width = (int) Math.Floor(sourceWidth*percentHeight); |
public abstract Dictionary<string, string> Settings { get; set; } |
||||
} |
|
||||
|
/// <summary>
|
||||
if (width > 0 && height > 0 && width <= maxWidth && height <= maxHeight) |
/// The position in the original string where the first character of the captured substring was found.
|
||||
{ |
/// </summary>
|
||||
// Dont use an object initializer here.
|
/// <param name="queryString">
|
||||
newImage = new Bitmap(width, height, PixelFormat.Format32bppPArgb); |
/// The query string to search.
|
||||
newImage.Tag = image.Tag; |
/// </param>
|
||||
|
/// <returns>
|
||||
using (Graphics graphics = Graphics.FromImage(newImage)) |
/// The zero-based starting position in the original string where the captured substring was found.
|
||||
{ |
/// </returns>
|
||||
// We want to use two different blending algorithms for enlargement/shrinking.
|
public abstract int MatchRegexIndex(string queryString); |
||||
// Bicubic is better enlarging for whilst Bilinear is better for shrinking.
|
|
||||
// http://www.codinghorror.com/blog/2007/07/better-image-resizing.html
|
/// <summary>
|
||||
if (image.Width < width && image.Height < height) |
/// Processes the image.
|
||||
{ |
/// </summary>
|
||||
// We are making it larger.
|
/// <param name="factory">
|
||||
graphics.SmoothingMode = SmoothingMode.AntiAlias; |
/// The the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class containing
|
||||
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; |
/// the image to process.
|
||||
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; |
/// </param>
|
||||
graphics.CompositingQuality = CompositingQuality.HighQuality; |
/// <returns>
|
||||
} |
/// The processed image from the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
|
||||
else |
/// </returns>
|
||||
{ |
public abstract Image ProcessImage(ImageFactory factory); |
||||
// We are making it smaller.
|
|
||||
graphics.SmoothingMode = SmoothingMode.None; |
/// <summary>
|
||||
|
/// The resize image.
|
||||
// Contrary to everything I have read bicubic is producing the best results.
|
/// </summary>
|
||||
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; |
/// <param name="factory">
|
||||
graphics.PixelOffsetMode = PixelOffsetMode.None; |
/// The the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class containing
|
||||
graphics.CompositingQuality = CompositingQuality.HighSpeed; |
/// the image to process.
|
||||
} |
/// </param>
|
||||
|
/// <param name="width">
|
||||
// An unwanted border appears when using InterpolationMode.HighQualityBicubic to resize the image
|
/// The width to resize the image to.
|
||||
// as the algorithm appears to be pulling averaging detail from surFlooring pixels beyond the edge
|
/// </param>
|
||||
// of the image. Using the ImageAttributes class to specify that the pixels beyond are simply mirror
|
/// <param name="height">
|
||||
// images of the pixels within solves this problem.
|
/// The height to resize the image to.
|
||||
using (ImageAttributes wrapMode = new ImageAttributes()) |
/// </param>
|
||||
{ |
/// <param name="defaultMaxWidth">
|
||||
wrapMode.SetWrapMode(WrapMode.TileFlipXY); |
/// The default max width to resize the image to.
|
||||
Rectangle destRect = new Rectangle(0, 0, width, height); |
/// </param>
|
||||
graphics.DrawImage(image, destRect, 0, 0, sourceWidth, sourceHeight, GraphicsUnit.Pixel, wrapMode); |
/// <param name="defaultMaxHeight">
|
||||
} |
/// The default max height to resize the image to.
|
||||
|
/// </param>
|
||||
// Reassign the image.
|
/// <returns>
|
||||
image.Dispose(); |
/// The processed image from the current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
|
||||
image = newImage; |
/// </returns>
|
||||
} |
protected Image ResizeImage(ImageFactory factory, int width, int height, int defaultMaxWidth, int defaultMaxHeight) |
||||
} |
{ |
||||
} |
Bitmap newImage = null; |
||||
catch |
Image image = factory.Image; |
||||
{ |
|
||||
if (newImage != null) |
try |
||||
{ |
{ |
||||
newImage.Dispose(); |
int sourceWidth = image.Width; |
||||
} |
int sourceHeight = image.Height; |
||||
} |
|
||||
|
int maxWidth = defaultMaxWidth > 0 ? defaultMaxWidth : int.MaxValue; |
||||
return image; |
int maxHeight = defaultMaxHeight > 0 ? defaultMaxHeight : int.MaxValue; |
||||
} |
|
||||
} |
// If height or width is not passed we assume that the standard ratio is to be kept.
|
||||
|
if (height == 0) |
||||
|
{ |
||||
|
// Bit of simple fractional maths here.
|
||||
|
float percentWidth = Math.Abs(width / (float)sourceWidth); |
||||
|
height = (int)Math.Floor(sourceHeight * percentWidth); |
||||
|
} |
||||
|
|
||||
|
if (width == 0) |
||||
|
{ |
||||
|
float percentHeight = Math.Abs(height / (float)sourceHeight); |
||||
|
width = (int)Math.Floor(sourceWidth * percentHeight); |
||||
|
} |
||||
|
|
||||
|
if (width > 0 && height > 0 && width <= maxWidth && height <= maxHeight) |
||||
|
{ |
||||
|
// Dont use an object initializer here.
|
||||
|
newImage = new Bitmap(width, height, PixelFormat.Format32bppPArgb); |
||||
|
newImage.Tag = image.Tag; |
||||
|
|
||||
|
using (Graphics graphics = Graphics.FromImage(newImage)) |
||||
|
{ |
||||
|
// We want to use two different blending algorithms for enlargement/shrinking.
|
||||
|
// Bicubic is better enlarging for whilst Bilinear is better for shrinking.
|
||||
|
// http://www.codinghorror.com/blog/2007/07/better-image-resizing.html
|
||||
|
if (image.Width < width && image.Height < height) |
||||
|
{ |
||||
|
// We are making it larger.
|
||||
|
graphics.SmoothingMode = SmoothingMode.AntiAlias; |
||||
|
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; |
||||
|
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; |
||||
|
graphics.CompositingQuality = CompositingQuality.HighQuality; |
||||
|
} |
||||
|
else |
||||
|
{ |
||||
|
// We are making it smaller.
|
||||
|
graphics.SmoothingMode = SmoothingMode.None; |
||||
|
|
||||
|
// Contrary to everything I have read bicubic is producing the best results.
|
||||
|
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; |
||||
|
graphics.PixelOffsetMode = PixelOffsetMode.None; |
||||
|
graphics.CompositingQuality = CompositingQuality.HighSpeed; |
||||
|
} |
||||
|
|
||||
|
// An unwanted border appears when using InterpolationMode.HighQualityBicubic to resize the image
|
||||
|
// as the algorithm appears to be pulling averaging detail from surFlooring pixels beyond the edge
|
||||
|
// of the image. Using the ImageAttributes class to specify that the pixels beyond are simply mirror
|
||||
|
// images of the pixels within solves this problem.
|
||||
|
using (ImageAttributes wrapMode = new ImageAttributes()) |
||||
|
{ |
||||
|
wrapMode.SetWrapMode(WrapMode.TileFlipXY); |
||||
|
Rectangle destRect = new Rectangle(0, 0, width, height); |
||||
|
graphics.DrawImage(image, destRect, 0, 0, sourceWidth, sourceHeight, GraphicsUnit.Pixel, wrapMode); |
||||
|
} |
||||
|
|
||||
|
// Reassign the image.
|
||||
|
image.Dispose(); |
||||
|
image = newImage; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
catch |
||||
|
{ |
||||
|
if (newImage != null) |
||||
|
{ |
||||
|
newImage.Dispose(); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
return image; |
||||
|
} |
||||
|
#endregion
|
||||
|
} |
||||
} |
} |
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@ |
|||||
0a367af8c6588fe2be54ef5950820a7f06f7b0f1 |
|
||||
@ -1 +0,0 @@ |
|||||
129834a775acc5e2bfe85dc7db9edd37b9219e43 |
|
||||
@ -1 +0,0 @@ |
|||||
9d6097d930bbf60f2d333f80e7c916759a3c3f0c |
|
||||
@ -0,0 +1 @@ |
|||||
|
7f1cb06ddbb5a91892188c8a18109d8db0f76115 |
||||
Loading…
Reference in new issue