1 files changed, 59 insertions, 60 deletions
diff --git a/gr-wavelet/lib/squash_ff_impl.cc b/gr-wavelet/lib/squash_ff_impl.cc
index 26439edbb5..266bb0833d 100644
--- a/gr-wavelet/lib/squash_ff_impl.cc
+++ b/gr-wavelet/lib/squash_ff_impl.cc
@@ -32,67 +32,66 @@
 // produce output vector of ogrid.size y-values
 
 namespace gr {
-  namespace wavelet {
-
-    squash_ff::sptr squash_ff::make(const std::vector<float> &igrid,
-				    const std::vector<float> &ogrid)
-    {
-      return gnuradio::get_initial_sptr(new squash_ff_impl(igrid, ogrid));
-    }
-
-    squash_ff_impl::squash_ff_impl(const std::vector<float> &igrid,
-				   const std::vector<float> &ogrid)
-      : sync_block("squash_ff",
-		      io_signature::make(1, 1, sizeof(float) * igrid.size()),
-		      io_signature::make(1, 1, sizeof(float) * ogrid.size()))
-    {
-      d_inum  = igrid.size();
-      d_onum  = ogrid.size();
-      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 (unsigned int i = 0; i < d_inum; i++)
-	d_igrid[i] = igrid[i];
-      for (unsigned int i = 0; i < d_onum; i++)
-	d_ogrid[i] = ogrid[i];
-
-      d_accel = gsl_interp_accel_alloc();
-      d_spline = gsl_spline_alloc(gsl_interp_cspline, d_inum);	// FIXME check w/ Frank
+namespace wavelet {
+
+squash_ff::sptr squash_ff::make(const std::vector<float>& igrid,
+                                const std::vector<float>& ogrid)
+{
+    return gnuradio::get_initial_sptr(new squash_ff_impl(igrid, ogrid));
+}
+
+squash_ff_impl::squash_ff_impl(const std::vector<float>& igrid,
+                               const std::vector<float>& ogrid)
+    : sync_block("squash_ff",
+                 io_signature::make(1, 1, sizeof(float) * igrid.size()),
+                 io_signature::make(1, 1, sizeof(float) * ogrid.size()))
+{
+    d_inum = igrid.size();
+    d_onum = ogrid.size();
+    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 (unsigned int i = 0; i < d_inum; i++)
+        d_igrid[i] = igrid[i];
+    for (unsigned int i = 0; i < d_onum; i++)
+        d_ogrid[i] = ogrid[i];
+
+    d_accel = gsl_interp_accel_alloc();
+    d_spline = gsl_spline_alloc(gsl_interp_cspline, d_inum); // FIXME check w/ Frank
+}
+
+squash_ff_impl::~squash_ff_impl()
+{
+    free((char*)d_igrid);
+    free((char*)d_iwork);
+    free((char*)d_ogrid);
+    gsl_interp_accel_free(d_accel);
+    gsl_spline_free(d_spline);
+}
+
+int squash_ff_impl::work(int noutput_items,
+                         gr_vector_const_void_star& input_items,
+                         gr_vector_void_star& output_items)
+{
+    const float* in = (const float*)input_items[0];
+    float* out = (float*)output_items[0];
+
+    for (int count = 0; count < noutput_items; count++) {
+
+        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 (unsigned int i = 0; i < d_onum; i++)
+            out[i] = gsl_spline_eval(d_spline, d_ogrid[i], d_accel);
+
+        in += d_inum;
+        out += d_onum;
     }
 
-    squash_ff_impl::~squash_ff_impl()
-    {
-      free((char *) d_igrid);
-      free((char *) d_iwork);
-      free((char *) d_ogrid);
-      gsl_interp_accel_free(d_accel);
-      gsl_spline_free(d_spline);
-    }
-
-    int
-    squash_ff_impl::work(int noutput_items,
-			 gr_vector_const_void_star &input_items,
-			 gr_vector_void_star &output_items)
-    {
-      const float *in  = (const float *) input_items[0];
-      float       *out = (float *) output_items[0];
-
-      for (int count = 0; count < noutput_items; count++) {
-
-	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 (unsigned int i = 0; i < d_onum; i++)
-	  out[i] = gsl_spline_eval(d_spline, d_ogrid[i], d_accel);
-
-	in  += d_inum;
-	out += d_onum;
-      }
-
-      return noutput_items;
-    }
+    return noutput_items;
+}
 
-  } /* namespace wavelet */
+} /* namespace wavelet */
 } /* namespace gr */