projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.3.1' into try-3.3.1
[debian/gnuradio]
/
gnuradio-core
/
src
/
lib
/
general
/
gr_float_to_complex.cc
diff --git
a/gnuradio-core/src/lib/general/gr_float_to_complex.cc
b/gnuradio-core/src/lib/general/gr_float_to_complex.cc
index af878231a6a98617d928cdd8bdc2176e157fdde9..a392abd06e85118538f007891e2d29542a201a14 100644
(file)
--- a/
gnuradio-core/src/lib/general/gr_float_to_complex.cc
+++ b/
gnuradio-core/src/lib/general/gr_float_to_complex.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2004, 2009 Free Software Foundation, Inc.
+ * Copyright 2004, 2009
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-30,7
+30,7
@@
gr_float_to_complex_sptr
gr_make_float_to_complex (size_t vlen)
{
gr_float_to_complex_sptr
gr_make_float_to_complex (size_t vlen)
{
- return g
r_float_to_complex_sptr
(new gr_float_to_complex (vlen));
+ return g
nuradio::get_initial_sptr
(new gr_float_to_complex (vlen));
}
gr_float_to_complex::gr_float_to_complex (size_t vlen)
}
gr_float_to_complex::gr_float_to_complex (size_t vlen)
@@
-52,12
+52,12
@@
gr_float_to_complex::work (int noutput_items,
switch (input_items.size ()){
case 1:
switch (input_items.size ()){
case 1:
- for (
in
t j = 0; j < noutput_items*d_vlen; j++)
+ for (
size_
t j = 0; j < noutput_items*d_vlen; j++)
out[j] = gr_complex (r[j], 0);
break;
case 2:
out[j] = gr_complex (r[j], 0);
break;
case 2:
- for (
in
t j = 0; j < noutput_items*d_vlen; j++)
+ for (
size_
t j = 0; j < noutput_items*d_vlen; j++)
out[j] = gr_complex (r[j], i[j]);
break;
out[j] = gr_complex (r[j], i[j]);
break;