[cairo] [PATCH pixman 05/11] pixman-filter: Use the word 'scale' consistently

Bill Spitzak spitzak at gmail.com
Wed Sep 10 19:01:59 PDT 2014


Removed the use of scale as 1/scale in integral().
---
 pixman/pixman-filter.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pixman/pixman-filter.c b/pixman/pixman-filter.c
index 15ea270..d26a549 100644
--- a/pixman/pixman-filter.c
+++ b/pixman/pixman-filter.c
@@ -163,7 +163,7 @@ integral (pixman_kernel_t kernel1, double x1,
     if (kernel1 == PIXMAN_KERNEL_IMPULSE)
     {
 	assert (width == 0.0);
-	return filters[kernel2].func (x2 * scale);
+	return filters[kernel2].func (x2 / scale);
     }
     else if (kernel1 == PIXMAN_KERNEL_BOX && kernel2 == PIXMAN_KERNEL_BOX)
     {
@@ -197,7 +197,7 @@ integral (pixman_kernel_t kernel1, double x1,
 	/* Integration via Simpson's rule */
 #define N_SEGMENTS 16
 #define SAMPLE(a1, a2)							\
-	(filters[kernel1].func ((a1)) * filters[kernel2].func ((a2) * scale))
+	(filters[kernel1].func ((a1)) * filters[kernel2].func ((a2) / scale))
 	
 	double s = 0.0;
 	double h = width / (double)N_SEGMENTS;
@@ -278,7 +278,7 @@ create_1d_filter (int             *width,
 		ihigh = MIN (shigh, rhigh);
 
 		c = integral (reconstruct, ilow,
-			      sample, 1.0 / scale, ilow - pos,
+			      sample, scale, ilow - pos,
 			      ihigh - ilow);
 	    }
 
-- 
1.7.9.5



More information about the cairo mailing list