[Commit] Xr/src Makefile.am,1.2,1.3 Xr.h,1.22,1.23 xrsurface.c,1.13,1.14

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/Xr/src
In directory home.keithp.com:/tmp/cvs-serv2226/src

Modified Files:
	Makefile.am Xr.h xrsurface.c 
Log Message:
Changed XrFormatRGB32 to XrFormatRGB24

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/Xr/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	25 Apr 2003 20:34:00 -0000	1.2
+++ Makefile.am	2 May 2003 21:07:42 -0000	1.3
@@ -22,6 +22,6 @@
 
 libXr_la_LDFLAGS = -version-info @VERSION_INFO@
 
-INCLUDES = $(X_CFLAGS) $(XR_CFLAGS)
+INCLUDES = $(XR_CFLAGS) $(X_CFLAGS)
 
 libXr_la_LIBADD = $(XR_LIBS)

Index: Xr.h
===================================================================
RCS file: /local/src/CVS/Xr/src/Xr.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Xr.h	1 May 2003 15:18:25 -0000	1.22
+++ Xr.h	2 May 2003 21:07:42 -0000	1.23
@@ -60,7 +60,7 @@
 
 typedef enum _XrFormat {
     XrFormatARGB32 = PictStandardARGB32,
-    XrFormatRGB32 = PictStandardRGB24,
+    XrFormatRGB24 = PictStandardRGB24,
     XrFormatA8 = PictStandardA8,
     XrFormatA1 = PictStandardA1
 } XrFormat;

Index: xrsurface.c
===================================================================
RCS file: /local/src/CVS/Xr/src/xrsurface.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- xrsurface.c	26 Apr 2003 17:00:29 -0000	1.13
+++ xrsurface.c	2 May 2003 21:07:42 -0000	1.14
@@ -93,8 +93,8 @@
     case XrFormatA8:
 	return 8;
 	break;
+    case XrFormatRGB24:
     case XrFormatARGB32:
-    case XrFormatRGB32:
     default:
 	return 32;
 	break;
@@ -119,7 +119,7 @@
 	IcFormatInit (&icformat, PICT_a8r8g8b8);
 	bpp = 32;
 	break;
-    case XrFormatRGB32:
+    case XrFormatRGB24:
 	IcFormatInit (&icformat, PICT_x8r8g8b8);
 	bpp = 32;
 	break;
@@ -173,8 +173,9 @@
 	return 1;
     case XrFormatA8:
 	return 8;
+    case XrFormatRGB24:
+	return 24;
     case XrFormatARGB32:
-    case XrFormatRGB32:
     default:
 	return 32;
     }