[qpainter] Correctly convert QMatrix -> cairo_matrix_t
authorVladimir Vukicevic <vladimir@pobox.com>
Sun, 20 Apr 2008 01:41:51 -0700
changeset 16891 0aa6bd10d613df7db8aac8d835c935da0dd0ae15
parent 16890 e4f836550e54aa29810790cf05b5ea51eedf4d62
child 16892 49e30e52ee0cfdd9a9f6df96dfa52d2854bbfe9c
push idunknown
push userunknown
push dateunknown
milestone2.0a1pre
[qpainter] Correctly convert QMatrix -> cairo_matrix_t
gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
--- a/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
+++ b/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
@@ -250,23 +250,23 @@ static QImage::Format
     }
 
     return QImage::Format_Mono;
 }
 
 static inline QMatrix
 _qmatrix_from_cairo_matrix (const cairo_matrix_t& m)
 {
-    return QMatrix(m.xx, m.xy, m.yx, m.yy, m.x0, m.y0);
+    return QMatrix(m.xx, m.yx, m.xy, m.yy, m.x0, m.y0);
 }
 
 static inline void
 _qmatrix_from_cairo_matrix (const cairo_matrix_t& m, QMatrix& qm)
 {
-    qm.setMatrix(m.xx, m.xy, m.yx, m.yy, m.x0, m.y0);
+    qm.setMatrix(m.xx, m.yx, m.xy, m.yy, m.x0, m.y0);
 }
 
 /** Path conversion **/
 typedef struct _qpainter_path_transform {
     QPainterPath *path;
     cairo_matrix_t *ctm_inverse;
 } qpainter_path_data;