diff options
| author | Hans Breuer <hans@breuer.org> | 2005-06-13 08:46:03 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-06-13 08:46:03 +0000 |
| commit | 3c9fc8fda618af0f8794e57d7450a2020eb8210e (patch) | |
| tree | d4d035f83ce7d448817689be2cfd3d1f9e9d78e6 | |
| parent | 4a3c59e65bf14ab441574503021c0daff9af3e76 (diff) | |
| download | pango-3c9fc8fda618af0f8794e57d7450a2020eb8210e.tar.gz | |
Merge from HEAD:
2005-03-18 Hans Breuer <hans@breuer.org>
Merge from HEAD:
* pango/pangowin32.c(pango_win32_render_transformed) : matrix elements
xy and yx are needed the other way around for XFORM
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | pango/pangowin32.c | 4 |
3 files changed, 18 insertions, 4 deletions
@@ -1,6 +1,13 @@ +2005-03-18 Hans Breuer <hans@breuer.org> + + Merge from HEAD: + + * pango/pangowin32.c(pango_win32_render_transformed) : matrix elements + xy and yx are needed the other way around for XFORM + 2005-04-28 Tor Lillqvist <tml@novell.com> - Add support to pangowin32 for TrueType fonts covering more than + Add support to pangowin32 for TrueType fonts with coverage outside the BMP. Fix handling of surrogate pairs in the Uniscribe shaper. (#302238) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d0a3e626..158b1490 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,6 +1,13 @@ +2005-03-18 Hans Breuer <hans@breuer.org> + + Merge from HEAD: + + * pango/pangowin32.c(pango_win32_render_transformed) : matrix elements + xy and yx are needed the other way around for XFORM + 2005-04-28 Tor Lillqvist <tml@novell.com> - Add support to pangowin32 for TrueType fonts covering more than + Add support to pangowin32 for TrueType fonts with coverage outside the BMP. Fix handling of surrogate pairs in the Uniscribe shaper. (#302238) diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 2cf613f9..0b58346d 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -430,8 +430,8 @@ pango_win32_render_transformed (HDC hdc, else if (matrix) { xForm.eM11 = matrix->xx; - xForm.eM12 = matrix->xy; - xForm.eM21 = matrix->yx; + xForm.eM12 = matrix->yx; + xForm.eM21 = matrix->xy; xForm.eM22 = matrix->yy; xForm.eDx = matrix->x0; xForm.eDy = matrix->y0; |