[Commit] xrtest Makefile,1.2,1.3 xrknockout.c,1.8,1.9

[Carl Worth]

Committed by: cworth

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

Modified Files:
	Makefile xrknockout.c 
Log Message:
Fixed Makefile to reference xr.pc rather than Xr.pc

Index: Makefile
===================================================================
RCS file: /local/src/CVS/xrtest/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	25 Apr 2003 20:31:20 -0000	1.2
+++ Makefile	7 Jul 2003 11:07:33 -0000	1.3
@@ -1,5 +1,5 @@
-CFLAGS=-g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls `pkg-config --cflags Xr`
-LDFLAGS=`pkg-config --libs Xr`
+CFLAGS=-g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls `pkg-config --cflags xr`
+LDFLAGS=`pkg-config --libs xr`
 
 PROGS=xrtest xrspline xrknockout xrfreq
 

Index: xrknockout.c
===================================================================
RCS file: /local/src/CVS/xrtest/xrknockout.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xrknockout.c	12 May 2003 16:50:04 -0000	1.8
+++ xrknockout.c	7 Jul 2003 11:07:33 -0000	1.9
@@ -209,7 +209,7 @@
     XrRestore (r);
 
     XrSetOperator (r, XrOperatorOutReverse);
-    XrShowSurface (r, punch, 0, 0, width, height);
+    XrShowSurface (r, punch, width, height);
 
     /* Now draw the 3 circles in a subgroup again
      * at half intensity, and use OperatorAdd to join up
@@ -225,11 +225,11 @@
     XrRestore (r);
 
     XrSetOperator (r, XrOperatorAdd);
-    XrShowSurface (r, circles, 0, 0, width, height);
+    XrShowSurface (r, circles, width, height);
 
     XrRestore (r);
 
-    XrShowSurface (r, overlay, 0, 0, width, height);
+    XrShowSurface (r, overlay, width, height);
 
     XrSurfaceDestroy (overlay);
     XrSurfaceDestroy (punch);