commit ff39efa5c01eb51daf73593cd7a39cc3fac6d48e
author Hardening <rdp.effort@gmail.com> Wed Sep 18 23:56:35 2013 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Sat Sep 21 11:40:17 2013 -0700
tree 754846a4f22eec2e650be1727c69fa12e7067ad3
parent a2df51c19f46f8b8b6a9968e18490d7ce99d32c1

Rename current, origin, scale, origin_scale

This patch renames that fields to have consistent names.

src/pixman-renderer.c

diff --git a/src/pixman-renderer.c b/src/pixman-renderer.c
index 31b7e58..987c539 100644
--- a/src/pixman-renderer.c
+++ b/src/pixman-renderer.c
@@ -217,7 +217,7 @@
 {
 	pixman_region32_translate(region, -output->x, -output->y);
 	transform_region (region, output->width, output->height, output->transform);
-	scale_region (region, output->scale);
+	scale_region (region, output->current_scale);
 }
 
 #define D2F(v) pixman_double_to_fixed((double)v)
@@ -271,8 +271,8 @@
 	   specified buffer transform/scale */
 	pixman_transform_init_identity(&transform);
 	pixman_transform_scale(&transform, NULL,
-			       pixman_double_to_fixed ((double)1.0/output->scale),
-			       pixman_double_to_fixed ((double)1.0/output->scale));
+			       pixman_double_to_fixed ((double)1.0/output->current_scale),
+			       pixman_double_to_fixed ((double)1.0/output->current_scale));
 
 	fw = pixman_int_to_fixed(output->width);
 	fh = pixman_int_to_fixed(output->height);
@@ -385,7 +385,7 @@
 
 	pixman_image_set_transform(ps->image, &transform);
 
-	if (es->transform.enabled || output->scale != es->buffer_scale)
+	if (es->transform.enabled || output->current_scale != es->buffer_scale)
 		pixman_image_set_filter(ps->image, PIXMAN_FILTER_BILINEAR, NULL, 0);
 	else
 		pixman_image_set_filter(ps->image, PIXMAN_FILTER_NEAREST, NULL, 0);
@@ -711,8 +711,8 @@
 		return -1;
 
 	/* set shadow image transformation */
-	w = output->current->width;
-	h = output->current->height;
+	w = output->current_mode->width;
+	h = output->current_mode->height;
 
 	po->shadow_buffer = malloc(w * h * 4);