commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r9875 - gnuradio/trunk/gnuradio-core/src/lib/general


From: jcorgan
Subject: [Commit-gnuradio] r9875 - gnuradio/trunk/gnuradio-core/src/lib/general
Date: Mon, 27 Oct 2008 09:50:35 -0600 (MDT)

Author: jcorgan
Date: 2008-10-27 09:50:35 -0600 (Mon, 27 Oct 2008)
New Revision: 9875

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.h
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.h
Log:
Copyright cleanup and fix compiler warnings.

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.cc        
2008-10-27 08:45:43 UTC (rev 9874)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.cc        
2008-10-27 15:50:35 UTC (rev 9875)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -49,9 +49,9 @@
   d_igrid = (double *) malloc(d_inum * sizeof(double));
   d_iwork = (double *) malloc(d_inum * sizeof(double));
   d_ogrid = (double *) malloc(d_onum * sizeof(double));
-  for (int i = 0; i < d_inum; i++)
+  for (unsigned int i = 0; i < d_inum; i++)
     d_igrid[i] = igrid[i];
-  for (int i = 0; i < d_onum; i++)
+  for (unsigned int i = 0; i < d_onum; i++)
     d_ogrid[i] = ogrid[i];
 
   d_accel = gsl_interp_accel_alloc();
@@ -77,12 +77,12 @@
 
   for (int count = 0; count < noutput_items; count++) {
 
-    for (int i = 0; i < d_inum; i++)
+    for (unsigned int i = 0; i < d_inum; i++)
       d_iwork[i] = in[i];
 
     gsl_spline_init(d_spline, d_igrid, d_iwork, d_inum);
     
-    for (int i = 0; i < d_onum; i++)
+    for (unsigned int i = 0; i < d_onum; i++)
       out[i] = gsl_spline_eval(d_spline, d_ogrid[i], d_accel);
 
     in  += d_inum;

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.h 2008-10-27 
08:45:43 UTC (rev 9874)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_squash_ff.h 2008-10-27 
15:50:35 UTC (rev 9875)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.cc       
2008-10-27 08:45:43 UTC (rev 9874)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.cc       
2008-10-27 15:50:35 UTC (rev 9875)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -52,17 +52,17 @@
   for (int count = 0; count < noutput_items; count++) {
     float vmax = in[0] - d_lo;
 
-    for (int i = 1; i < d_vlen; i++) {
+    for (unsigned int i = 1; i < d_vlen; i++) {
       float vtmp = in[i] - d_lo;
       if (vtmp > vmax)
        vmax = vtmp;
     }
     
     if (vmax != 0.0)
-      for (int i = 0; i < d_vlen; i++)
+      for (unsigned int i = 0; i < d_vlen; i++)
        out[i] = d_lo * (1.0 - (in[i] - d_lo) / vmax);
     else
-      for (int i = 0; i < d_vlen; i++)
+      for (unsigned int i = 0; i < d_vlen; i++)
        out[i] = in[i];
 
     in  += d_vlen;

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.h        
2008-10-27 08:45:43 UTC (rev 9874)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_stretch_ff.h        
2008-10-27 15:50:35 UTC (rev 9875)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]