r41: ANSI C changes

[ctsim.git] / src / phm2sdf.c

diff --git a/src/phm2sdf.c b/src/phm2sdf.c
index ac3481cd18e478794ec46ec1ec9a4565684cc590..7da5c48161aebb643f45abac563096f8efa18232 100644 (file)
--- a/src/phm2sdf.c
+++ b/src/phm2sdf.c
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2sdf.c,v 1.6 2000/05/03 08:49:50 kevin Exp $
+**  $Id: phm2sdf.c,v 1.7 2000/05/08 20:02:32 kevin Exp $
 **  $Log: phm2sdf.c,v $
+**  Revision 1.7  2000/05/08 20:02:32  kevin
+**  ANSI C changes
+**
 **  Revision 1.6  2000/05/03 08:49:50  kevin
 **  Code cleanup
 **
@@ -48,19 +51,8 @@
 
 #include "ct.h"
 
-#define O_PHANTOM       1
-#define O_DESC          2
-#define O_NSAMPLE       3
-#define O_FILTER        4
-#define O_TRACE         5
-#define O_VERBOSE       6
-#define O_HELP          7
-#define O_PHMFILE       8
-#define O_FILTER_DOMAIN 9
-#define O_FILTER_BW     10
-#define O_FILTER_PARAM  11
-#define O_DEBUG         12
-#define O_VERSION       13
+enum { O_PHANTOM, O_DESC, O_NSAMPLE, O_FILTER, O_TRACE, O_VERBOSE, O_HELP, 
+       O_PHMFILE, O_FILTER_DOMAIN, O_FILTER_BW, O_FILTER_PARAM, O_DEBUG, O_VERSION };
 
 static struct option my_options[] = 
 {
@@ -271,7 +263,7 @@ main (const int argc, char *const argv[])
 
 #if HAVE_INTERACTIVE_GRAPHICS
     if (opt_trace >= TRACE_PHM)
-      show_phm(phm);
+      phm_show(phm);
 #endif
 
     if (optind + 3 != argc) {
@@ -418,11 +410,6 @@ main (const int argc, char *const argv[])
   strncpy (im_global->remark, opt_desc, sizeof(im_global->remark));
   image_save (im_global);
 
-  if (opt_trace >= TRACE_PHM)
-    {
-      crt_set_cpos (1, 1);
-    }
-  
   if (opt_verbose)
     fprintf (stdout, "Time to compile image = %.2f sec\n\n", im_global->calctime);
 #endif
@@ -437,10 +424,7 @@ main (const int argc, char *const argv[])
       printf ("Enter minimum and maximum densities (min, max): ");
       scanf ("%lf %lf", &dmin, &dmax);
       //      image_paint (CRTDEV, im_global, 0, 0, nx, ny, dmin, dmax, 0);
-      WAITKEY();
 
-      crt_put_stra ("Finished", 8 + C_WHITE);
-      crt_set_cpos (1, 2);
     }
 
   return (0);