summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2005-12-28 10:43:02 +0000
committerEric Anholt <anholt@freebsd.org>2005-12-28 10:43:02 +0000
commit64ac7401ad5022462279dff4dcfb12844c9857ae (patch)
tree2895f40de7a8175dd776a4d0e6e091c539dc4a9e
parent9ceffb6b92e55f0d74d71489900d43940f14dfd9 (diff)
Fix a copy'n'paste-o that would result in mis-rounding of the results of
several composite operators in A and G channels.
-rw-r--r--ChangeLog6
-rw-r--r--fb/fbpict.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4eda12c3..e7aa29fa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-12-28 Eric Anholt <anholt@FreeBSD.org>
+ * fb/fbpict.h:
+ Fix a copy'n'paste-o that would result in mis-rounding of the results of
+ several composite operators in A and G channels.
+
+2005-12-28 Eric Anholt <anholt@FreeBSD.org>
+
* Xext/shmint.h:
Merge from xserver a header for shm's server internal functions, which
are called by DDXes. Desired by XGL, and should be used in other
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 665b92dd1..9546b134f 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -173,7 +173,7 @@
x = (x + ((x >> 8) & 0xff00ff)) >> 8; \
x &= 0xff00ff; \
x += (y >> 8) & 0xff00ff; \
- x |= 0x1000100 - ((t >> 8) & 0xff00ff); \
+ x |= 0x1000100 - ((x >> 8) & 0xff00ff); \
x &= 0xff00ff; \
x <<= 8; \
x += t; \