File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed
src/ImageSharp/Primitives
tests/ImageSharp.Tests/Primitives Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -133,7 +133,7 @@ public readonly bool IsIdentity
133
133
result . V = right . X * left . V . X ;
134
134
result . V += right . Y * left . V . Y ;
135
135
result . V += right . Z * left . V . Z ;
136
- result . V += ( right . W * left . V . W ) + right . W ;
136
+ result . V += right . W * left . V . W ;
137
137
138
138
return result ;
139
139
}
Original file line number Diff line number Diff line change @@ -75,11 +75,20 @@ public void ColorMatrixMultiply()
75
75
m . M43 = ( value1 . M41 * value2 . M13 ) + ( value1 . M42 * value2 . M23 ) + ( value1 . M43 * value2 . M33 ) + ( value1 . M44 * value2 . M43 ) ;
76
76
m . M44 = ( value1 . M41 * value2 . M14 ) + ( value1 . M42 * value2 . M24 ) + ( value1 . M43 * value2 . M34 ) + ( value1 . M44 * value2 . M44 ) ;
77
77
78
+ #if NET6_0
78
79
// Fifth row
79
80
m . M51 = ( value1 . M51 * value2 . M11 ) + ( value1 . M52 * value2 . M21 ) + ( value1 . M53 * value2 . M31 ) + ( value1 . M54 * value2 . M41 ) + value2 . M51 ;
80
81
m . M52 = ( value1 . M51 * value2 . M12 ) + ( value1 . M52 * value2 . M22 ) + ( value1 . M53 * value2 . M32 ) + ( value1 . M54 * value2 . M52 ) + value2 . M52 ;
81
82
m . M53 = ( value1 . M51 * value2 . M13 ) + ( value1 . M52 * value2 . M23 ) + ( value1 . M53 * value2 . M33 ) + ( value1 . M54 * value2 . M53 ) + value2 . M53 ;
82
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
86
+ // Fifth row
87
+ m . M51 = ( value1 . M51 * value2 . M11 ) + ( value1 . M52 * value2 . M21 ) + ( value1 . M53 * value2 . M31 ) + ( value1 . M54 * value2 . M41 ) ;
88
+ m . M52 = ( value1 . M51 * value2 . M12 ) + ( value1 . M52 * value2 . M22 ) + ( value1 . M53 * value2 . M32 ) + ( value1 . M54 * value2 . M52 ) ;
89
+ m . M53 = ( value1 . M51 * value2 . M13 ) + ( value1 . M52 * value2 . M23 ) + ( value1 . M53 * value2 . M33 ) + ( value1 . M54 * value2 . M53 ) ;
90
+ m . M54 = ( value1 . M51 * value2 . M14 ) + ( value1 . M52 * value2 . M24 ) + ( value1 . M53 * value2 . M34 ) + ( value1 . M54 * value2 . M54 ) ;
91
+ #endif
83
92
84
93
Assert . Equal ( m , value1 * value2 , this . approximateFloatComparer ) ;
85
94
}
You can’t perform that action at this time.
0 commit comments