[cairo-commit] cairo/pixman/src pixman-remap.h, 1.3, 1.4 fbpict.c, 1.3, 1.4

[Billy Biggs]

Committed by: vektor

Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv4997/src

Modified Files:
	pixman-remap.h fbpict.c 
Log Message:
	* src/fbpict.c: Remove warning about fbCompositeTrans_0888xnx0888 not
	being tested on big-endian, it's not helpful at this point.

	* src/pixman-remap.h: Only define _cairo_pixman_have_mmx for fbHaveMMX
	when the symbol will actually exist.



Index: pixman-remap.h
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/pixman-remap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pixman-remap.h	18 Aug 2005 04:14:02 -0000	1.3
+++ pixman-remap.h	22 Aug 2005 03:49:47 -0000	1.4
@@ -32,7 +32,9 @@
 #define pixman_format_destroy _cairo_pixman_format_destroy
 #define pixman_format_get_masks _cairo_pixman_format_get_masks
 #define pixman_format_init _cairo_pixman_format_init
+#ifdef USE_MMX && !defined(__amd64__) && !defined(__x86_64__)
 #define fbHaveMMX _cairo_pixman_have_mmx
+#endif
 #define pixman_image_create _cairo_pixman_image_create
 #define pixman_image_create_for_data _cairo_pixman_image_create_for_data
 #define pixman_image_destroy _cairo_pixman_image_destroy

Index: fbpict.c
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/fbpict.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbpict.c	19 Aug 2005 02:13:07 -0000	1.3
+++ fbpict.c	22 Aug 2005 03:49:47 -0000	1.4
@@ -119,30 +119,29 @@
 	}
 
 #if IMAGE_BYTE_ORDER == LSBFirst
-	#define setupPackedReader(count,temp,where,workingWhere,workingVal) count=(long)where; \
+#	define setupPackedReader(count,temp,where,workingWhere,workingVal) count=(long)where; \
 					temp=count&3; \
 					where-=temp; \
 					workingWhere=(CARD32 *)where; \
 					workingVal=*workingWhere++; \
 					count=4-temp; \
 					workingVal>>=(8*temp)
-	#define readPacked(where,x,y,z) {if(!(x)) { (x)=4; y=*z++; } where=(y)&0xff; (y)>>=8; (x)--;}
-	#define readPackedSource(where) readPacked(where,ws,workingSource,wsrc)
-	#define readPackedDest(where) readPacked(where,wd,workingiDest,widst)
-	#define writePacked(what) workingoDest>>=8; workingoDest|=(what<<24); ww--; if(!ww) { ww=4; *wodst++=workingoDest; }
+#	define readPacked(where,x,y,z) {if(!(x)) { (x)=4; y=*z++; } where=(y)&0xff; (y)>>=8; (x)--;}
+#	define readPackedSource(where) readPacked(where,ws,workingSource,wsrc)
+#	define readPackedDest(where) readPacked(where,wd,workingiDest,widst)
+#	define writePacked(what) workingoDest>>=8; workingoDest|=(what<<24); ww--; if(!ww) { ww=4; *wodst++=workingoDest; }
 #else
-	#warning "I havn't tested fbCompositeTrans_0888xnx0888() on big endian yet!"
-	#define setupPackedReader(count,temp,where,workingWhere,workingVal) count=(long)where; \
+#	define setupPackedReader(count,temp,where,workingWhere,workingVal) count=(long)where; \
 					temp=count&3; \
 					where-=temp; \
 					workingWhere=(CARD32 *)where; \
 					workingVal=*workingWhere++; \
 					count=4-temp; \
 					workingVal<<=(8*temp)
-	#define readPacked(where,x,y,z) {if(!(x)) { (x)=4; y=*z++; } where=(y)>>24; (y)<<=8; (x)--;}
-	#define readPackedSource(where) readPacked(where,ws,workingSource,wsrc)
-	#define readPackedDest(where) readPacked(where,wd,workingiDest,widst)
-	#define writePacked(what) workingoDest<<=8; workingoDest|=what; ww--; if(!ww) { ww=4; *wodst++=workingoDest; }
+#	define readPacked(where,x,y,z) {if(!(x)) { (x)=4; y=*z++; } where=(y)>>24; (y)<<=8; (x)--;}
+#	define readPackedSource(where) readPacked(where,ws,workingSource,wsrc)
+#	define readPackedDest(where) readPacked(where,wd,workingiDest,widst)
+#	define writePacked(what) workingoDest<<=8; workingoDest|=what; ww--; if(!ww) { ww=4; *wodst++=workingoDest; }
 #endif
 /*
  * Naming convention: