tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix #233

af/merge-core
James Jackson-South 9 years ago
parent
89f563be26
commit
b6c8cb2e3d
2 changed files with 43 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs
  2. 8
      src/ImageSharp/Processing/Transforms/Resize.cs

77
src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs
View File

@ -5,7 +5,6 @@
namespace ImageSharp.Processing
{
using System;
using System.Linq;
using ImageSharp.PixelFormats;
@ -86,17 +85,17 @@ namespace ImageSharp.Processing
if (options.CenterCoordinates.Any())
{
float center = -(ratio * sourceHeight) * options.CenterCoordinates.First();
destinationY = (int)center + (height / 2);
float center = -(ratio * sourceHeight) * options.CenterCoordinates.ToArray()[1];
destinationY = (int)MathF.Round(center + (height / 2F));
if (destinationY > 0)
{
destinationY = 0;
}
if (destinationY < (int)(height - (sourceHeight * ratio)))
if (destinationY < (int)MathF.Round(height - (sourceHeight * ratio)))
{
destinationY = (int)(height - (sourceHeight * ratio));
destinationY = (int)MathF.Round(height - (sourceHeight * ratio));
}
}
else
@ -111,10 +110,10 @@ namespace ImageSharp.Processing
case AnchorPosition.Bottom:
case AnchorPosition.BottomLeft:
case AnchorPosition.BottomRight:
destinationY = (int)(height - (sourceHeight * ratio));
destinationY = (int)MathF.Round(height - (sourceHeight * ratio));
break;
default:
destinationY = (int)((height - (sourceHeight * ratio)) / 2);
destinationY = (int)MathF.Round((height - (sourceHeight * ratio)) / 2F);
break;
}
}
@ -127,17 +126,17 @@ namespace ImageSharp.Processing
if (options.CenterCoordinates.Any())
{
float center = -(ratio * sourceWidth) * options.CenterCoordinates.ToArray()[1];
destinationX = (int)center + (width / 2);
float center = -(ratio * sourceWidth) * options.CenterCoordinates.First();
destinationX = (int)MathF.Round(center + (width / 2F));
if (destinationX > 0)
{
destinationX = 0;
}
if (destinationX < (int)(width - (sourceWidth * ratio)))
if (destinationX < (int)MathF.Round(width - (sourceWidth * ratio)))
{
destinationX = (int)(width - (sourceWidth * ratio));
destinationX = (int)MathF.Round(width - (sourceWidth * ratio));
}
}
else
@ -152,10 +151,10 @@ namespace ImageSharp.Processing
case AnchorPosition.Right:
case AnchorPosition.TopRight:
case AnchorPosition.BottomRight:
destinationX = (int)(width - (sourceWidth * ratio));
destinationX = (int)MathF.Round(width - (sourceWidth * ratio));
break;
default:
destinationX = (int)((width - (sourceWidth * ratio)) / 2);
destinationX = (int)MathF.Round((width - (sourceWidth * ratio)) / 2F);
break;
}
}
@ -202,7 +201,7 @@ namespace ImageSharp.Processing
if (percentHeight < percentWidth)
{
ratio = percentHeight;
destinationWidth = Convert.ToInt32(sourceWidth * percentHeight);
destinationWidth = (int)MathF.Round(sourceWidth * percentHeight);
switch (options.Position)
{
@ -214,17 +213,17 @@ namespace ImageSharp.Processing
case AnchorPosition.Right:
case AnchorPosition.TopRight:
case AnchorPosition.BottomRight:
destinationX = (int)(width - (sourceWidth * ratio));
destinationX = (int)MathF.Round(width - (sourceWidth * ratio));
break;
default:
destinationX = Convert.ToInt32((width - (sourceWidth * ratio)) / 2);
destinationX = (int)MathF.Round((width - (sourceWidth * ratio)) / 2F);
break;
}
}
else
{
ratio = percentWidth;
destinationHeight = Convert.ToInt32(sourceHeight * percentWidth);
destinationHeight = (int)MathF.Round(sourceHeight * percentWidth);
switch (options.Position)
{
@ -236,10 +235,10 @@ namespace ImageSharp.Processing
case AnchorPosition.Bottom:
case AnchorPosition.BottomLeft:
case AnchorPosition.BottomRight:
destinationY = (int)(height - (sourceHeight * ratio));
destinationY = (int)MathF.Round(height - (sourceHeight * ratio));
break;
default:
destinationY = (int)((height - (sourceHeight * ratio)) / 2);
destinationY = (int)MathF.Round((height - (sourceHeight * ratio)) / 2F);
break;
}
}
@ -274,8 +273,8 @@ namespace ImageSharp.Processing
float percentHeight = MathF.Abs(height / (float)sourceHeight);
float percentWidth = MathF.Abs(width / (float)sourceWidth);
int boxPadHeight = height > 0 ? height : Convert.ToInt32(sourceHeight * percentWidth);
int boxPadWidth = width > 0 ? width : Convert.ToInt32(sourceWidth * percentHeight);
int boxPadHeight = height > 0 ? height : (int)MathF.Round(sourceHeight * percentWidth);
int boxPadWidth = width > 0 ? width : (int)MathF.Round(sourceWidth * percentHeight);
// Only calculate if upscaling.
if (sourceWidth < boxPadWidth && sourceHeight < boxPadHeight)
@ -356,17 +355,17 @@ namespace ImageSharp.Processing
float percentWidth = MathF.Abs(width / (float)source.Width);
// Integers must be cast to floats to get needed precision
float ratio = (float)options.Size.Height / options.Size.Width;
float sourceRatio = (float)source.Height / source.Width;
float ratio = options.Size.Height / (float)options.Size.Width;
float sourceRatio = source.Height / (float)source.Width;
if (sourceRatio < ratio)
{
destinationHeight = Convert.ToInt32(source.Height * percentWidth);
destinationHeight = (int)MathF.Round(source.Height * percentWidth);
height = destinationHeight;
}
else
{
destinationWidth = Convert.ToInt32(source.Width * percentHeight);
destinationWidth = (int)MathF.Round(source.Width * percentHeight);
width = destinationWidth;
}
@ -389,35 +388,37 @@ namespace ImageSharp.Processing
{
int width = options.Size.Width;
int height = options.Size.Height;
int sourceWidth = source.Width;
int sourceHeight = source.Height;
int destinationWidth;
int destinationHeight;
// Don't upscale
if (width > source.Width || height > source.Height)
if (width > sourceWidth || height > sourceHeight)
{
options.Size = new Size(source.Width, source.Height);
return new Rectangle(0, 0, source.Width, source.Height);
options.Size = new Size(sourceWidth, sourceHeight);
return new Rectangle(0, 0, sourceWidth, sourceHeight);
}
// Fractional variants for preserving aspect ratio.
float percentHeight = MathF.Abs(height / (float)source.Height);
float percentWidth = MathF.Abs(width / (float)source.Width);
float percentHeight = MathF.Abs(height / (float)sourceHeight);
float percentWidth = MathF.Abs(width / (float)sourceWidth);
float sourceRatio = (float)source.Height / source.Width;
float sourceRatio = (float)sourceHeight / sourceWidth;
// Find the shortest distance to go.
int widthDiff = source.Width - width;
int heightDiff = source.Height - height;
int widthDiff = sourceWidth - width;
int heightDiff = sourceHeight - height;
if (widthDiff < heightDiff)
{
destinationHeight = Convert.ToInt32(width * sourceRatio);
destinationHeight = (int)MathF.Round(width * sourceRatio);
height = destinationHeight;
destinationWidth = width;
}
else if (widthDiff > heightDiff)
{
destinationWidth = Convert.ToInt32(height / sourceRatio);
destinationWidth = (int)MathF.Round(height / sourceRatio);
destinationHeight = height;
width = destinationWidth;
}
@ -426,13 +427,13 @@ namespace ImageSharp.Processing
if (height > width)
{
destinationWidth = width;
destinationHeight = Convert.ToInt32(source.Height * percentWidth);
destinationHeight = (int)MathF.Round(sourceHeight * percentWidth);
height = destinationHeight;
}
else
{
destinationHeight = height;
destinationWidth = Convert.ToInt32(source.Width * percentHeight);
destinationWidth = (int)MathF.Round(sourceWidth * percentHeight);
width = destinationWidth;
}
}
@ -442,4 +443,4 @@ namespace ImageSharp.Processing
return new Rectangle(0, 0, destinationWidth, destinationHeight);
}
}
}
}

