summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan2008-10-27 15:50:35 +0000
committerjcorgan2008-10-27 15:50:35 +0000
commitefe21ebe5e1c6dc9e70f9e1b25a3cdc8692b0877 (patch)
tree4dd1d5f1f5531f4d353a700a9ce7af356d6f3831
parentc1182121a9c1ead0522ccd3012f4d4c2a885a84e (diff)
downloadgnuradio-efe21ebe5e1c6dc9e70f9e1b25a3cdc8692b0877.tar.gz
gnuradio-efe21ebe5e1c6dc9e70f9e1b25a3cdc8692b0877.tar.bz2
gnuradio-efe21ebe5e1c6dc9e70f9e1b25a3cdc8692b0877.zip
Copyright cleanup and fix compiler warnings.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9875 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--gnuradio-core/src/lib/general/gr_squash_ff.cc10
-rw-r--r--gnuradio-core/src/lib/general/gr_squash_ff.h2
-rw-r--r--gnuradio-core/src/lib/general/gr_stretch_ff.cc8
-rw-r--r--gnuradio-core/src/lib/general/gr_stretch_ff.h2
4 files changed, 11 insertions, 11 deletions
diff --git a/gnuradio-core/src/lib/general/gr_squash_ff.cc b/gnuradio-core/src/lib/general/gr_squash_ff.cc
index 977376bc5..05ad4a7eb 100644
--- a/gnuradio-core/src/lib/general/gr_squash_ff.cc
+++ b/gnuradio-core/src/lib/general/gr_squash_ff.cc
@@ -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 @@ gr_squash_ff::gr_squash_ff(const std::vector<float> &igrid,
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 @@ gr_squash_ff::work(int noutput_items,
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;
diff --git a/gnuradio-core/src/lib/general/gr_squash_ff.h b/gnuradio-core/src/lib/general/gr_squash_ff.h
index 43880857e..ee3426cae 100644
--- a/gnuradio-core/src/lib/general/gr_squash_ff.h
+++ b/gnuradio-core/src/lib/general/gr_squash_ff.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
diff --git a/gnuradio-core/src/lib/general/gr_stretch_ff.cc b/gnuradio-core/src/lib/general/gr_stretch_ff.cc
index 0913d5277..f1822dcb8 100644
--- a/gnuradio-core/src/lib/general/gr_stretch_ff.cc
+++ b/gnuradio-core/src/lib/general/gr_stretch_ff.cc
@@ -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 @@ gr_stretch_ff::work(int noutput_items,
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;
diff --git a/gnuradio-core/src/lib/general/gr_stretch_ff.h b/gnuradio-core/src/lib/general/gr_stretch_ff.h
index d2164f8f4..be828f583 100644
--- a/gnuradio-core/src/lib/general/gr_stretch_ff.h
+++ b/gnuradio-core/src/lib/general/gr_stretch_ff.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*