WebSVN – Kolibri OS – Diff – /programs/develop/libraries/cairo/src/cairo-surface-offset.c

  *      Chris Wilson
  */
+#include "cairoint.h"
 #include "cairoint.h"
+#include "cairo-clip-inline.h"
 #include "cairo-error-private.h"
-#include "cairo-error-private.h"
+#include "cairo-pattern-private.h"
 #include "cairo-surface-offset-private.h"
 cairo_status_t
 _cairo_surface_offset_paint (cairo_surface_t		*target,
 			     int x, int y,
 			     cairo_operator_t		 op,
 			     const cairo_pattern_t	*source,
-			     cairo_clip_t		*clip)
+			     const cairo_clip_t		*clip)
+{
     cairo_status_t status;
-    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_clip_t *dev_clip = (cairo_clip_t *) clip;
     cairo_pattern_union_t source_copy;
     if (unlikely (target->status))
 	return target->status;
-    if (clip && clip->all_clipped)
+    if (_cairo_clip_is_all_clipped (clip))
 	return CAIRO_STATUS_SUCCESS;
-    if (x | y) {
-	cairo_matrix_t m;
-	if (clip != NULL) {
-	    cairo_matrix_init_translate (&m, -x, -y);
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
-	    if (unlikely (status))
-		goto FINISH;
+    if (x | y) {
 	cairo_matrix_t m;
 	    dev_clip = &clip_copy;
 	dev_clip = _cairo_clip_copy_with_translation (clip, -x, -y);
-	cairo_matrix_init_translate (&m, x, y);
-	_copy_transformed_pattern (&source_copy.base, source, &m);
+	cairo_matrix_init_translate (&m, x, y);
-	source = &source_copy.base;
+	_copy_transformed_pattern (&source_copy.base, source, &m);
 	source = &source_copy.base;
+    }
     status = _cairo_surface_paint (target, op, source, dev_clip);
     status = _cairo_surface_paint (target, op, source, dev_clip);
   FINISH:
     if (dev_clip != clip)
-	_cairo_clip_reset (dev_clip);
+	_cairo_clip_destroy (dev_clip);
     return status;
+}
 cairo_status_t
 _cairo_surface_offset_mask (cairo_surface_t		*target,
 			    int x, int y,
 			    cairo_operator_t		 op,
 			    const cairo_pattern_t	*source,
 			    const cairo_pattern_t	*mask,
-			    cairo_clip_t		*clip)
+			    const cairo_clip_t		*clip)
+{
     cairo_status_t status;
-    cairo_clip_t clip_copy, *dev_clip = clip;
-    cairo_pattern_union_t source_copy;
+    cairo_clip_t *dev_clip = (cairo_clip_t *) clip;
-    cairo_pattern_union_t mask_copy;
-    if (unlikely (target->status))
-	return target->status;
-    if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    cairo_pattern_union_t source_copy;
     cairo_pattern_union_t mask_copy;
     if (x | y) {
-	cairo_matrix_t m;
+    if (unlikely (target->status))
     status = _cairo_surface_mask (target, op,
 				  source, mask,
-				  dev_clip);
 				  dev_clip);
-  FINISH:
     if (dev_clip != clip)
-	_cairo_clip_reset (dev_clip);
+	_cairo_clip_destroy (dev_clip);
     return status;
+}
 cairo_status_t
 _cairo_surface_offset_stroke (cairo_surface_t		*surface,
 			      int x, int y,
 			      cairo_operator_t		 op,
 			      const cairo_pattern_t	*source,
-			      cairo_path_fixed_t	*path,
+			      const cairo_path_fixed_t	*path,
 			      const cairo_stroke_style_t*stroke_style,
 			      const cairo_matrix_t	*ctm,
 			      const cairo_matrix_t	*ctm_inverse,
 			      double			 tolerance,
 			      cairo_antialias_t		 antialias,
-			      cairo_clip_t		*clip)
+			      const cairo_clip_t		*clip)
+{
-    cairo_path_fixed_t path_copy, *dev_path = path;
+    cairo_path_fixed_t path_copy, *dev_path = (cairo_path_fixed_t *) path;
-    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_clip_t *dev_clip = (cairo_clip_t *) clip;
     cairo_matrix_t dev_ctm = *ctm;
     cairo_matrix_t dev_ctm_inverse = *ctm_inverse;
     cairo_pattern_union_t source_copy;
     cairo_status_t status;
     if (unlikely (surface->status))
+	return surface->status;
-	return surface->status;
+    if (_cairo_clip_is_all_clipped (clip))
 	return CAIRO_STATUS_SUCCESS;
     if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (x | y) {
 				     _cairo_fixed_from_int (-y));
 	dev_path = &path_copy;
 	cairo_matrix_init_translate (&m, -x, -y);
-	cairo_matrix_multiply (&dev_ctm, &dev_ctm, &m);
-	if (clip != NULL) {
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
-	    if (unlikely (status))
-		goto FINISH;
-	    dev_clip = &clip_copy;
 	cairo_matrix_multiply (&dev_ctm, &dev_ctm, &m);
 	cairo_matrix_init_translate (&m, x, y);
 	_copy_transformed_pattern (&source_copy.base, source, &m);
- FINISH:
+FINISH:
     if (dev_path != path)
 	_cairo_path_fixed_fini (dev_path);
     if (dev_clip != clip)
-	_cairo_clip_reset (dev_clip);
+	_cairo_clip_destroy (dev_clip);
     return status;
+}
 cairo_status_t
 _cairo_surface_offset_fill (cairo_surface_t	*surface,
 			    int x, int y,
 			    cairo_operator_t	 op,
 			    const cairo_pattern_t*source,
-			    cairo_path_fixed_t	*path,
+			    const cairo_path_fixed_t	*path,
 			    cairo_fill_rule_t	 fill_rule,
 			    double		 tolerance,
 			    cairo_antialias_t	 antialias,
-			    cairo_clip_t	*clip)
+			    const cairo_clip_t	*clip)
 {
     cairo_status_t status;
-    cairo_path_fixed_t path_copy, *dev_path = path;
+    cairo_path_fixed_t path_copy, *dev_path = (cairo_path_fixed_t *) path;
-    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_clip_t *dev_clip = (cairo_clip_t *) clip;
     cairo_pattern_union_t source_copy;
     if (unlikely (surface->status))
 	return surface->status;
+    if (_cairo_clip_is_all_clipped (clip))
 	return CAIRO_STATUS_SUCCESS;
     if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (x | y) {
 	cairo_matrix_t m;
     if (x | y) {
-	cairo_matrix_t m;
+	dev_clip = _cairo_clip_copy_with_translation (clip, -x, -y);
-	status = _cairo_path_fixed_init_copy (&path_copy, dev_path);
-	if (unlikely (status))
-	    goto FINISH;
-	_cairo_path_fixed_translate (&path_copy,
-				     _cairo_fixed_from_int (-x),
-				     _cairo_fixed_from_int (-y));
-	dev_path = &path_copy;
-	if (clip != NULL) {
+	status = _cairo_path_fixed_init_copy (&path_copy, dev_path);
-	    cairo_matrix_init_translate (&m, -x, -y);
+	if (unlikely (status))
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
+	    goto FINISH;
 	    if (unlikely (status))
- FINISH:
+FINISH:
     if (dev_path != path)
 	_cairo_path_fixed_fini (dev_path);
     if (dev_clip != clip)
-	_cairo_clip_reset (dev_clip);
+	_cairo_clip_destroy (dev_clip);
     return status;
 			      cairo_operator_t		 op,
 			      const cairo_pattern_t	*source,
 			      cairo_scaled_font_t	*scaled_font,
 			      cairo_glyph_t		*glyphs,
 			      int			 num_glyphs,
-			      cairo_clip_t		*clip)
+			      const cairo_clip_t	*clip)
+{
     cairo_status_t status;
-    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_clip_t *dev_clip = (cairo_clip_t *) clip;
     cairo_pattern_union_t source_copy;
     cairo_glyph_t *dev_glyphs;
     int i;
     if (unlikely (surface->status))
 	return surface->status;
-    if (clip && clip->all_clipped)
+    if (_cairo_clip_is_all_clipped (clip))
 	return CAIRO_STATUS_SUCCESS;
     memcpy (dev_glyphs, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
     if (x | y) {
-	cairo_matrix_t m;
+	cairo_matrix_t m;
-	if (clip != NULL) {
-	    cairo_matrix_init_translate (&m, -x, -y);
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
-	    if (unlikely (status))
-		goto FINISH;
 	    dev_clip = &clip_copy;
 	dev_clip = _cairo_clip_copy_with_translation (clip, -x, -y);
 					      dev_glyphs, num_glyphs,
 					      NULL, 0, 0,
 					      scaled_font,
 					      dev_clip);
  FINISH:
     if (dev_clip != clip)
-	_cairo_clip_reset (dev_clip);
+	_cairo_clip_destroy (dev_clip);
     free (dev_glyphs);

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/cairo/src/cairo-surface-offset.c – Rev 1892 → 3959