Fix wxGraphicsMatrix concatenation (Direct2D)
1. Elements of resulting matrix are modified directly (in-place) in Matrix3x2F::SetProduct() so none of the multiplied matrices can be the instance of the resulting matrix. 2. The parameter matrix in wxGraphicsMatrixData::Concat() should be a multiplicand, not a multiplier. See #17670.
This commit is contained in:
@@ -1525,10 +1525,21 @@ class wxGraphicsMatrix : public wxGraphicsObject
|
||||
public:
|
||||
/**
|
||||
Concatenates the matrix passed with the current matrix.
|
||||
The effect of the resulting transformation is to first apply
|
||||
the transformation in @a t to the coordinates and then apply
|
||||
the transformation in the current matrix to the coordinates.
|
||||
|
||||
@code
|
||||
// matrix = t x matrix
|
||||
@endcode
|
||||
|
||||
@param t
|
||||
The parameter matrix is the multiplicand.
|
||||
*/
|
||||
virtual void Concat(const wxGraphicsMatrix* t);
|
||||
|
||||
/**
|
||||
Concatenates the matrix passed with the current matrix.
|
||||
@overload
|
||||
*/
|
||||
void Concat(const wxGraphicsMatrix& t);
|
||||
|
||||
|
Reference in New Issue
Block a user