From 8445b799974655e753eaa1ca1684048f8fd4d5df Mon Sep 17 00:00:00 2001
From: "vladimir@pobox.com" <none@none>
Date: Mon, 6 Aug 2007 18:14:47 -0700
Subject: [PATCH] b=390912, odd black bars with stroked rounded rects outside
 of view bounds, r=shaver, rs=k&r

---
 gfx/cairo/libpixman/src/pixman-edge-imp.h | 5 ++---
 gfx/cairo/libpixman/src/pixman-edge.c     | 3 +--
 gfx/cairo/libpixman/src/pixman-private.h  | 2 +-
 gfx/cairo/libpixman/src/pixman-trap.c     | 1 -
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/gfx/cairo/libpixman/src/pixman-edge-imp.h b/gfx/cairo/libpixman/src/pixman-edge-imp.h
index c3ad348ea26..8946eeeb17c 100644
--- a/gfx/cairo/libpixman/src/pixman-edge-imp.h
+++ b/gfx/cairo/libpixman/src/pixman-edge-imp.h
@@ -1,5 +1,4 @@
 /*
- * $Id: pixman-edge-imp.h,v 1.3 2007/08/02 06:54:41 vladimir%pobox.com Exp $
  *
  * Copyright © 2004 Keith Packard
  *
@@ -35,8 +34,8 @@ rasterizeEdges (pixman_image_t  *image,
     pixman_fixed_t  y = t;
     uint32_t  *line;
     uint32_t *buf = (image)->bits.bits;
-    uint32_t stride = (image)->bits.rowstride;
-    uint32_t width = (image)->bits.width;
+    int32_t stride = (image)->bits.rowstride;
+    int32_t width = (image)->bits.width;
     
     line = buf + pixman_fixed_to_int (y) * stride;
     
diff --git a/gfx/cairo/libpixman/src/pixman-edge.c b/gfx/cairo/libpixman/src/pixman-edge.c
index f7cf18873f9..d5b737d23ff 100644
--- a/gfx/cairo/libpixman/src/pixman-edge.c
+++ b/gfx/cairo/libpixman/src/pixman-edge.c
@@ -1,5 +1,4 @@
 /*
- * $Id: pixman-edge.c,v 1.5 2007/08/02 06:57:51 vladimir%pobox.com Exp $
  *
  * Copyright © 2004 Keith Packard
  *
@@ -133,7 +132,7 @@ fbRasterizeEdges8 (pixman_image_t       *image,
     int fill_size = 0;
     uint32_t *buf = (image)->bits.bits;		
     int32_t stride = (image)->bits.rowstride;	
-    uint32_t width = (image)->bits.width;
+    int32_t width = (image)->bits.width;
     
     line = buf + pixman_fixed_to_int (y) * stride;
     
diff --git a/gfx/cairo/libpixman/src/pixman-private.h b/gfx/cairo/libpixman/src/pixman-private.h
index 6413ecd0e9e..05608097d00 100644
--- a/gfx/cairo/libpixman/src/pixman-private.h
+++ b/gfx/cairo/libpixman/src/pixman-private.h
@@ -658,7 +658,7 @@ union pixman_image
     do {								\
 	size_t _i;							\
 	uint8_t *_dst = (uint8_t*)(dst);				\
-	for(_i = 0; _i < size; _i++) {					\
+	for(_i = 0; _i < (size_t) size; _i++) {                          \
 	    WRITE(_dst +_i, (val));					\
 	}								\
     } while (0)
diff --git a/gfx/cairo/libpixman/src/pixman-trap.c b/gfx/cairo/libpixman/src/pixman-trap.c
index e07b7e9732c..94487326879 100644
--- a/gfx/cairo/libpixman/src/pixman-trap.c
+++ b/gfx/cairo/libpixman/src/pixman-trap.c
@@ -1,5 +1,4 @@
 /*
- * $Id: pixman-trap.c,v 1.5 2007/08/02 06:57:51 vladimir%pobox.com Exp $
  *
  * Copyright © 2004 Keith Packard
  *