aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mfb
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/mfb')
-rw-r--r--xorg-server/mfb/makefile14
-rw-r--r--xorg-server/mfb/mfbply1rct.c8
2 files changed, 18 insertions, 4 deletions
diff --git a/xorg-server/mfb/makefile b/xorg-server/mfb/makefile
new file mode 100644
index 000000000..f3ca6e647
--- /dev/null
+++ b/xorg-server/mfb/makefile
@@ -0,0 +1,14 @@
+CSRCS=mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
+ mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \
+ mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \
+ mfbtileC.c mfbtileG.c mfbplywhite.c mfbplyblack.c mfbplyinv.c \
+ mfbgc.c mfbwindow.c mfbfont.c \
+ mfbfillrct.c maskbits.c mfbpixmap.c \
+ mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \
+ mfbpushpxl.c mfbzerarc.c mfbfillarc.c \
+ mfbfillsp.c mfbsetsp.c mfbscrinit.c mfbscrclse.c mfbclip.c \
+ mfbbitblt.c mfbgetsp.c mfbpolypnt.c \
+ mfbcmap.c mfbmisc.c
+
+LIBRARY=libmfb
+
diff --git a/xorg-server/mfb/mfbply1rct.c b/xorg-server/mfb/mfbply1rct.c
index 4227e894f..9ff4fb5be 100644
--- a/xorg-server/mfb/mfbply1rct.c
+++ b/xorg-server/mfb/mfbply1rct.c
@@ -51,14 +51,14 @@ in this Software without prior written authorization from The Open Group.
#endif
#if IMAGE_BYTE_ORDER == MSBFirst
-#define intToCoord(i,x,y) (((x) = GetHighWord(i)), ((y) = (int) ((short) (i))))
+#define intToCoord(i,x,y) (((x) = GetHighWord(i)), ((y) = (int) ((short) ((i)&0xffff))))
#define coordToInt(x,y) (((x) << 16) | ((y) & 0xffff))
#define intToX(i) (GetHighWord(i))
-#define intToY(i) ((int) ((short) i))
+#define intToY(i) ((int) ((short) ((i)&0xffff)))
#else
-#define intToCoord(i,x,y) (((x) = (int) ((short) (i))), ((y) = GetHighWord(i)))
+#define intToCoord(i,x,y) (((x) = (int) ((short) ((i)&0xffff))), ((y) = GetHighWord(i)))
#define coordToInt(x,y) (((y) << 16) | ((x) & 0xffff))
-#define intToX(i) ((int) ((short) (i)))
+#define intToX(i) ((int) ((short) ((i)&0xffff)))
#define intToY(i) (GetHighWord(i))
#endif