cleaned up a bunch of warnings

[freeglut] / progs / demos / Fractals_random / fractals_random.c

diff --git a/progs/demos/Fractals_random/fractals_random.c b/progs/demos/Fractals_random/fractals_random.c
index 3799ba0..aa10641 100644 (file)
--- a/progs/demos/Fractals_random/fractals_random.c
+++ b/progs/demos/Fractals_random/fractals_random.c
@@ -25,8 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#ifdef WIN32
-#include <crtdbg.h>  // DUMP MEMORY LEAKS
+#define FGH_PI       3.14159265358979323846
+#ifdef _MSC_VER
+/* DUMP MEMORY LEAKS */
+#include <crtdbg.h>
 #endif
 
 typedef struct
@@ -254,6 +256,16 @@ MouseWheel ( int wheel_number, int direction, int x, int y )
 }
 
 
+static void
+checkedFGets ( char *s, int size, FILE *stream )
+{
+  if ( fgets ( s, size, stream ) == NULL ) {
+    fprintf ( stderr, "fgets failed\n");
+    exit ( EXIT_FAILURE );
+  }
+}
+
+
 void readConfigFile ( char *fnme )
 {
   FILE *fptr = fopen ( fnme, "rt" ) ;
@@ -263,13 +275,13 @@ void readConfigFile ( char *fnme )
   if ( fptr )
   {
     /* Read a header line */
-    fgets ( inputline, 256, fptr ) ;
+    checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
 
     /* Read a comment line */
-    fgets ( inputline, 256, fptr ) ;
+    checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
 
     /* Read the window title */
-    fgets ( inputline, 256, fptr ) ;
+    checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
     /* We assume here that this line will not exceed 79 characters plus a 
        newline (window_title is 80 characters long). That'll cause a buffer 
        overflow. For a simple program like  this, though, we're letting it 
@@ -278,21 +290,21 @@ void readConfigFile ( char *fnme )
     sscanf ( inputline, "%[a-zA-Z0-9!@#$%^&*()+=/\\_-\" ]", window_title ) ; 
 
     /* Read a comment line */
-    fgets ( inputline, 256, fptr ) ;
+    checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
 
     /* Read the number of affine transformations */
-    fgets ( inputline, 256, fptr ) ;
+    checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
     sscanf ( inputline, "%d", &num_trans ) ;
 
     affine = (AffineTrans *)malloc ( num_trans * sizeof(AffineTrans) ) ;
 
     /* Read a comment line */
-    fgets ( inputline, 256, fptr ) ;
+    checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
 
     for ( i = 0; i < num_trans; i++ )
     {
       /* Read an affine transformation definition */
-      fgets ( inputline, 256, fptr ) ;
+      checkedFGets ( inputline, sizeof ( inputline ), fptr ) ;
       sscanf ( inputline, "%lf %lf %lf %lf %lf %lf", &affine[i].a00, &affine[i].a01,
                        &affine[i].a10, &affine[i].a11, &affine[i].b0, &affine[i].b1 ) ;
     }
@@ -300,13 +312,20 @@ void readConfigFile ( char *fnme )
   else  /* No data file, set a default */
   {
     printf ( "ERROR opening file <%s>\n", fnme ) ;
-    strcpy ( window_title, "Cantor Dust" ) ;
-    num_trans = 2 ;
+    strcpy ( window_title, "Koch Snowflake" ) ;
+    num_trans = 4 ;
     affine = (AffineTrans *)malloc ( num_trans * sizeof(AffineTrans) ) ;
-    affine[0].a00 = 0.25 ;  affine[0].a01 = 0.00 ;  affine[0].a10 = 0.00 ;  affine[0].a11 = 0.25 ;
+    affine[0].a00 = 1/3. ;  affine[0].a01 = 0.00 ;  affine[0].a10 = 0.00 ;  affine[0].a11 = 1/3. ;
     affine[0].b0 = 0.0 ;    affine[0].b1 = 0.0 ;
-    affine[1].a00 = 0.25 ;  affine[1].a01 = 0.00 ;  affine[1].a10 = 0.00 ;  affine[1].a11 = 0.25 ;
-    affine[1].b0 = 0.5 ;    affine[1].b1 = 0.0 ;
+
+    affine[1].a00 = 1/6. ;  affine[1].a01 = -1/3.*sin(FGH_PI/3.) ;   affine[1].a10 = 1/3.*sin(FGH_PI/3.) ;   affine[1].a11 = 1/6. ;
+    affine[1].b0 = 1/3. ;   affine[1].b1 = 0.0 ;
+
+    affine[2].a00 = 1/6. ;  affine[2].a01 = -1/3.*sin(-FGH_PI/3.) ;  affine[2].a10 = 1/3.*sin(-FGH_PI/3.) ;  affine[2].a11 = 1/6. ;
+    affine[2].b0 = 0.5 ;    affine[2].b1 = sqrt(3)/6. ;
+
+    affine[3].a00 = 1/3. ;  affine[3].a01 = 0.00 ;  affine[3].a10 = 0.00 ;  affine[3].a11 = 1/3. ;
+    affine[3].b0 = 2/3. ;   affine[3].b1 = 0.0 ;
   }
 
   for ( i = 0; i < num_trans; i++ )
@@ -336,8 +355,6 @@ void readConfigFile ( char *fnme )
 int 
 main(int argc, char *argv[])
 {
-  int fractal_window ;
-
   glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE );
 
   glutInitWindowSize(500, 250);
@@ -349,7 +366,7 @@ main(int argc, char *argv[])
   else
     readConfigFile ( "fractals.dat" ) ;
 
-  fractal_window = glutCreateWindow( window_title );
+  glutCreateWindow( window_title );
 
   glClearColor(1.0, 1.0, 1.0, 1.0);
 
@@ -367,8 +384,9 @@ main(int argc, char *argv[])
 
   free ( affine ) ;
 
-#ifdef WIN32
-  _CrtDumpMemoryLeaks () ;  // DUMP MEMORY LEAK INFORMATION
+#ifdef _MSC_VER
+  /* DUMP MEMORY LEAK INFORMATION */
+  _CrtDumpMemoryLeaks () ;
 #endif
 
   return 0;             /* ANSI C requires main to return int. */