Merge remote branch 'origin/7.8'

[mesa.git] / progs / demos / paltex.c

diff --git a/progs/demos/paltex.c b/progs/demos/paltex.c
index 67ba27bb8aee8439227c3dffddaaf841d6eaf648..5d4b8662b5cb8d050f9522be2ec9bfc9943eca02 100644 (file)
--- a/progs/demos/paltex.c
+++ b/progs/demos/paltex.c
@@ -1,4 +1,3 @@
-/* $Id: paltex.c,v 1.8 2002/07/12 15:54:02 brianp Exp $ */
 
 /*
  * Paletted texture demo.  Written by Brian Paul.
@@ -12,7 +11,7 @@
 #ifdef _WIN32
 #include <windows.h>
 #endif
-#define GL_GLEXT_LEGACY
+#include <GL/glew.h>
 #include <GL/glut.h>
 
 
@@ -94,15 +93,16 @@ static void Init( void )
 {
 #define HEIGHT 8
 #define WIDTH 32
-   static char texture[HEIGHT][WIDTH] = {
-         "                                ",
-         "    MMM    EEEE   SSS    AAA    ",
-         "   M M M  E      S   S  A   A   ",
-         "   M M M  EEEE    SS    A   A   ",
-         "   M M M  E         SS  AAAAA   ",
-         "   M   M  E      S   S  A   A   ",
-         "   M   M   EEEE   SSS   A   A   ",
-         "                                "
+   /* 257 = HEIGHT * WIDTH + 1 (for trailing '\0') */
+   static char texture[257] = {"\
+                                \
+    MMM    EEEE   SSS    AAA    \
+   M M M  E      S   S  A   A   \
+   M M M  EEEE    SS    A   A   \
+   M M M  E         SS  AAAAA   \
+   M   M  E      S   S  A   A   \
+   M   M   EEEE   SSS   A   A   \
+                                "
       };
    GLubyte table[256][4];
 
@@ -248,15 +248,14 @@ static void Init2( void )
 
 int main( int argc, char *argv[] )
 {
-   glutInit( &argc, argv );
-   glutInitWindowPosition( 0, 0 );
    glutInitWindowSize( 400, 300 );
-
+   glutInit( &argc, argv );
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-
    glutCreateWindow(argv[0]);
+   glewInit();
 
    Init();
+   (void) Init2; /* silence warning */
 
    glutReshapeFunc( Reshape );
    glutKeyboardFunc( Key );