Skip to content

Commit 8a065ac

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Move property to base.
1 parent f23fd09 commit 8a065ac

File tree

3 files changed

+6
-67
lines changed

3 files changed

+6
-67
lines changed

‎tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/PixelOperationsTests.Specialized.Generated.cs‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ public partial class A8_OperationsTests : PixelOperationsTests<A8>
1818
public A8_OperationsTests(ITestOutputHelper output)
1919
: base(output)
2020
{
21-
var alphaRepresentation = A8.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
22-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
2321
}
2422

2523
protected override PixelOperations<A8> Operations => A8.PixelOperations.Instance;
@@ -40,8 +38,6 @@ public partial class Argb32_OperationsTests : PixelOperationsTests<Argb32>
4038
public Argb32_OperationsTests(ITestOutputHelper output)
4139
: base(output)
4240
{
43-
var alphaRepresentation = Argb32.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
44-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
4541
}
4642

4743
protected override PixelOperations<Argb32> Operations => Argb32.PixelOperations.Instance;
@@ -62,8 +58,6 @@ public partial class Bgr24_OperationsTests : PixelOperationsTests<Bgr24>
6258
public Bgr24_OperationsTests(ITestOutputHelper output)
6359
: base(output)
6460
{
65-
var alphaRepresentation = Bgr24.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
66-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
6761
}
6862

6963
protected override PixelOperations<Bgr24> Operations => Bgr24.PixelOperations.Instance;
@@ -84,8 +78,6 @@ public partial class Bgr565_OperationsTests : PixelOperationsTests<Bgr565>
8478
public Bgr565_OperationsTests(ITestOutputHelper output)
8579
: base(output)
8680
{
87-
var alphaRepresentation = Bgr565.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
88-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
8981
}
9082

9183
protected override PixelOperations<Bgr565> Operations => Bgr565.PixelOperations.Instance;
@@ -106,8 +98,6 @@ public partial class Bgra32_OperationsTests : PixelOperationsTests<Bgra32>
10698
public Bgra32_OperationsTests(ITestOutputHelper output)
10799
: base(output)
108100
{
109-
var alphaRepresentation = Bgra32.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
110-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
111101
}
112102

113103
protected override PixelOperations<Bgra32> Operations => Bgra32.PixelOperations.Instance;
@@ -128,8 +118,6 @@ public partial class Bgra4444_OperationsTests : PixelOperationsTests<Bgra4444>
128118
public Bgra4444_OperationsTests(ITestOutputHelper output)
129119
: base(output)
130120
{
131-
var alphaRepresentation = Bgra4444.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
132-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
133121
}
134122

135123
protected override PixelOperations<Bgra4444> Operations => Bgra4444.PixelOperations.Instance;
@@ -150,8 +138,6 @@ public partial class Bgra5551_OperationsTests : PixelOperationsTests<Bgra5551>
150138
public Bgra5551_OperationsTests(ITestOutputHelper output)
151139
: base(output)
152140
{
153-
var alphaRepresentation = Bgra5551.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
154-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
155141
}
156142

157143
protected override PixelOperations<Bgra5551> Operations => Bgra5551.PixelOperations.Instance;
@@ -172,8 +158,6 @@ public partial class Byte4_OperationsTests : PixelOperationsTests<Byte4>
172158
public Byte4_OperationsTests(ITestOutputHelper output)
173159
: base(output)
174160
{
175-
var alphaRepresentation = Byte4.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
176-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
177161
}
178162

179163
protected override PixelOperations<Byte4> Operations => Byte4.PixelOperations.Instance;
@@ -194,8 +178,6 @@ public partial class HalfSingle_OperationsTests : PixelOperationsTests<HalfSingl
194178
public HalfSingle_OperationsTests(ITestOutputHelper output)
195179
: base(output)
196180
{
197-
var alphaRepresentation = HalfSingle.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
198-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
199181
}
200182

201183
protected override PixelOperations<HalfSingle> Operations => HalfSingle.PixelOperations.Instance;
@@ -216,8 +198,6 @@ public partial class HalfVector2_OperationsTests : PixelOperationsTests<HalfVect
216198
public HalfVector2_OperationsTests(ITestOutputHelper output)
217199
: base(output)
218200
{
219-
var alphaRepresentation = HalfVector2.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
220-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
221201
}
222202

223203
protected override PixelOperations<HalfVector2> Operations => HalfVector2.PixelOperations.Instance;
@@ -238,8 +218,6 @@ public partial class HalfVector4_OperationsTests : PixelOperationsTests<HalfVect
238218
public HalfVector4_OperationsTests(ITestOutputHelper output)
239219
: base(output)
240220
{
241-
var alphaRepresentation = HalfVector4.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
242-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
243221
}
244222

245223
protected override PixelOperations<HalfVector4> Operations => HalfVector4.PixelOperations.Instance;
@@ -260,8 +238,6 @@ public partial class L16_OperationsTests : PixelOperationsTests<L16>
260238
public L16_OperationsTests(ITestOutputHelper output)
261239
: base(output)
262240
{
263-
var alphaRepresentation = L16.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
264-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
265241
}
266242

