pixman: Branch 'master' - 2 commits

Søren Sandmann Pedersen sandmann at kemper.freedesktop.org
Wed Sep 18 12:44:44 PDT 2013


 demos/scale.ui         |    2 +-
 pixman/pixman-filter.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 75506e63677208c1ec4364ab1a4b4fb73a0ca6c8
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Sep 10 09:44:40 2013 -0400

    pixman-filter.c: Use 65536, not 65535, for fixed point conversion
    
    Converting a double precision number to 16.16 fixed point should be
    done by multiplying with 65536.0, not 65535.0.
    
    The bug could potentially cause certain filters that would otherwise
    leave the image bit-for-bit unchanged under an identity
    transformation, to not do so, but the numbers are close enough that
    there weren't any visual differences.

diff --git a/pixman/pixman-filter.c b/pixman/pixman-filter.c
index 5ff7b6e..b2bf53f 100644
--- a/pixman/pixman-filter.c
+++ b/pixman/pixman-filter.c
@@ -275,7 +275,7 @@ create_1d_filter (int             *width,
 	    }
 
 	    total += c;
-            *p++ = (pixman_fixed_t)(c * 65535.0 + 0.5);
+            *p++ = (pixman_fixed_t)(c * 65536.0 + 0.5);
         }
 
 	/* Normalize */
commit 9899a7bae8a00c6a92ed27d4dc2fe6f178c8acc8
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Sep 10 09:37:38 2013 -0400

    demos/scale.ui: Allow subsample_bits to be 0
    
    The separable convolution filter supports a subsample_bits of 0 which
    corresponds to no subsampling at all, so allow this value to be used
    in the scale demo.

diff --git a/demos/scale.ui b/demos/scale.ui
index b3450d3..ee985dd 100644
--- a/demos/scale.ui
+++ b/demos/scale.ui
@@ -24,7 +24,7 @@
     <property name="page_size">10</property>
   </object>
   <object class="GtkAdjustment" id="subsample_adjustment">
-    <property name="lower">1</property>
+    <property name="lower">0</property>
     <property name="upper">12</property>
     <property name="step_increment">1</property>
     <property name="page_increment">1</property>


More information about the xorg-commit mailing list