Skip to content

Commit 61f4683

Browse files
Rename methods to avoid confusion
1 parent 5c7849b commit 61f4683

2 files changed

Lines changed: 16 additions & 15 deletions

File tree

src/ImageSharp.Web/ExifOrientationUtilities.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,31 @@ public static Vector2 Transform(Vector2 position, Vector2 min, Vector2 max, usho
3131
}
3232

3333
// New XY is calculated based on flipping and rotating the input XY.
34-
// Coordinates are normalized to a range of 0-1 so we can pass a constant integer size to the transform builder.
35-
Vector2 normalized = Normalize(position, min, max);
34+
// Coordinate ranges are normalized to a range of 0-1 so we can pass a
35+
// constant integer size to the transform builder.
36+
Vector2 scaled = Scale(position, min, max);
3637
AffineTransformBuilder builder = new();
3738
Size size = new(1, 1);
3839
switch (orientation)
3940
{
4041
case ExifOrientationMode.TopRight:
41-
builder.AppendTranslation(new Vector2(FlipNormalized(normalized.X), 0));
42+
builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
4243
break;
4344
case ExifOrientationMode.BottomRight:
4445
builder.AppendRotationDegrees(180);
4546
break;
4647
case ExifOrientationMode.BottomLeft:
47-
builder.AppendTranslation(new Vector2(0, FlipNormalized(normalized.Y)));
48+
builder.AppendTranslation(new Vector2(0, FlipScaled(scaled.Y)));
4849
break;
4950
case ExifOrientationMode.LeftTop:
50-
builder.AppendTranslation(new Vector2(FlipNormalized(normalized.X), 0));
51+
builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
5152
builder.AppendRotationDegrees(270);
5253
break;
5354
case ExifOrientationMode.RightTop:
5455
builder.AppendRotationDegrees(270);
5556
break;
5657
case ExifOrientationMode.RightBottom:
57-
builder.AppendTranslation(new Vector2(FlipNormalized(normalized.X), 0));
58+
builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
5859
builder.AppendRotationDegrees(90);
5960
break;
6061
case ExifOrientationMode.LeftBottom:
@@ -65,7 +66,7 @@ public static Vector2 Transform(Vector2 position, Vector2 min, Vector2 max, usho
6566
}
6667

6768
Matrix3x2 matrix = builder.BuildMatrix(size);
68-
return DeNormalize(Vector2.Transform(normalized, matrix), min, max);
69+
return DeScale(Vector2.Transform(scaled, matrix), min, max);
6970
}
7071

7172
/// <summary>
@@ -194,12 +195,12 @@ or ExifOrientationMode.RightBottom
194195
};
195196

196197
[MethodImpl(MethodImplOptions.AggressiveInlining)]
197-
private static Vector2 Normalize(Vector2 x, Vector2 min, Vector2 max) => (x - min) / (max - min);
198+
private static Vector2 Scale(Vector2 x, Vector2 min, Vector2 max) => (x - min) / (max - min);
198199

199200
[MethodImpl(MethodImplOptions.AggressiveInlining)]
200-
private static Vector2 DeNormalize(Vector2 x, Vector2 min, Vector2 max) => min + (x * (max - min));
201+
private static Vector2 DeScale(Vector2 x, Vector2 min, Vector2 max) => min + (x * (max - min));
201202

202203
[MethodImpl(MethodImplOptions.AggressiveInlining)]
203-
private static float FlipNormalized(float origin) => (2F * -origin) + 1F;
204+
private static float FlipScaled(float origin) => (2F * -origin) + 1F;
204205
}
205206
}

tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ public void ResizeWebProcessor_CanReportAlphaRequirements(ResizeMode resizeMode,
294294

295295
private static PointF GetExpectedCenter(ushort orientation, PointF center)
296296
{
297-
static float FlipNormalized(float origin) => (2F * -origin) + 1F;
297+
static float Flip(float origin) => (2F * -origin) + 1F;
298298

299299
// New XY is calculated based on flipping and rotating the input XY.
300300
// Coordinates range from 0-1, hence the matching source size.
@@ -303,23 +303,23 @@ private static PointF GetExpectedCenter(ushort orientation, PointF center)
303303
switch (orientation)
304304
{
305305
case ExifOrientationMode.TopRight:
306-
builder.AppendTranslation(new PointF(FlipNormalized(center.X), 0));
306+
builder.AppendTranslation(new PointF(Flip(center.X), 0));
307307
break;
308308
case ExifOrientationMode.BottomRight:
309309
builder.AppendRotationDegrees(180);
310310
break;
311311
case ExifOrientationMode.BottomLeft:
312-
builder.AppendTranslation(new PointF(0, FlipNormalized(center.Y)));
312+
builder.AppendTranslation(new PointF(0, Flip(center.Y)));
313313
break;
314314
case ExifOrientationMode.LeftTop:
315-
builder.AppendTranslation(new PointF(FlipNormalized(center.X), 0));
315+
builder.AppendTranslation(new PointF(Flip(center.X), 0));
316316
builder.AppendRotationDegrees(270);
317317
break;
318318
case ExifOrientationMode.RightTop:
319319
builder.AppendRotationDegrees(270);
320320
break;
321321
case ExifOrientationMode.RightBottom:
322-
builder.AppendTranslation(new PointF(FlipNormalized(center.X), 0));
322+
builder.AppendTranslation(new PointF(Flip(center.X), 0));
323323
builder.AppendRotationDegrees(90);
324324
break;
325325
case ExifOrientationMode.LeftBottom:

0 commit comments

Comments
 (0)