8
src/ImageSharp/Processing/Transforms/Resize.cs
View File

@ -29,12 +29,12 @@ namespace ImageSharp
// Ensure size is populated across both dimensions.
if (options.Size.Width == 0 && options.Size.Height > 0)
{
options.Size = new Size(source.Width * options.Size.Height / source.Height, options.Size.Height);
options.Size = new Size((int)MathF.Round(source.Width * options.Size.Height / (float)source.Height), options.Size.Height);
}
if (options.Size.Height == 0 && options.Size.Width > 0)
{
options.Size = new Size(options.Size.Width, source.Height * options.Size.Width / source.Width);
options.Size = new Size(options.Size.Width, (int)MathF.Round(source.Height * options.Size.Width / (float)source.Width));
}
Rectangle targetRectangle = ResizeHelper.CalculateTargetLocationAndBounds(source, options);
@ -158,13 +158,13 @@ namespace ImageSharp
{
if (width == 0 && height > 0)
{
width = source.Width * height / source.Height;
width = (int)MathF.Round(source.Width * height / (float)source.Height);
targetRectangle.Width = width;
}
if (height == 0 && width > 0)
{
height = source.Height * width / source.Width;
height = (int)MathF.Round(source.Height * width / (float)source.Width);
targetRectangle.Height = height;
}

Write Preview
Loading…
Cancel
Save