summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-07-27 14:11:58 +0000
committerOwen Taylor <otaylor@redhat.com>2005-07-27 14:11:58 +0000
commit7b2b9df4e7b3c76b4dd40f865d7b6c55d3a0747c (patch)
treeb4b71c4883ad16e8b1ff3590cd841284d21f0586
parent255913de9ef5da40604d55ca8d0d53ac606f7710 (diff)
Fix units for stride return to be FbStip-sized. : ----------------------------------------------------------------------
-rw-r--r--pixman/ChangeLog5
-rw-r--r--pixman/src/icint.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index 43ecf1695..505188de0 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-27 Owen Taylor <otaylor@redhat.com>
+
+ * src/icint.h (FbGetStipPixels): Fix units for stride return
+ to be FbStip-sized.
+
2005-07-16 Jeff Muizelaar <jeff@infidigm.net>
* src/ic.c: (pixman_composite):
diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index 6ba28840b..a5f0aff24 100644
--- a/pixman/src/icint.h
+++ b/pixman/src/icint.h
@@ -557,7 +557,7 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
#define FbGetStipPixels(icpixels, pointer, _stride_, _bpp_, xoff, yoff) { \
(pointer) = (FbStip *) icpixels->data; \
- (_stride_) = icpixels->stride; \
+ (_stride_) = icpixels->stride / sizeof(FbStip); \
(_bpp_) = icpixels->bpp; \
(xoff) = icpixels->x; \
(yoff) = icpixels->y; \