[Xorg-commit] xc/extras/freetype2/tests gview.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/extras/freetype2/tests
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/freetype2/tests

Modified Files:
      Tag: XORG-CURRENT
	gview.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: gview.c
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/tests/gview.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/gview.c	26 Nov 2003 22:48:28 -0000	1.1.4.1
+++ b/gview.c	23 Feb 2004 21:33:22 -0000	1.1.4.2
@@ -7,9 +7,7 @@
 
 /* include FreeType internals to debug hints */
 #include <../src/pshinter/pshrec.h>
-#include <../src/pshinter/pshalgo1.h>
-#include <../src/pshinter/pshalgo2.h>
-#include <../src/pshinter/pshalgo3.h>
+#include <../src/pshinter/pshalgo.h>
 
 #include <../src/autohint/ahtypes.h>
 
@@ -24,9 +22,9 @@
[...1318 lines suppressed...]
-          goto Exit;
+      case NVV_Key_Esc:
+        goto Exit;
 
-        default:
-          ;
+      default:
+        ;
       }
     }
   }
 
- Exit:
+Exit:
   /* wait for escape */
 
-
   /* destroy display (and surface) */
   nvv_display_unref( display );