267243
protected override PixelOperations<L16> Operations => L16.PixelOperations.Instance;
@@ -282,8 +258,6 @@ public partial class L8_OperationsTests : PixelOperationsTests<L8>
282258
public L8_OperationsTests(ITestOutputHelper output)
283259
: base(output)
284260
{
285-
var alphaRepresentation = L8.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
286-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
287261
}
288262

289263
protected override PixelOperations<L8> Operations => L8.PixelOperations.Instance;
@@ -304,8 +278,6 @@ public partial class La16_OperationsTests : PixelOperationsTests<La16>
304278
public La16_OperationsTests(ITestOutputHelper output)
305279
: base(output)
306280
{
307-
var alphaRepresentation = La16.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
308-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
309281
}
310282

311283
protected override PixelOperations<La16> Operations => La16.PixelOperations.Instance;
@@ -326,8 +298,6 @@ public partial class La32_OperationsTests : PixelOperationsTests<La32>
326298
public La32_OperationsTests(ITestOutputHelper output)
327299
: base(output)
328300
{
329-
var alphaRepresentation = La32.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
330-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
331301
}
332302

333303
protected override PixelOperations<La32> Operations => La32.PixelOperations.Instance;
@@ -348,8 +318,6 @@ public partial class NormalizedByte2_OperationsTests : PixelOperationsTests<Norm
348318
public NormalizedByte2_OperationsTests(ITestOutputHelper output)
349319
: base(output)
350320
{
351-
var alphaRepresentation = NormalizedByte2.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
352-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
353321
}
354322

355323
protected override PixelOperations<NormalizedByte2> Operations => NormalizedByte2.PixelOperations.Instance;
@@ -370,8 +338,6 @@ public partial class NormalizedByte4_OperationsTests : PixelOperationsTests<Norm
370338
public NormalizedByte4_OperationsTests(ITestOutputHelper output)
371339
: base(output)
372340
{
373-
var alphaRepresentation = NormalizedByte4.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
374-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
375341
}
376342

377343
protected override PixelOperations<NormalizedByte4> Operations => NormalizedByte4.PixelOperations.Instance;
@@ -392,8 +358,6 @@ public partial class NormalizedShort2_OperationsTests : PixelOperationsTests<Nor
392358
public NormalizedShort2_OperationsTests(ITestOutputHelper output)
393359
: base(output)
394360
{
395-
var alphaRepresentation = NormalizedShort2.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
396-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
397361
}
398362

399363
protected override PixelOperations<NormalizedShort2> Operations => NormalizedShort2.PixelOperations.Instance;
@@ -414,8 +378,6 @@ public partial class NormalizedShort4_OperationsTests : PixelOperationsTests<Nor
414378
public NormalizedShort4_OperationsTests(ITestOutputHelper output)
415379
: base(output)
416380
{
417-
var alphaRepresentation = NormalizedShort4.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
418-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
419381
}
420382

421383
protected override PixelOperations<NormalizedShort4> Operations => NormalizedShort4.PixelOperations.Instance;
@@ -436,8 +398,6 @@ public partial class Rg32_OperationsTests : PixelOperationsTests<Rg32>
436398
public Rg32_OperationsTests(ITestOutputHelper output)
437399
: base(output)
438400
{
439-
var alphaRepresentation = Rg32.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
440-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
441401
}
442402

443403
protected override PixelOperations<Rg32> Operations => Rg32.PixelOperations.Instance;
@@ -458,8 +418,6 @@ public partial class Rgb24_OperationsTests : PixelOperationsTests<Rgb24>
458418
public Rgb24_OperationsTests(ITestOutputHelper output)
459419
: base(output)
460420
{
461-
var alphaRepresentation = Rgb24.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
462-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
463421
}
464422

465423
protected override PixelOperations<Rgb24> Operations => Rgb24.PixelOperations.Instance;
@@ -480,8 +438,6 @@ public partial class Rgb48_OperationsTests : PixelOperationsTests<Rgb48>
480438
public Rgb48_OperationsTests(ITestOutputHelper output)
481439
: base(output)
482440
{
483-
var alphaRepresentation = Rgb48.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
484-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
485441
}
486442

487443
protected override PixelOperations<Rgb48> Operations => Rgb48.PixelOperations.Instance;
@@ -502,8 +458,6 @@ public partial class Rgba1010102_OperationsTests : PixelOperationsTests<Rgba1010
502458
public Rgba1010102_OperationsTests(ITestOutputHelper output)
503459
: base(output)
504460
{
505-
var alphaRepresentation = Rgba1010102.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
506-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
507461
}
508462

509463
protected override PixelOperations<Rgba1010102> Operations => Rgba1010102.PixelOperations.Instance;
@@ -524,8 +478,6 @@ public partial class Rgba32_OperationsTests : PixelOperationsTests<Rgba32>
524478
public Rgba32_OperationsTests(ITestOutputHelper output)
525479
: base(output)
526480
{
527-
var alphaRepresentation = Rgba32.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
528-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
529481
}
530482

