diff options
| author | Tom Rondeau | 2012-03-18 20:05:04 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-03-18 20:05:04 -0400 |
| commit | bbddd082607a8632322d7774ae8ad54e7e84f6de (patch) | |
| tree | 3a0e25c2a78ea1668cf4bd0c948df6489945907f /gnuradio-core/src/lib | |
| parent | c138b94fbd3d9e7931e643b1bcbac56e80e8d4ae (diff) | |
| parent | 7fda6b2c2269a575fd6722085c9c9ace41c1c512 (diff) | |
| download | gnuradio-bbddd082607a8632322d7774ae8ad54e7e84f6de.tar.gz gnuradio-bbddd082607a8632322d7774ae8ad54e7e84f6de.tar.bz2 gnuradio-bbddd082607a8632322d7774ae8ad54e7e84f6de.zip | |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fxpt.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gr_fxpt.h b/gnuradio-core/src/lib/general/gr_fxpt.h index 5cf736dfb..9f5937d1a 100644 --- a/gnuradio-core/src/lib/general/gr_fxpt.h +++ b/gnuradio-core/src/lib/general/gr_fxpt.h @@ -26,7 +26,7 @@ #include <gr_types.h> /*! - * \brief fixed point sine and cosine and friend GR_CORE_APIs. + * \brief fixed point sine and cosine and friends. * \ingroup misc * * fixed pt radians @@ -48,6 +48,10 @@ public: static gr_int32 float_to_fixed (float x) { + // Fold x into -PI to PI. + int d = (int)floor(x/2/PI+0.5); + x -= d*2*PI; + // And convert to an integer. return (gr_int32) ((float) x * TWO_TO_THE_31 / PI); } |