diff options
| -rw-r--r-- | pango/pango-renderer.c | 12 | ||||
| -rw-r--r-- | pango/pangocairo-coretextfont.c | 5 | ||||
| -rw-r--r-- | pango/pangocoretext-fontmap.c | 4 |
3 files changed, 8 insertions, 13 deletions
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index c91cb6ee..055cdd97 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -362,8 +362,8 @@ add_underline (PangoRenderer *renderer, int underline_thickness = pango_font_metrics_get_underline_thickness (metrics); int underline_position = pango_font_metrics_get_underline_position (metrics); - new_rect.x = base_x + logical_rect->x; - new_rect.width = logical_rect->width; + new_rect.x = base_x + ink_rect->x; + new_rect.width = ink_rect->width; new_rect.height = underline_thickness; new_rect.y = base_y; @@ -425,8 +425,8 @@ add_overline (PangoRenderer *renderer, int underline_thickness = pango_font_metrics_get_underline_thickness (metrics); int ascent = pango_font_metrics_get_ascent (metrics); - new_rect.x = base_x + logical_rect->x; - new_rect.width = logical_rect->width; + new_rect.x = base_x + ink_rect->x; + new_rect.width = ink_rect->width; new_rect.height = underline_thickness; new_rect.y = base_y; @@ -480,8 +480,8 @@ add_strikethrough (PangoRenderer *renderer, int strikethrough_thickness = pango_font_metrics_get_strikethrough_thickness (metrics); int strikethrough_position = pango_font_metrics_get_strikethrough_position (metrics); - new_rect.x = base_x + logical_rect->x; - new_rect.width = logical_rect->width; + new_rect.x = base_x + ink_rect->x; + new_rect.width = ink_rect->width; new_rect.y = (base_y - strikethrough_position) * num_glyphs; new_rect.height = strikethrough_thickness * num_glyphs; diff --git a/pango/pangocairo-coretextfont.c b/pango/pangocairo-coretextfont.c index fa9f383a..07a71871 100644 --- a/pango/pangocairo-coretextfont.c +++ b/pango/pangocairo-coretextfont.c @@ -102,11 +102,6 @@ pango_cairo_core_text_font_create_base_metrics_for_context (PangoCairoFont *font { PangoCoreTextFont *cfont = (PangoCoreTextFont *) font; PangoFontMetrics *metrics; - PangoFontDescription *font_desc; - PangoLayout *layout; - PangoRectangle extents; - PangoLanguage *language = pango_context_get_language (context); - const char *sample_str = pango_language_get_sample_string (language); CTFontRef ctfont; metrics = pango_font_metrics_new (); diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c index 81bf7bf7..0980303b 100644 --- a/pango/pangocoretext-fontmap.c +++ b/pango/pangocoretext-fontmap.c @@ -849,7 +849,7 @@ get_scaled_size (PangoCoreTextFontMap *fontmap, const PangoFontDescription *desc) { double size = pango_font_description_get_size (desc); - PangoMatrix *matrix = pango_context_get_matrix (context); + const PangoMatrix *matrix = pango_context_get_matrix (context); double scale_factor = pango_matrix_get_font_scale_factor (matrix); if (!pango_font_description_get_size_is_absolute(desc)) @@ -1422,7 +1422,7 @@ pango_core_text_font_map_load_fontset (PangoFontMap *fontmap, /* Cannot use pango_core_text_fontset_key_free() here */ pango_font_description_free (key.desc); - return g_object_ref (fontset); + return g_object_ref (PANGO_FONTSET (fontset)); } static void |