[Commit-gnuradio] r9885 - gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general

[brickle]

Author: brickle
Date: 2008-10-29 08:37:41 -0600 (Wed, 29 Oct 2008)
New Revision: 9885

Modified:
   
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.cc
   
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.h
   
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.cc
   
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.h
Log:
waveshape blocks now compile

Modified: 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.cc
===================================================================
--- 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.cc
  2008-10-29 02:08:26 UTC (rev 9884)
+++ 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.cc
  2008-10-29 14:37:41 UTC (rev 9885)
@@ -26,28 +26,29 @@
 
 #include <gr_waveshape_cc.h>
 #include <gr_io_signature.h>
+#include <stdexcept>
 
 gr_waveshape_cc_sptr
 gr_make_waveshape_cc(const std::vector<float> &waveshape_real,
                     const std::vector<float> &waveshape_imag)
 {
   return
-    gr_waveshape_cc_sptr(new gr_waveshape_cc(const std::vector<float> 
&waveshape_real,
-                                            const std::vector<float> 
&waveshape_imag));
+    gr_waveshape_cc_sptr(new gr_waveshape_cc(waveshape_real,
+                                            waveshape_imag));
 }
 
 gr_waveshape_cc::gr_waveshape_cc(const std::vector<float> &waveshape_real,
                                 const std::vector<float> &waveshape_imag)
   : gr_sync_block("waveshape_cc",
-                 gr_make_io_signature(1, 1, sizeof(complex)),
-                 gr_make_io_signature(1, 1, sizeof(complex)))
+                 gr_make_io_signature(1, 1, sizeof(gr_complex)),
+                 gr_make_io_signature(1, 1, sizeof(gr_complex)))
 {
   d_size_real = waveshape_real.size();
   if (!(d_size_real & 01))
     throw std::out_of_range("waveshape: (real) table must have odd length");
   d_half_real = d_size_real / 2;
   d_wshp_real = (float *) malloc((d_size_real + 1) * sizeof(float));
-  for (int i = 0; i < d_size_real; i++)
+  for (unsigned int i = 0; i < d_size_real; i++)
     d_wshp_real[i] = waveshape_real[i];
   d_wshp_real[d_size_real] = d_wshp_real[d_size_real - 1];
 
@@ -56,7 +57,7 @@
     throw std::out_of_range("waveshape: (imag) table must have odd length");
   d_half_imag = d_size_imag / 2;
   d_wshp_imag = (float *) malloc((d_size_imag + 1) * sizeof(float));
-  for (int i = 0; i < d_size_imag; i++)
+  for (unsigned int i = 0; i < d_size_imag; i++)
     d_wshp_imag[i] = waveshape_imag[i];
   d_wshp_imag[d_size_imag] = d_wshp_imag[d_size_imag - 1];
 }
@@ -72,8 +73,8 @@
                      gr_vector_const_void_star &input_items,
                      gr_vector_void_star &output_items)
 {
-  const float *in  = (const complex *) input_items[0];
-  float       *out = (complex *)       output_items[0];
+  const gr_complex *in  = (const gr_complex *) input_items[0];
+  gr_complex       *out = (gr_complex *)       output_items[0];
 
   for (int i = 0; i < noutput_items; i++) {
     int j;
@@ -97,7 +98,7 @@
     d = xn - j,
     yi = d_wshp_imag[j] + d * (d_wshp_imag[j + 1] - d_wshp_imag[j]);
     
-    out[i] = complex(yr, yi);
+    out[i] = gr_complex(yr, yi);
   }
 
   return noutput_items;

Modified: 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.h
===================================================================
--- 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.h
   2008-10-29 02:08:26 UTC (rev 9884)
+++ 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.h
   2008-10-29 14:37:41 UTC (rev 9885)
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef        INCLUDED_GR_WAVESHAPE_FF_H_
-#define        INCLUDED_GR_WAVESHAPE_FF_H_
+#ifndef        INCLUDED_GR_WAVESHAPE_CC_H_
+#define        INCLUDED_GR_WAVESHAPE_CC_H_
 
 #include <gr_sync_block.h>
 #include <gr_complex.h>
@@ -35,16 +35,16 @@
  * \ingroup misc
  */
 
-class gr_waveshape_ff;
-typedef boost::shared_ptr<gr_waveshape_ff> gr_waveshape_ff_sptr;
+class gr_waveshape_cc;
+typedef boost::shared_ptr<gr_waveshape_cc> gr_waveshape_cc_sptr;
 
-gr_waveshape_ff_sptr gr_make_waveshape_ff(const std::vector<float> 
&waveshape_real,
+gr_waveshape_cc_sptr gr_make_waveshape_cc(const std::vector<float> 
&waveshape_real,
                                          const std::vector<float> 
&waveshape_imag);
 
-class gr_waveshape_ff : public gr_sync_block
+class gr_waveshape_cc : public gr_sync_block
 {
-  friend gr_waveshape_ff_sptr
-    gr_make_waveshape_ff(const std::vector<float> &waveshape_real,
+  friend gr_waveshape_cc_sptr
+    gr_make_waveshape_cc(const std::vector<float> &waveshape_real,
                         const std::vector<float> &waveshape_imag);
 
   float         *d_wshp_real;
@@ -55,10 +55,12 @@
   size_t  d_size_imag;
   size_t  d_half_imag;
 
-  gr_waveshape_ff(const std::vector<float> &waveshape_real,
+  gr_waveshape_cc(const std::vector<float> &waveshape_real,
                  const std::vector<float> &waveshape_imag);
 
  public:
+  ~gr_waveshape_cc();
+
   int work(int noutput_items,
           gr_vector_const_void_star &input_items,
           gr_vector_void_star &output_items);

Modified: 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.cc
===================================================================
--- 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.cc
  2008-10-29 02:08:26 UTC (rev 9884)
+++ 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.cc
  2008-10-29 14:37:41 UTC (rev 9885)
@@ -26,12 +26,13 @@
 
 #include <gr_waveshape_ff.h>
 #include <gr_io_signature.h>
+#include <stdexcept>
 
 gr_waveshape_ff_sptr
 gr_make_waveshape_ff(const std::vector<float> &waveshape)
 {
   return
-    gr_waveshape_ff_sptr(new gr_waveshape_ff(const std::vector<float> 
&waveshape));
+    gr_waveshape_ff_sptr(new gr_waveshape_ff(waveshape));
 }
 
 gr_waveshape_ff::gr_waveshape_ff(const std::vector<float> &waveshape)
@@ -44,7 +45,7 @@
     throw std::out_of_range("waveshape: table must have odd length");
   d_half = d_size / 2;
   d_wshp = (float *) malloc((d_size + 1) * sizeof(float));
-  for (int i = 0; i < d_size; i++)
+  for (unsigned int i = 0; i < d_size; i++)
     d_wshp[i] = waveshape[i];
   d_wshp[d_size] = d_wshp[d_size - 1];
 }

Modified: 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.h
===================================================================
--- 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.h
   2008-10-29 02:08:26 UTC (rev 9884)
+++ 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_ff.h
   2008-10-29 14:37:41 UTC (rev 9885)
@@ -49,6 +49,8 @@
   gr_waveshape_ff(const std::vector<float> &waveshape);
 
  public:
+  ~gr_waveshape_ff();
+
   int work(int noutput_items,
           gr_vector_const_void_star &input_items,
           gr_vector_void_star &output_items);