Attachment 8190 Details for Bug 9350 – measure glyphs using path bounding boxes.

[patch] measure glyphs using path bounding boxes.

giro-patch.txt (text/plain), 5.55 KB, created by Brian Ewins on 2006-12-21 15:04:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Ewins

Created: 2006-12-21 15:04:49 UTC

Size: 5.55 KB

patch

obsolete

>[ATSUI] Compute glyph extents from the bounding boxes of their paths.
>
>---
>commit bcc4b703dfe9e57fb90e0cb8a06836705b467cb0
>tree 3d969a4df801452348c5001b20cbdbe481673889
>parent 95c7ff25b8c729e45c325b07f9543fb2d5a920bd
>author Brian Ewins <Brian.Ewins@gmail.com> Thu, 21 Dec 2006 22:42:41 +0000
>committer Brian Ewins <Brian.Ewins@gmail.com> Thu, 21 Dec 2006 22:42:41 +0000
>
> src/cairo-atsui-font.c |  135 ++++++++++++++++++++++++++++++++++++++----------
> 1 files changed, 106 insertions(+), 29 deletions(-)
>
>diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c
>index e1fffe2..8c6dc85 100644
>--- a/src/cairo-atsui-font.c
>+++ b/src/cairo-atsui-font.c
>@@ -370,44 +370,121 @@ _cairo_atsui_font_fini(void *abstract_fo
>         ATSUDisposeStyle(font->unscaled_style);
> }
> 
>+static
>+OSStatus _move_to_for_metrics (const Float32Point *point, void *callback_data) 
>+{
>+    CGMutablePathRef path = callback_data;
>+    
>+    CGPathMoveToPoint (path, &CGAffineTransformIdentity,
>+			   point->x, point->y);
>+    return noErr;
>+}
>+
>+static
>+OSStatus _line_to_for_metrics(const Float32Point *point, void *callback_data) 
>+{
>+    CGMutablePathRef path = callback_data;
>+    
>+    CGPathAddLineToPoint (path, &CGAffineTransformIdentity,
>+			   point->x, point->y);
>+    return noErr;
>+}
>+
>+static
>+OSStatus _curve_to_for_metrics (const Float32Point *point1, 
>+				const Float32Point *point2, 
>+   				const Float32Point *point3, 
>+				void *callback_data) 
>+{
>+    CGMutablePathRef path = callback_data;
>+        
>+    CGPathAddCurveToPoint (path, &CGAffineTransformIdentity,
>+			   point1->x, point1->y,
>+			   point2->x, point2->y,
>+			   point3->x, point3->y);    
>+    return noErr;
>+}
>+
>+static
>+OSStatus _close_path_for_metrics(void *callback_data) 
>+{
>+    CGMutablePathRef path = callback_data;
>+
>+    CGPathCloseSubpath (path);
>+    return noErr;
>+}
>+
> static cairo_status_t
>-_cairo_atsui_font_init_glyph_metrics (cairo_atsui_font_t *font,
>+_cairo_atsui_font_init_glyph_metrics (cairo_atsui_font_t *scaled_font,
> 				      cairo_scaled_glyph_t *scaled_glyph)
> {
>-   cairo_text_extents_t extents;
>-   OSStatus err;
>-   GlyphID theGlyph = _cairo_scaled_glyph_index (scaled_glyph);
>-   ATSGlyphScreenMetrics metricsH, metricsV;
>-   ATSUStyle style,style1;
>-   ATSUVerticalCharacterType verticalType = kATSUStronglyVertical;
>-   const ATSUAttributeTag theTag[] = { kATSUVerticalCharacterTag };
>-   const ByteCount theSizes[] = { sizeof(verticalType) };
>-   ATSUAttributeValuePtr theValues[] = { &verticalType };
>-   double xscale;
>-   double yscale;
>+    cairo_text_extents_t extents;
>+    OSStatus err, callback_err;
>+    ATSGlyphScreenMetrics metricsH;
>+    static ATSCubicMoveToUPP moveProc = NULL;
>+    static ATSCubicLineToUPP lineProc = NULL;
>+    static ATSCubicCurveToUPP curveProc = NULL;
>+    static ATSCubicClosePathUPP closePathProc = NULL;
>+    CGMutablePathRef path;
>+    GlyphID theGlyph = _cairo_scaled_glyph_index (scaled_glyph);
>+    double xscale, yscale;
>     
>-   _cairo_matrix_compute_scale_factors(&font->base.scale, &xscale, &yscale, 1);
>+    /* We calculate the advance from the screen metrics. We
>+     * could probably take this from the glyph path.
>+     */
>+    err = ATSUGlyphGetScreenMetrics (scaled_font->style,
>+				     1, &theGlyph, 0, false, 
>+				     false, &metricsH);
>+    if (err != noErr)
>+	return CAIRO_INT_STATUS_UNSUPPORTED;
> 
>-   ATSUCreateAndCopyStyle(font->style, &style);
>+    /* Scale down to font units.*/
>+    _cairo_matrix_compute_scale_factors (&scaled_font->base.scale, 
>+					 &xscale, &yscale, 1);
>+    xscale = 1.0/xscale;
>+    yscale = 1.0/yscale;
> 
>-   err = ATSUGlyphGetScreenMetrics(style,
>-				   1, &theGlyph, 0, false, false, &metricsH);
>-   err = ATSUSetAttributes(style, 1, theTag, theSizes, theValues);
>-   err = ATSUGlyphGetScreenMetrics(style,
>-				   1, &theGlyph, 0, false, false, &metricsV);
>+    extents.x_advance = metricsH.deviceAdvance.x * xscale;
>+    extents.y_advance = 0;
> 
>-   extents.width = metricsH.width/xscale;
>-   extents.height = metricsH.height/yscale;
>-   extents.x_bearing = metricsH.sideBearing.x/xscale;
>-   extents.y_bearing = metricsV.sideBearing.y/yscale - extents.height;
>-   extents.x_advance = metricsH.deviceAdvance.x/xscale;
>-   extents.y_advance = 0;
>+    if (moveProc == NULL) {
>+        moveProc = NewATSCubicMoveToUPP (_move_to_for_metrics);
>+        lineProc = NewATSCubicLineToUPP (_line_to_for_metrics);
>+        curveProc = NewATSCubicCurveToUPP (_curve_to_for_metrics);
>+        closePathProc = NewATSCubicClosePathUPP (_close_path_for_metrics);
>+    }
> 
>-  _cairo_scaled_glyph_set_metrics (scaled_glyph,
>-				   &font->base,
>-				   &extents);
>+    path = CGPathCreateMutable ();
> 
>-  return CAIRO_STATUS_SUCCESS;
>+    /* The callback error contains any error our functions returned.
>+     * Its only meaningful if err != noErr, and we don't currently 
>+     * use it for anything.
>+     */
>+    err = ATSUGlyphGetCubicPaths (scaled_font->style, theGlyph,
>+				  moveProc, lineProc, curveProc, closePathProc, 
>+				  (void *)path, &callback_err);
>+
>+    if (err != noErr) {
>+	/* This could potentially happen for bitmap fonts, where
>+	 * no paths are available.
>+	 */
>+	CGPathRelease (path);
>+	return CAIRO_INT_STATUS_UNSUPPORTED;
>+    }
>+
>+    CGRect rect = CGPathGetBoundingBox (path);
>+    
>+    extents.x_bearing = rect.origin.x * xscale;
>+    extents.y_bearing = rect.origin.y * yscale;
>+    extents.width = rect.size.width * xscale;
>+    extents.height = rect.size.height * yscale;
>+    
>+    _cairo_scaled_glyph_set_metrics (scaled_glyph,
>+				     &scaled_font->base,
>+				     &extents);
>+    CGPathRelease (path);
>+
>+    return CAIRO_STATUS_SUCCESS;
> }
> 
> static OSStatus

Actions: View | Splinter Review

Attachments on bug 9350: 8117 | 8118 | 8119 | 8143 | 8152 | 8153 | 8154 | 8190 | 8191 | 8192 | 8193 | 8194

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.