From 4d6d73eab3d59d9d88f7d18593e357fe6acd96fa Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sun, 18 Sep 2016 23:07:59 +0200 Subject: [PATCH] Fix wxGraphicsMatrix concatenation (Cairo) The parameter matrix in wxGraphicsMatrixData::Concat() should be a multiplicand, not a multiplier. Closes #17670. --- src/generic/graphicc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 8c7acc3525..0369cbb452 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1266,7 +1266,8 @@ wxGraphicsObjectRefData *wxCairoMatrixData::Clone() const // concatenates the matrix void wxCairoMatrixData::Concat( const wxGraphicsMatrixData *t ) { - cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix()); + // The parameter matrix (t) is the multiplicand. + cairo_matrix_multiply(&m_matrix, (cairo_matrix_t*) t->GetNativeMatrix(), &m_matrix); } // sets the matrix to the respective values