Attachment 43483 Details for Bug 34384 – Proposed patch

[patch] Proposed patch

0001-Account-for-mesh-Rename-cairo_pattern_mesh_-function.patch (text/plain), 4.17 KB, created by Florian Gawrilowicz on 2011-02-17 05:07:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Gawrilowicz

Created: 2011-02-17 05:07:41 UTC

Size: 4.17 KB

patch

obsolete

>From e6ee26f249454a67f3e0a8aa1455914d0c07eac0 Mon Sep 17 00:00:00 2001
>From: Florian Gawrilowicz <flo.gravo@gmail.com>
>Date: Thu, 17 Feb 2011 14:48:04 +0100
>Subject: [PATCH] Account for: "mesh: Rename cairo_pattern_mesh_* functions to cairo_mesh_pattern_*"
> commit in cairo: 5f039f0f894082c383884595220f6f0368ab72cf
>
>---
> poppler/CairoOutputDev.cc |   36 ++++++++++++++++++------------------
> 1 files changed, 18 insertions(+), 18 deletions(-)
>
>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
>index 18fc480..4294d88 100644
>--- a/poppler/CairoOutputDev.cc
>+++ b/poppler/CairoOutputDev.cc
>@@ -833,21 +833,21 @@ GBool CairoOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTrian
> 			 &x1, &y1, &color[1],
> 			 &x2, &y2, &color[2]);
> 
>-    cairo_pattern_mesh_begin_patch (fill_pattern);
>+    cairo_mesh_pattern_begin_patch (fill_pattern);
> 
>-    cairo_pattern_mesh_move_to (fill_pattern, x0, y0);
>-    cairo_pattern_mesh_line_to (fill_pattern, x1, y1);
>-    cairo_pattern_mesh_line_to (fill_pattern, x2, y2);
>+    cairo_mesh_pattern_move_to (fill_pattern, x0, y0);
>+    cairo_mesh_pattern_line_to (fill_pattern, x1, y1);
>+    cairo_mesh_pattern_line_to (fill_pattern, x2, y2);
> 
>     for (j = 0; j < 3; j++) {
> 	shading->getColorSpace()->getRGB(&color[j], &rgb);
>-	cairo_pattern_mesh_set_corner_color_rgb (fill_pattern, j,
>+	cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, j,
> 						 colToDbl(rgb.r),
> 						 colToDbl(rgb.g),
> 						 colToDbl(rgb.b));
>     }
> 
>-    cairo_pattern_mesh_end_patch (fill_pattern);
>+    cairo_mesh_pattern_end_patch (fill_pattern);
>   }
> 
>   double xMin, yMin, xMax, yMax;
>@@ -876,33 +876,33 @@ GBool CairoOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *
>     GfxColor color;
>     GfxRGB rgb;
> 
>-    cairo_pattern_mesh_begin_patch (fill_pattern);
>+    cairo_mesh_pattern_begin_patch (fill_pattern);
> 
>-    cairo_pattern_mesh_move_to (fill_pattern, patch->x[0][0], patch->y[0][0]);
>-    cairo_pattern_mesh_curve_to (fill_pattern,
>+    cairo_mesh_pattern_move_to (fill_pattern, patch->x[0][0], patch->y[0][0]);
>+    cairo_mesh_pattern_curve_to (fill_pattern,
> 			    patch->x[0][1], patch->y[0][1],
> 			    patch->x[0][2], patch->y[0][2],
> 			    patch->x[0][3], patch->y[0][3]);
> 
>-    cairo_pattern_mesh_curve_to (fill_pattern,
>+    cairo_mesh_pattern_curve_to (fill_pattern,
> 			    patch->x[1][3], patch->y[1][3],
> 			    patch->x[2][3], patch->y[2][3],
> 			    patch->x[3][3], patch->y[3][3]);
> 
>-    cairo_pattern_mesh_curve_to (fill_pattern,
>+    cairo_mesh_pattern_curve_to (fill_pattern,
> 			    patch->x[3][2], patch->y[3][2],
> 			    patch->x[3][1], patch->y[3][1],
> 			    patch->x[3][0], patch->y[3][0]);
> 
>-    cairo_pattern_mesh_curve_to (fill_pattern,
>+    cairo_mesh_pattern_curve_to (fill_pattern,
> 			    patch->x[2][0], patch->y[2][0],
> 			    patch->x[1][0], patch->y[1][0],
> 			    patch->x[0][0], patch->y[0][0]);
> 
>-    cairo_pattern_mesh_set_control_point (fill_pattern, 0, patch->x[1][1], patch->y[1][1]);
>-    cairo_pattern_mesh_set_control_point (fill_pattern, 1, patch->x[1][2], patch->y[1][2]);
>-    cairo_pattern_mesh_set_control_point (fill_pattern, 2, patch->x[2][2], patch->y[2][2]);
>-    cairo_pattern_mesh_set_control_point (fill_pattern, 3, patch->x[2][1], patch->y[2][1]);
>+    cairo_mesh_pattern_set_control_point (fill_pattern, 0, patch->x[1][1], patch->y[1][1]);
>+    cairo_mesh_pattern_set_control_point (fill_pattern, 1, patch->x[1][2], patch->y[1][2]);
>+    cairo_mesh_pattern_set_control_point (fill_pattern, 2, patch->x[2][2], patch->y[2][2]);
>+    cairo_mesh_pattern_set_control_point (fill_pattern, 3, patch->x[2][1], patch->y[2][1]);
> 
>     for (j = 0; j < 4; j++) {
>       int u, v;
>@@ -932,12 +932,12 @@ GBool CairoOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *
>       }
> 
>       shading->getColorSpace()->getRGB(&color, &rgb);
>-      cairo_pattern_mesh_set_corner_color_rgb (fill_pattern, j,
>+      cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, j,
> 					       colToDbl(rgb.r),
> 					       colToDbl(rgb.g),
> 					       colToDbl(rgb.b));
>     }
>-    cairo_pattern_mesh_end_patch (fill_pattern);
>+    cairo_mesh_pattern_end_patch (fill_pattern);
>   }
> 
>   double xMin, yMin, xMax, yMax;
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 34384: 43483 | 43484

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.