Browse Source

add/update copyright, remove warnings

richarddobson 2 years ago
parent
commit
5eae6dc04d
6 changed files with 1757 additions and 1710 deletions
  1. 770 747
      dev/science/scramble.c
  2. 1 1
      dev/science/smooth.c
  3. 5 5
      dev/science/sorter.c
  4. 9 9
      dev/science/specanal.c
  5. 969 945
      dev/science/specav.c
  6. 3 3
      dev/science/specfnu.c

File diff suppressed because it is too large
+ 770 - 747
dev/science/scramble.c


+ 1 - 1
dev/science/smooth.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  *

+ 5 - 5
dev/science/sorter.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  *
@@ -122,7 +122,7 @@ int main(int argc,char *argv[])
     char **cmdline;
     int  cmdlinecnt;
     int n;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
@@ -186,7 +186,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
         }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -633,7 +633,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     double dummy;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
@@ -658,7 +658,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             if((exit_status = setup_sorter_application(dz))<0)
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
 
         case(3):    

+ 9 - 9
dev/science/specanal.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  *
@@ -172,7 +172,7 @@ int main(int argc,char *argv[])
     dataptr dz = NULL;
     char **cmdline;
     int  cmdlinecnt;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     quartertone = sqrt(SEMITONE_INTERVAL);
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
@@ -237,7 +237,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
         }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -735,7 +735,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     double dummy;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
@@ -760,7 +760,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             if((exit_status = setup_specanal_application(dz))<0)
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
 
         case(3):    
@@ -2679,7 +2679,7 @@ int fft_(float *a, float *b, int nseg, int n, int nspn, int isn,float *at,float
                         /*  because wish to use Fortran array  */
                         /* index which runs 1 to n, not 0 to n */
 
-    int     m = 0, nf, k, kt, ntot, j, jj, maxf, maxp=0;
+    int     m = 0, nf, k, kt, ntot, j, jj, maxf /*, maxp=0*/;
 
 /* work space pointers */
 //  float   *at, *ck, *bt, *sk;
@@ -2720,7 +2720,7 @@ int fft_(float *a, float *b, int nseg, int n, int nspn, int isn,float *at,float
         }
 
         kt = m;
-        maxp = max((kt+kt+2),(k-1));
+//        maxp = max((kt+kt+2),(k-1));
         for(j=2; j<=k; j=1+((j+1)/2)*2) {
             if(k%j==0){
                 nfac[++m]=j;
@@ -2728,8 +2728,8 @@ int fft_(float *a, float *b, int nseg, int n, int nspn, int isn,float *at,float
             }
         }
     }
-    if(m <= kt+1) 
-        maxp = m + kt + 1;
+//    if(m <= kt+1)
+//        maxp = m + kt + 1;
     if(m+kt > 15) {
         sprintf(errstr,"FFT parameter n has more than 15 factors : %d", n);
         return(DATA_ERROR);

File diff suppressed because it is too large
+ 969 - 945
dev/science/specav.c


+ 3 - 3
dev/science/specfnu.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  *
@@ -6358,7 +6358,7 @@ int establish_arrays_for_pitchwork(dataptr dz)
 int specpitch(int inner_lpcnt,double *target, dataptr dz)
 {
     int exit_status;
-    int vc, pitchcc;
+    int vc, pitchcc=0;
     chvptr here, there, *partials;
     float minamp, newfrq;
     double loudest_partial_frq, nextloudest_partial_frq, lo_loud_partial, hi_loud_partial, thepitch;
@@ -6628,7 +6628,7 @@ int is_peak_at(double frq,int window_offset,float minamp,dataptr dz)
     int cc, vc, searchtop, searchbot;
     if(window_offset) {                             /* BAKTRAK ALONG BIGBUF, IF NESS */
         thisbuf = dz->flbufptr[0] - (window_offset * dz->wanted);
-        if((int)thisbuf < 0 || thisbuf < dz->bigfbuf || thisbuf >= dz->flbufptr[2])
+        if((int)(size_t)thisbuf < 0 || thisbuf < dz->bigfbuf || thisbuf >= dz->flbufptr[2])
             return(FALSE);
     } else
         thisbuf = dz->flbufptr[0];

Some files were not shown because too many files changed in this diff