[xserver-commit] xserver/include dix.h,3.29,3.30 picturestr.h,1.25,1.26

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv17870/include

Modified Files:
	dix.h picturestr.h 
Log Message:
2004-01-15  Keith Packard  <keithp@keithp.com>
	* dix/dixutils.c: (ISOLatin1ToLower), (CompareISOLatin1Lowered):
	* include/dix.h:
	Add CompareISOLatin1Lowered.
	* include/picturestr.h:
	* render/filter.c: (PictureGetFilterId), (PictureAddFilter),
	(PictureSetDefaultFilters), (SetPictureFilter):
	Change filter management to permit varargs filters.
	Use CompareISOLatin1Lowered to make filter name tests
	case-insensitive (as required by spec).


Index: dix.h
===================================================================
RCS file: /cvs/xserver/xserver/include/dix.h,v
retrieving revision 3.29
retrieving revision 3.30
diff -u -d -r3.29 -r3.30
--- dix.h	9 Oct 2003 06:36:26 -0000	3.29
+++ dix.h	15 Jan 2004 09:03:46 -0000	3.30
@@ -379,6 +379,12 @@
     unsigned char * /*source*/,
     int /*length*/);
 
+extern int CompareISOLatin1Lowered(
+    unsigned char * /*a*/,
+    int alen,
+    unsigned char * /*b*/,
+    int blen);
+
 #ifdef XCSECURITY
 
 extern WindowPtr SecurityLookupWindow(

Index: picturestr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picturestr.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- picturestr.h	18 Nov 2003 07:10:14 -0000	1.25
+++ picturestr.h	15 Jan 2004 09:03:47 -0000	1.26
@@ -102,11 +102,12 @@
     int		    filter_nparams;
 } PictureRec;
 
+typedef Bool (*PictFilterValidateParamsProcPtr) (PicturePtr pPicture, int id,
+						 xFixed *params, int nparams);
 typedef struct {
-    char	    *name;
-    xFixed	    *params;
-    int		    nparams;
-    int		    id;
+    char			    *name;
+    int				    id;
+    PictFilterValidateParamsProcPtr ValidateParams;
 } PictFilterRec, *PictFilterPtr;
 
 #define PictFilterNearest	0
@@ -339,7 +340,9 @@
 PictureGetFilterName (int id);
 
 int
-PictureAddFilter (ScreenPtr pScreen, char *filter, xFixed *params, int nparams);
+PictureAddFilter (ScreenPtr			    pScreen,
+		  char				    *filter,
+		  PictFilterValidateParamsProcPtr   ValidateParams);
 
 Bool
 PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias);