diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2010-12-09 22:00:15 +0100 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2010-12-10 11:04:48 +0100 |
| commit | 85a489f0f212d68c69dbe5807b379b874daef4d1 (patch) | |
| tree | 9ed5ed594d67aa84afa62b28b09f679e0abcd9a9 /src/drm | |
| parent | 75f34b595aead729b6f6a7017c8790d68dfa0326 (diff) | |
polygon: Merge _cairo_polygon_init and _cairo_polygon_limit
_cairo_polygon_limit() had to be called immediately after
_cairo_polygon_init() (or never at all).
Merging the two calls is a simple way to enforce this rule.
Diffstat (limited to 'src/drm')
| -rw-r--r-- | src/drm/cairo-drm-i915-surface.c | 6 | ||||
| -rw-r--r-- | src/drm/cairo-drm-i965-surface.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/drm/cairo-drm-i915-surface.c b/src/drm/cairo-drm-i915-surface.c index 373e6749..247d8ad5 100644 --- a/src/drm/cairo-drm-i915-surface.c +++ b/src/drm/cairo-drm-i915-surface.c @@ -1938,8 +1938,7 @@ i915_surface_fill_with_alpha (void *abstract_dst, goto CLEANUP_BOXES; } - _cairo_polygon_init (&info.polygon); - _cairo_polygon_limit (&info.polygon, clip_boxes, num_boxes); + _cairo_polygon_init (&info.polygon, clip_boxes, num_boxes); status = _cairo_path_fixed_fill_to_polygon (path, tolerance, &info.polygon); if (unlikely (status)) @@ -2280,8 +2279,7 @@ i915_surface_stroke (void *abstract_dst, goto CLEANUP_BOXES; } - _cairo_polygon_init (&info.polygon); - _cairo_polygon_limit (&info.polygon, clip_boxes, num_boxes); + _cairo_polygon_init (&info.polygon, clip_boxes, num_boxes); status = _cairo_path_fixed_stroke_to_polygon (path, stroke_style, diff --git a/src/drm/cairo-drm-i965-surface.c b/src/drm/cairo-drm-i965-surface.c index c3618a32..39478362 100644 --- a/src/drm/cairo-drm-i965-surface.c +++ b/src/drm/cairo-drm-i965-surface.c @@ -1343,8 +1343,7 @@ i965_surface_stroke (void *abstract_dst, goto CLEANUP_BOXES; } - _cairo_polygon_init (&info.polygon); - _cairo_polygon_limit (&info.polygon, clip_boxes, num_boxes); + _cairo_polygon_init (&info.polygon, clip_boxes, num_boxes); status = _cairo_path_fixed_stroke_to_polygon (path, stroke_style, @@ -1451,8 +1450,7 @@ i965_surface_fill (void *abstract_dst, goto CLEANUP_BOXES; } - _cairo_polygon_init (&info.polygon); - _cairo_polygon_limit (&info.polygon, clip_boxes, num_boxes); + _cairo_polygon_init (&info.polygon, clip_boxes, num_boxes); status = _cairo_path_fixed_fill_to_polygon (path, tolerance, &info.polygon); if (unlikely (status)) |