diff options
| author | Tom Rondeau | 2011-10-25 18:31:50 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-25 18:31:50 -0400 |
| commit | a23f6624c6da8c850ed144916947a3dbff0db885 (patch) | |
| tree | 166d346651fcf106a9e23160a3cac116c8554e0f /gnuradio-core/src | |
| parent | ad47d75bc010608d94abce0ba809e012a0f4b7a4 (diff) | |
| parent | 76c7d75559762e833d8f6108717d711f364258a4 (diff) | |
| download | gnuradio-a23f6624c6da8c850ed144916947a3dbff0db885.tar.gz gnuradio-a23f6624c6da8c850ed144916947a3dbff0db885.tar.bz2 gnuradio-a23f6624c6da8c850ed144916947a3dbff0db885.zip | |
Merge remote branch 'jblum/master'
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_float_to_int.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gri_float_to_int.cc b/gnuradio-core/src/lib/general/gri_float_to_int.cc index 7f170a9d5..5271e60e2 100644 --- a/gnuradio-core/src/lib/general/gri_float_to_int.cc +++ b/gnuradio-core/src/lib/general/gri_float_to_int.cc @@ -37,7 +37,7 @@ void gri_float_to_int (const float *in, int *out, int nsamples) { for (int i = 0; i < nsamples; i++){ - int64_t r = static_cast<int64_t>(rint(in[i])); + int64_t r = llrintf(in[i]); if (r < MIN_INT) r = MIN_INT; else if (r > MAX_INT) |