summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2011-04-21 15:17:03 -0400
committerBehdad Esfahbod <behdad@behdad.org>2011-04-21 15:17:03 -0400
commitc592e19bb9235b6bd51293bfd25b8d40d1ae3aa7 (patch)
treec7213f95f46b2f5032fbbfc4a00809ea0aa44325
parentbf99026f8dbe054e9c59bf5a891b76b71ea912b7 (diff)
downloadpango-c592e19bb9235b6bd51293bfd25b8d40d1ae3aa7.tar.gz
[HB] Make y grow down
More intuitive.
-rw-r--r--modules/basic/basic-fc.c8
-rw-r--r--pango/pango-ot-buffer.c4
-rw-r--r--pango/pango-ot-info.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 24a84270..119b19e7 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -261,8 +261,8 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
NULL);
hb_font_set_scale (hb_font,
/* XXX CTM */
- ((guint64) ft_face->size->metrics.x_scale * ft_face->units_per_EM) >> 12,
- ((guint64) ft_face->size->metrics.y_scale * ft_face->units_per_EM) >> 12);
+ (((guint64) ft_face->size->metrics.x_scale * ft_face->units_per_EM) >> 12),
+ -(((guint64) ft_face->size->metrics.y_scale * ft_face->units_per_EM) >> 12));
is_hinted = fc_font->is_hinted;
hb_font_set_ppem (hb_font,
is_hinted ? ft_face->size->metrics.x_ppem : 0,
@@ -295,8 +295,8 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
advance = PANGO_UNITS_ROUND (advance);
*/
glyphs->glyphs[i].geometry.width = hb_position->x_advance;
- glyphs->glyphs[i].geometry.x_offset = hb_position->x_offset;
- glyphs->glyphs[i].geometry.y_offset = -hb_position->y_offset;
+ glyphs->glyphs[i].geometry.x_offset = hb_position->x_offset;
+ glyphs->glyphs[i].geometry.y_offset = hb_position->y_offset;
hb_glyph++;
hb_position++;
diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c
index 26213a5a..100e6465 100644
--- a/pango/pango-ot-buffer.c
+++ b/pango/pango-ot-buffer.c
@@ -257,8 +257,8 @@ pango_ot_buffer_output (const PangoOTBuffer *buffer,
if (is_hinted)
advance = PANGO_UNITS_ROUND (advance);
glyphs->glyphs[i].geometry.width = advance;
- glyphs->glyphs[i].geometry.x_offset = hb_position->x_offset;
- glyphs->glyphs[i].geometry.y_offset = -hb_position->y_offset;
+ glyphs->glyphs[i].geometry.x_offset = hb_position->x_offset;
+ glyphs->glyphs[i].geometry.y_offset = hb_position->y_offset;
hb_glyph++;
hb_position++;
diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c
index 79c3cb2b..5ad5842c 100644
--- a/pango/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@ -394,8 +394,8 @@ _pango_ot_info_position (const PangoOTInfo *info,
/* XXX reuse hb_font */
hb_font = hb_font_create ();
hb_font_set_scale (hb_font,
- ((guint64) info->face->size->metrics.x_scale * info->face->units_per_EM) >> 12,
- ((guint64) info->face->size->metrics.y_scale * info->face->units_per_EM) >> 12);
+ (((guint64) info->face->size->metrics.x_scale * info->face->units_per_EM) >> 12),
+ -(((guint64) info->face->size->metrics.y_scale * info->face->units_per_EM) >> 12));
is_hinted = buffer->font->is_hinted;
hb_font_set_ppem (hb_font,
is_hinted ? info->face->size->metrics.x_ppem : 0,