Remove useless checks for NULL before freeing

[profile/ivi/pixman.git] / pixman / pixman-edge-imp.h

diff --git a/pixman/pixman-edge-imp.h b/pixman/pixman-edge-imp.h
index 36fc5e3..a4698ed 100644 (file)
--- a/pixman/pixman-edge-imp.h
+++ b/pixman/pixman-edge-imp.h
@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef rasterizeSpan
+#ifndef rasterize_span
 #endif
 
 static void
@@ -49,10 +49,14 @@ RASTERIZE_EDGES (pixman_image_t  *image,
        rx = r->x;
 #if N_BITS == 1
        /* For the non-antialiased case, round the coordinates up, in effect
-        * sampling the center of the pixel. (The AA case does a similar 
-        * adjustment in RenderSamplesX) */
-       lx += X_FRAC_FIRST(1);
-       rx += X_FRAC_FIRST(1);
+        * sampling just slightly to the left of the pixel. This is so that
+        * when the sample point lies exactly on the line, we round towards
+        * north-west.
+        *
+        * (The AA case does a similar  adjustment in RENDER_SAMPLES_X)
+        */
+       lx += X_FRAC_FIRST(1) - pixman_fixed_e;
+       rx += X_FRAC_FIRST(1) - pixman_fixed_e;
 #endif
        /* clip X */
        if (lx < 0)
@@ -79,14 +83,6 @@ RASTERIZE_EDGES (pixman_image_t  *image,
 #if N_BITS == 1
            {
 
-#ifdef WORDS_BIGENDIAN
-#   define SCREEN_SHIFT_LEFT(x,n)      ((x) << (n))
-#   define SCREEN_SHIFT_RIGHT(x,n)     ((x) >> (n))
-#else
-#   define SCREEN_SHIFT_LEFT(x,n)      ((x) >> (n))
-#   define SCREEN_SHIFT_RIGHT(x,n)     ((x) << (n))
-#endif
-
 #define LEFT_MASK(x)                                                   \
                (((x) & 0x1f) ?                                         \
                 SCREEN_SHIFT_RIGHT (0xffffffff, (x) & 0x1f) : 0)
@@ -94,7 +90,7 @@ RASTERIZE_EDGES (pixman_image_t  *image,
                (((32 - (x)) & 0x1f) ?                                  \
                 SCREEN_SHIFT_LEFT (0xffffffff, (32 - (x)) & 0x1f) : 0)
                
-#define FbMaskBits(x,w,l,n,r) {                                                \
+#define MASK_BITS(x,w,l,n,r) {                                         \
                    n = (w);                                            \
                    r = RIGHT_MASK ((x) + n);                           \
                    l = LEFT_MASK (x);                                  \
@@ -119,7 +115,7 @@ RASTERIZE_EDGES (pixman_image_t  *image,
                a += x >> 5;
                x &= 0x1f;
                
-               FbMaskBits (x, width, startmask, nmiddle, endmask);
+               MASK_BITS (x, width, startmask, nmiddle, endmask);
 
                if (startmask) {
                    WRITE(image, a, READ(image, a) | startmask);
@@ -137,8 +133,8 @@ RASTERIZE_EDGES (pixman_image_t  *image,
                int     rxs;
 
                /* Sample coverage for edge pixels */
-               lxs = RenderSamplesX (lx, N_BITS);
-               rxs = RenderSamplesX (rx, N_BITS);
+               lxs = RENDER_SAMPLES_X (lx, N_BITS);
+               rxs = RENDER_SAMPLES_X (rx, N_BITS);
 
                /* Add coverage across row */
                if (lxi == rxi)
@@ -183,4 +179,4 @@ RASTERIZE_EDGES (pixman_image_t  *image,
     }
 }
 
-#undef rasterizeSpan
+#undef rasterize_span