Attachment 8233 Details for Bug 9467 – patch 1/3. Refactors out code that creates a CGBitmapContextRef from an image surface.

[patch] patch 1/3. Refactors out code that creates a CGBitmapContextRef from an image surface.

glyph-surface-patch-1.txt (text/plain), 4.36 KB, created by Brian Ewins on 2006-12-28 06:03:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Ewins

Created: 2006-12-28 06:03:42 UTC

Size: 4.36 KB

patch

obsolete

>[ATSUI] make code for creating CGBitmapContexts reusable.
>
>---
>commit dbf49b80dbfe2915bcdad1ef6600af5d720d913e
>tree 0b5af34631d4d456a0e7fe02bd522ea511fec9b4
>parent 05d609e2c193c149ae4ca6f4a3f05a4f7ca3959e
>author Brian Ewins <Brian.Ewins@gmail.com> Thu, 28 Dec 2006 13:10:18 +0000
>committer Brian Ewins <Brian.Ewins@gmail.com> Thu, 28 Dec 2006 13:10:18 +0000
>
> src/cairo-atsui-font.c |   85 +++++++++++++++++++++++++++---------------------
> 1 files changed, 48 insertions(+), 37 deletions(-)
>
>diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c
>index 75530d3..1e601a1 100644
>--- a/src/cairo-atsui-font.c
>+++ b/src/cairo-atsui-font.c
>@@ -137,6 +137,47 @@ cairo_atsui_font_face_create_for_atsu_fo
>     return &font_face->base;
> }
> 
>+static CGContextRef
>+CGBitmapContextCreateWithCairoImageSurface (const cairo_image_surface_t * surface)
>+{
>+    CGContextRef contextRef;
>+    CGColorSpaceRef colorSpace;
>+    int bits_per_comp, alpha;
>+
>+    /* Create a CGBitmapContext for the dest surface for drawing into */
>+    if (surface->depth == 1) {
>+	colorSpace = CGColorSpaceCreateDeviceGray ();
>+	bits_per_comp = 1;
>+	alpha = kCGImageAlphaNone;
>+    } else if (surface->depth == 8) {
>+	colorSpace = CGColorSpaceCreateDeviceGray ();
>+	bits_per_comp = 8;
>+	alpha = kCGImageAlphaNone;
>+    } else if (surface->depth == 24) {
>+	colorSpace = CGColorSpaceCreateDeviceRGB ();
>+	bits_per_comp = 8;
>+	alpha = kCGImageAlphaNoneSkipFirst | CG_BITMAP_BYTE_ORDER_FLAG;
>+    } else if (surface->depth == 32) {
>+	colorSpace = CGColorSpaceCreateDeviceRGB ();
>+	bits_per_comp = 8;
>+	alpha = kCGImageAlphaPremultipliedFirst | CG_BITMAP_BYTE_ORDER_FLAG;
>+    } else {
>+	/* not reached */
>+	return NULL;
>+    }
>+    
>+    contextRef = CGBitmapContextCreate (surface->data,
>+					surface->width,
>+					surface->height,
>+					bits_per_comp,
>+					surface->stride,
>+					colorSpace,
>+					alpha);
>+    CGColorSpaceRelease (colorSpace);
>+
>+    return contextRef;
>+}
>+
> static CGAffineTransform
> CGAffineTransformMakeWithCairoFontScale(const cairo_matrix_t *scale)
> {
>@@ -660,10 +701,9 @@ _cairo_atsui_font_old_show_glyphs (void
> 				   int                 	num_glyphs)
> {
>     cairo_atsui_font_t *font = abstract_font;
>-    CGContextRef myBitmapContext = 0, drawingContext;
>-    CGColorSpaceRef colorSpace = 0;
>+    CGContextRef drawingContext;
>     cairo_image_surface_t *destImageSurface;
>-    int i, bits_per_comp, alpha;
>+    int i;
>     void *extra = NULL;
>     cairo_bool_t can_draw_directly;
>     cairo_rectangle_int16_t rect;
>@@ -689,41 +729,12 @@ _cairo_atsui_font_old_show_glyphs (void
> 					  &rect,
> 					  &extra);
> 
>-	/* Create a CGBitmapContext for the dest surface for drawing into */
>-	if (destImageSurface->depth == 1) {
>-	    colorSpace = CGColorSpaceCreateDeviceGray();
>-	    bits_per_comp = 1;
>-	    alpha = kCGImageAlphaNone;
>-	} else if (destImageSurface->depth == 8) {
>-	    colorSpace = CGColorSpaceCreateDeviceGray();
>-	    bits_per_comp = 8;
>-	    alpha = kCGImageAlphaNone;
>-	} else if (destImageSurface->depth == 24) {
>-	    colorSpace = CGColorSpaceCreateDeviceRGB();
>-	    bits_per_comp = 8;
>-	    alpha = kCGImageAlphaNoneSkipFirst | CG_BITMAP_BYTE_ORDER_FLAG;
>-	} else if (destImageSurface->depth == 32) {
>-	    colorSpace = CGColorSpaceCreateDeviceRGB();
>-	    bits_per_comp = 8;
>-	    alpha = kCGImageAlphaPremultipliedFirst | CG_BITMAP_BYTE_ORDER_FLAG;
>-	} else {
>-	    // not reached
>+	drawingContext = CGBitmapContextCreateWithCairoImageSurface (destImageSurface);
>+	if (!drawingContext) 
> 	    return CAIRO_INT_STATUS_UNSUPPORTED;
>-	}
>-
>-	myBitmapContext = CGBitmapContextCreate(destImageSurface->data,
>-						destImageSurface->width,
>-						destImageSurface->height,
>-						bits_per_comp,
>-						destImageSurface->stride,
>-						colorSpace,
>-						alpha);
>-	CGColorSpaceRelease(colorSpace);
>-
>-	CGContextTranslateCTM(myBitmapContext, 0, destImageSurface->height);
>-	CGContextScaleCTM(myBitmapContext, 1.0f, -1.0f);
> 
>-	drawingContext = myBitmapContext;
>+	CGContextTranslateCTM(drawingContext, 0, destImageSurface->height);
>+	CGContextScaleCTM(drawingContext, 1.0f, -1.0f);
>     } else {
> 	drawingContext = ((cairo_quartz_surface_t *)generic_surface)->context;
> 	CGContextSaveGState (drawingContext);
>@@ -809,7 +820,7 @@ _cairo_atsui_font_old_show_glyphs (void
>     }
> 
>     if (!can_draw_directly) {
>-	CGContextRelease(myBitmapContext);
>+	CGContextRelease(drawingContext);
> 
> 	_cairo_surface_release_dest_image(generic_surface,
> 					  &rect,

Actions: View | Splinter Review

Attachments on bug 9467: 8233 | 8234 | 8235 | 8236 | 8237

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.