fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-30 17:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

quartz: Unify DO_SOLID and DO_PATTERN

Browse source 
Both DO_SOLID and DO_PATTERN setup the underlying CGContext to directly
use the chosen color/pattern when filling and stroking, thus require no
additional drawing operations and can share the same drawing code.
This commit is contained in:
Andrea Canciani 2010-07-29 15:06:39 +02:00
parent c22e75e9f6
commit 51a6ae9d71
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cairo-quartz-private.h
View file

@ -51,9 +51,8 @@ typedef float cairo_quartz_float_t;
#endif
typedef enum {
DO_SOLID,
DO_DIRECT,
DO_SHADING,
DO_PATTERN,
DO_IMAGE,
DO_TILED_IMAGE
} cairo_quartz_action_t;
@ -82,7 +81,6 @@ typedef struct cairo_quartz_surface {
CGRect sourceImageRect;
CGShadingRef sourceShading;
CGPatternRef sourcePattern;
} cairo_quartz_surface_t;
typedef struct cairo_quartz_image_surface {

22
src/cairo-quartz-surface.c
View file

@ -1423,7 +1423,7 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface,
{
cairo_status_t status;
assert (!(surface->sourceImage || surface->sourceShading || surface->sourcePattern));
assert (!(surface->sourceImage || surface->sourceShading));
/* Save before we change the pattern, colorspace, etc. so that
* we can restore and make sure that quartz releases our
@ -1452,7 +1452,7 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface,
solid->color.blue,
solid->color.alpha);
surface->action = DO_SOLID;
surface->action = DO_DIRECT;
return CAIRO_STATUS_SUCCESS;
}
@ -1561,8 +1561,9 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface,
*/
CGContextSetPatternPhase (surface->cgContext, CGSizeMake (0, 0));
surface->sourcePattern = pattern;
surface->action = DO_PATTERN;
CGPatternRelease (pattern);
surface->action = DO_DIRECT;
return CAIRO_STATUS_SUCCESS;
}
@ -1587,11 +1588,6 @@ _cairo_quartz_teardown_source (cairo_quartz_surface_t *surface,
CGShadingRelease (surface->sourceShading);
surface->sourceShading = NULL;
}
if (surface->sourcePattern) {
CGPatternRelease (surface->sourcePattern);
surface->sourcePattern = NULL;
}
}
static cairo_int_status_t
@ -1999,7 +1995,7 @@ _cairo_quartz_surface_paint_cg (cairo_quartz_surface_t *surface,
if (unlikely (rv))
return rv;
if (surface->action == DO_SOLID || surface->action == DO_PATTERN) {
if (surface->action == DO_DIRECT) {
CGContextFillRect (surface->cgContext, CGRectMake (surface->extents.x,
surface->extents.y,
surface->extents.width,
@ -2082,7 +2078,7 @@ _cairo_quartz_surface_fill_cg (cairo_quartz_surface_t *surface,
if (!_cairo_operator_bounded_by_mask (op) && CGContextCopyPathPtr)
path_for_unbounded = CGContextCopyPathPtr (surface->cgContext);
if (surface->action == DO_SOLID || surface->action == DO_PATTERN) {
if (surface->action == DO_DIRECT) {
if (fill_rule == CAIRO_FILL_RULE_WINDING)
CGContextFillPath (surface->cgContext);
else
@ -2236,7 +2232,7 @@ _cairo_quartz_surface_stroke_cg (cairo_quartz_surface_t *surface,
_cairo_quartz_cairo_matrix_to_quartz (ctm, &strokeTransform);
CGContextConcatCTM (surface->cgContext, strokeTransform);
if (surface->action == DO_SOLID || surface->action == DO_PATTERN) {
if (surface->action == DO_DIRECT) {
CGContextStrokePath (surface->cgContext);
} else if (surface->action == DO_IMAGE || surface->action == DO_TILED_IMAGE) {
CGContextReplacePathWithStrokedPath (surface->cgContext);
@ -2364,7 +2360,7 @@ _cairo_quartz_surface_show_glyphs_cg (cairo_quartz_surface_t *surface,
if (unlikely (rv))
return rv;
if (surface->action == DO_SOLID || surface->action == DO_PATTERN) {
if (surface->action == DO_DIRECT) {
CGContextSetTextDrawingMode (surface->cgContext, kCGTextFill);
} else if (surface->action == DO_IMAGE || surface->action == DO_TILED_IMAGE || surface->action == DO_SHADING) {
CGContextSetTextDrawingMode (surface->cgContext, kCGTextClip);