Browse Source

Merge branch 'main' of https://github.com/ComposersDesktop/CDP8

richarddobson 2 years ago
parent
commit
093b0d2326
3 changed files with 8 additions and 3 deletions
  1. 1 1
      dev/grain/grain1.c
  2. 2 2
      dev/grain/main.c
  3. 5 0
      dev/include/grain.h

+ 1 - 1
dev/grain/grain1.c

@@ -3189,7 +3189,7 @@ int grev(dataptr dz)
         maxsamp0 = 0.0;
         maxsamp1 = 0.0;
         gotmaxsamp0 = 0;
-        minpeakav = HUGE_VAL;
+        minpeakav = HUGE;
         minpeakloc = -1;
         j = startsearch;
         crossed_zero_to_positive = 0;

+ 2 - 2
dev/grain/main.c

@@ -59,7 +59,7 @@ int main(int argc,char *argv[])
     /*char *special_data_string = NULL;*/
     char **cmdline;
     int  cmdlinecnt;
-    aplptr ap;
+    //aplptr ap;
     int *valid = NULL;
     int is_launched = FALSE;
     int  validcnt;
@@ -121,7 +121,7 @@ int main(int argc,char *argv[])
         }
     }
 
-    ap = dz->application;
+    //ap = dz->application;
 
 /*********************************************************************************************************************
        cmdline[0]                         2 vals                              ACTIVE         

+ 5 - 0
dev/include/grain.h

@@ -30,3 +30,8 @@
 #include        <flags.h>
 #include        <graicon.h>
 #include        <grain1.h>
+
+#ifndef HUGE
+#define HUGE 3.40282347e+38F
+#endif
+