Skip to content

Commit ed71f00

Browse files
committed
Remove the conditions from the tests
1 parent 7da11fd commit ed71f00

File tree

1 file changed

+0
-33
lines changed

1 file changed

+0
-33
lines changed

tests/ImageSharp.Tests/Primitives/ColorMatrixTests.cs

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,11 @@ public void ColorMatrixMultiply()
7575
m.M43 = (value1.M41 * value2.M13) + (value1.M42 * value2.M23) + (value1.M43 * value2.M33) + (value1.M44 * value2.M43);
7676
m.M44 = (value1.M41 * value2.M14) + (value1.M42 * value2.M24) + (value1.M43 * value2.M34) + (value1.M44 * value2.M44);
7777

78-
#if NET6_0
79-
// Fifth row
80-
m.M51 = (value1.M51 * value2.M11) + (value1.M52 * value2.M21) + (value1.M53 * value2.M31) + (value1.M54 * value2.M41) + value2.M51;
81-
m.M52 = (value1.M51 * value2.M12) + (value1.M52 * value2.M22) + (value1.M53 * value2.M32) + (value1.M54 * value2.M52) + value2.M52;
82-
m.M53 = (value1.M51 * value2.M13) + (value1.M52 * value2.M23) + (value1.M53 * value2.M33) + (value1.M54 * value2.M53) + value2.M53;
83-
m.M54 = (value1.M51 * value2.M14) + (value1.M52 * value2.M24) + (value1.M53 * value2.M34) + (value1.M54 * value2.M54) + value2.M54;
84-
#endif
85-
#if NET7_0_OR_GREATER
8678
// Fifth row
8779
m.M51 = (value1.M51 * value2.M11) + (value1.M52 * value2.M21) + (value1.M53 * value2.M31) + (value1.M54 * value2.M41);
8880
m.M52 = (value1.M51 * value2.M12) + (value1.M52 * value2.M22) + (value1.M53 * value2.M32) + (value1.M54 * value2.M52);
8981
m.M53 = (value1.M51 * value2.M13) + (value1.M52 * value2.M23) + (value1.M53 * value2.M33) + (value1.M54 * value2.M53);
9082
m.M54 = (value1.M51 * value2.M14) + (value1.M52 * value2.M24) + (value1.M53 * value2.M34) + (value1.M54 * value2.M54);
91-
#endif
9283

9384
Assert.Equal(m, value1 * value2, this.approximateFloatComparer);
9485
}
@@ -128,7 +119,6 @@ public void ColorMatrixHashCode()
128119

129120
HashCode hash = default;
130121

131-
#if NET7_0_OR_GREATER
132122
Vector4 x = new(m.M11, m.M12, m.M13, m.M14);
133123
Vector4 y = new(m.M21, m.M22, m.M23, m.M24);
134124
Vector4 z = new(m.M31, m.M32, m.M33, m.M34);
@@ -140,29 +130,6 @@ public void ColorMatrixHashCode()
140130
hash.Add(z);
141131
hash.Add(w);
142132
hash.Add(v);
143-
#endif
144-
#if NET6_0
145-
hash.Add(m.M11);
146-
hash.Add(m.M12);
147-
hash.Add(m.M13);
148-
hash.Add(m.M14);
149-
hash.Add(m.M21);
150-
hash.Add(m.M22);
151-
hash.Add(m.M23);
152-
hash.Add(m.M24);
153-
hash.Add(m.M31);
154-
hash.Add(m.M32);
155-
hash.Add(m.M33);
156-
hash.Add(m.M34);
157-
hash.Add(m.M41);
158-
hash.Add(m.M42);
159-
hash.Add(m.M43);
160-
hash.Add(m.M44);
161-
hash.Add(m.M51);
162-
hash.Add(m.M52);
163-
hash.Add(m.M53);
164-
hash.Add(m.M54);
165-
#endif
166133

167134

168135
Assert.Equal(hash.ToHashCode(), m.GetHashCode());

0 commit comments

Comments
 (0)