Bug 754364. Fix bustage from changing the wrong #if 0
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Wed, 16 May 2012 02:04:31 -0400
changeset 94110 4a3efede490432c1c9c49cb1d8f525c6210f49eb
parent 94109 80fa9af29d8ae67620e8bfd3306c8192c0e2d5b0
child 94111 b7b7c790cc5e4dd05f498808c370d2fc5437dd1e
push id22700
push userryanvm@gmail.com
push dateThu, 17 May 2012 00:48:56 +0000
treeherdermozilla-central@762e95608da3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs754364
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 754364. Fix bustage from changing the wrong #if 0
gfx/cairo/libpixman/src/pixman-fast-path.c
--- a/gfx/cairo/libpixman/src/pixman-fast-path.c
+++ b/gfx/cairo/libpixman/src/pixman-fast-path.c
@@ -645,17 +645,17 @@ fast_composite_src_x888_8888 (pixman_imp
 	src_line += src_stride;
 	w = width;
 
 	while (w--)
 	    *dst++ = (*src++) | 0xff000000;
     }
 }
 
-#if 1
+#if 0
 static void
 fast_composite_over_8888_0888 (pixman_implementation_t *imp,
 			       pixman_composite_info_t *info)
 {
     PIXMAN_COMPOSITE_ARGS (info);
     uint8_t     *dst_line, *dst;
     uint32_t d;
     uint32_t    *src_line, *src, s;
@@ -1250,17 +1250,17 @@ scaled_bilinear_scanline_8888_8888_OVER 
 				      bl, br,
 				      interpolation_coord(vx),
 				      wb >> (8 - INTERPOLATION_PRECISION_BITS));
 	vx += unit_x;
 	*dst++ = over (src, d);
     }
 }
 
-#if 0
+#if 1
 
 static force_inline void
 scaled_bilinear_scanline_565_565_SRC (uint16_t *       dst,
 				      const uint32_t * mask,
 				      const uint16_t * src_top,
 				      const uint16_t * src_bottom,
 				      int32_t          w,
 				      int              wt,