Browse Source

v1.8.1.1

Former-commit-id: a1537b287f0daefb201d3804c6abcaed14303f32
af/merge-core
James South 13 years ago
parent
commit
6fe35616da
  1. 28
      src/ImageProcessor/ImageFactory.cs
  2. 30
      src/ImageProcessor/Imaging/TextLayer.cs
  3. 4
      src/ImageProcessor/Properties/AssemblyInfo.cs
  4. 1
      src/Nuget/ImageProcessor.1.8.1.1.nupkg.REMOVED.git-id
  5. 1
      src/TestWebsites/NET45/Test_Website_NET45/Images/Thumbs.db.REMOVED.git-id

28
src/ImageProcessor/ImageFactory.cs

@ -323,34 +323,6 @@ namespace ImageProcessor
return this;
}
/// <summary>
/// Applies a Gaussian blur to the current image.
/// </summary>
/// <param name="radius">
/// The radius by which to blur the images pixels.
/// Any integer between 0 and 100.
/// </param>
/// <returns>
/// The current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
/// </returns>
public ImageFactory Blur(int radius)
{
if (this.ShouldProcess)
{
// Sanitize the input.
if (radius > 100)
{
radius = 0;
}
GaussianBlur blur = new GaussianBlur { DynamicParameter = radius };
this.Image = blur.ProcessImage(this);
}
return this;
}
/// <summary>
/// Constrains the current image, resizing it to fit within the given dimensions whilst keeping its aspect ratio.
/// </summary>

30
src/ImageProcessor/Imaging/TextLayer.cs

@ -1,9 +1,12 @@
// -----------------------------------------------------------------------
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="TextLayer.cs" company="James South">
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// Copyright (c) James South.
// Licensed under the Apache License, Version 2.0.
// </copyright>
// -----------------------------------------------------------------------
// <summary>
// Encapsulates the properties required to add a layer of text to an image.
// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace ImageProcessor.Imaging
{
@ -20,7 +23,7 @@ namespace ImageProcessor.Imaging
{
#region Fields
/// <summary>
/// The colour to render the text.
/// The color to render the text.
/// </summary>
private Color textColor = Color.Black;
@ -32,7 +35,7 @@ namespace ImageProcessor.Imaging
/// <summary>
/// The font style to render the text.
/// </summary>
private FontStyle fontStyle = FontStyle.Bold;
private FontStyle fontStyle = FontStyle.Regular;
/// <summary>
/// The font size to render the text.
@ -53,6 +56,9 @@ namespace ImageProcessor.Imaging
/// <summary>
/// Gets or sets the Color to render the font.
/// <remarks>
/// <para>Defaults to black.</para>
/// </remarks>
/// </summary>
public Color TextColor
{
@ -67,6 +73,9 @@ namespace ImageProcessor.Imaging
/// <summary>
/// Gets or sets the size of the font in pixels.
/// <remarks>
/// <para>Defaults to 48 pixels.</para>
/// </remarks>
/// </summary>
public int FontSize
{
@ -75,7 +84,10 @@ namespace ImageProcessor.Imaging
}
/// <summary>
/// Gets or sets the FontStyle of the textlayer.
/// Gets or sets the FontStyle of the text layer.
/// <remarks>
/// <para>Defaults to regular.</para>
/// </remarks>
/// </summary>
public FontStyle Style
{
@ -84,7 +96,7 @@ namespace ImageProcessor.Imaging
}
/// <summary>
/// Gets or sets the Opacity of the textlayer.
/// Gets or sets the Opacity of the text layer.
/// </summary>
public int Opacity
{
@ -102,7 +114,7 @@ namespace ImageProcessor.Imaging
}
/// <summary>
/// Gets or sets the Position of the textlayer.
/// Gets or sets the Position of the text layer.
/// </summary>
public Point Position
{

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.8.1.0")]
[assembly: AssemblyFileVersion("1.8.1.0")]
[assembly: AssemblyVersion("1.8.1.1")]
[assembly: AssemblyFileVersion("1.8.1.1")]

1
src/Nuget/ImageProcessor.1.8.1.1.nupkg.REMOVED.git-id

@ -0,0 +1 @@
247fa919ace01d934bd0a19d37587ad26195b33e

1
src/TestWebsites/NET45/Test_Website_NET45/Images/Thumbs.db.REMOVED.git-id

@ -1 +0,0 @@
5a5eaebf9a5eafe87321a87bf497baf7e2152653
Loading…
Cancel
Save