531483
protected override PixelOperations<Rgba32> Operations => Rgba32.PixelOperations.Instance;
@@ -546,8 +498,6 @@ public partial class Rgba64_OperationsTests : PixelOperationsTests<Rgba64>
546498
public Rgba64_OperationsTests(ITestOutputHelper output)
547499
: base(output)
548500
{
549-
var alphaRepresentation = Rgba64.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
550-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
551501
}
552502

553503
protected override PixelOperations<Rgba64> Operations => Rgba64.PixelOperations.Instance;
@@ -568,8 +518,6 @@ public partial class RgbaVector_OperationsTests : PixelOperationsTests<RgbaVecto
568518
public RgbaVector_OperationsTests(ITestOutputHelper output)
569519
: base(output)
570520
{
571-
var alphaRepresentation = RgbaVector.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
572-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
573521
}
574522

575523
protected override PixelOperations<RgbaVector> Operations => RgbaVector.PixelOperations.Instance;
@@ -590,8 +538,6 @@ public partial class Short2_OperationsTests : PixelOperationsTests<Short2>
590538
public Short2_OperationsTests(ITestOutputHelper output)
591539
: base(output)
592540
{
593-
var alphaRepresentation = Short2.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
594-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
595541
}
596542

597543
protected override PixelOperations<Short2> Operations => Short2.PixelOperations.Instance;
@@ -612,8 +558,6 @@ public partial class Short4_OperationsTests : PixelOperationsTests<Short4>
612558
public Short4_OperationsTests(ITestOutputHelper output)
613559
: base(output)
614560
{
615-
var alphaRepresentation = Short4.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
616-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
617561
}
618562

619563
protected override PixelOperations<Short4> Operations => Short4.PixelOperations.Instance;

‎tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/_Common.ttinclude‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ using Xunit.Abstractions;
7474
public <#=pixelType#>_OperationsTests(ITestOutputHelper output)
7575
: base(output)
7676
{
77-
var alphaRepresentation = <#=pixelType#>.PixelOperations.Instance.GetPixelTypeInfo().AlphaRepresentation;
78-
this.HasUnassociatedAlpha = alphaRepresentation == PixelAlphaRepresentation.Unassociated;
7977
}
8078

8179
protected override PixelOperations<<#=pixelType#>> Operations => <#=pixelType#>.PixelOperations.Instance;

‎tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public abstract class PixelOperationsTests<TPixel> : MeasureFixture
3636
null;
3737
#endif
3838

39-
protected bool HasUnassociatedAlpha { get; set; } = true;
40-
4139
protected PixelOperationsTests(ITestOutputHelper output)
4240
: base(output)
4341
{
@@ -73,7 +71,9 @@ protected PixelOperationsTests(ITestOutputHelper output)
7371

7472
protected Configuration Configuration => Configuration.Default;
7573

76-
protected virtual PixelOperations<TPixel> Operations => PixelOperations<TPixel>.Instance;
74+
protected virtual PixelOperations<TPixel> Operations { get; } = PixelOperations<TPixel>.Instance;
75+
76+
protected bool HasUnassociatedAlpha => this.Operations.GetPixelTypeInfo().AlphaRepresentation == PixelAlphaRepresentation.Unassociated;
7777

7878
internal static TPixel[] CreateExpectedPixelData(Vector4[] source, RefAction<Vector4> vectorModifier = null)
7979
{
@@ -217,8 +217,7 @@ void ExpectedAction(ref Vector4 v)
217217
expected,
218218
(s, d) =>
219219
{
220-
PixelConversionModifiers modifiers = this.HasUnassociatedAlpha
221-
? PixelConversionModifiers.Premultiply
220+
PixelConversionModifiers modifiers = this.HasUnassociatedAlpha ? PixelConversionModifiers.Premultiply
222221
: PixelConversionModifiers.None;
223222

224223
this.Operations.FromVector4Destructive(this.Configuration, s, d.GetSpan(), modifiers);
@@ -253,8 +252,7 @@ void ExpectedAction(ref Vector4 v)
253252
expected,
254253
(s, d) =>
255254
{
256-
PixelConversionModifiers modifiers = this.HasUnassociatedAlpha
257-
? PixelConversionModifiers.Premultiply
255+
PixelConversionModifiers modifiers = this.HasUnassociatedAlpha ? PixelConversionModifiers.Premultiply
258256
: PixelConversionModifiers.None;
259257

260258
this.Operations.FromVector4Destructive(
@@ -297,8 +295,7 @@ void ExpectedAction(ref Vector4 v)
297295
expected,
298296
(s, d) =>
299297
{
300-
PixelConversionModifiers modifiers = this.HasUnassociatedAlpha
301-
? PixelConversionModifiers.Premultiply
298+
PixelConversionModifiers modifiers = this.HasUnassociatedAlpha ? PixelConversionModifiers.Premultiply
302299
: PixelConversionModifiers.None;
303300

304301
this.Operations.FromVector4Destructive(

0 commit comments

Comments
 (0)