diff options
Diffstat (limited to 'ham')
| -rw-r--r-- | ham/fldigi/distinfo | 5 | ||||
| -rw-r--r-- | ham/fldigi/patches/patch-src_fsq_fsq.cxx | 39 | ||||
| -rw-r--r-- | ham/fldigi/patches/patch-src_ifkp_ifkp.cxx | 21 |
3 files changed, 59 insertions, 6 deletions
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index 30a82e3c299..1f7e33db380 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.32 2015/11/02 23:57:23 agc Exp $ +$NetBSD: distinfo,v 1.33 2015/11/03 19:03:27 joerg Exp $ SHA1 (fldigi-3.23.04.tar.gz) = 6f34c107c4dd86bc3291a24a74693dfc7a3e86e0 RMD160 (fldigi-3.23.04.tar.gz) = 89e6ce57379015289d06b0f70a9189002996f3f1 SHA512 (fldigi-3.23.04.tar.gz) = af332e0da86300e5a18adec8841dabad3ceaea8cf0352b49a88a3387bf53422b4d19e73894352eb0f454f47f6612f37a5476f32dd25ddc49a80f287e345aeb3b Size (fldigi-3.23.04.tar.gz) = 2959610 bytes SHA1 (patch-src_dominoex_dominoex.cxx) = 4c9a36896ee18562c2dee044f61301abde4f9a30 -SHA1 (patch-src_fsq_fsq.cxx) = 08dd9f2bc8d46dd5740e90944fe30cf2cc7e23b6 +SHA1 (patch-src_fsq_fsq.cxx) = 1356667cd19baa746014916bd7536c246bac91db +SHA1 (patch-src_ifkp_ifkp.cxx) = 22ce623ca24491a6ea9efb063851b1f04b7a7317 SHA1 (patch-src_include_qrunner.h) = c395684f676bcd06e0d0f8a95a9c22dc92667879 SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c diff --git a/ham/fldigi/patches/patch-src_fsq_fsq.cxx b/ham/fldigi/patches/patch-src_fsq_fsq.cxx index e49179b2d6b..54c40a252ce 100644 --- a/ham/fldigi/patches/patch-src_fsq_fsq.cxx +++ b/ham/fldigi/patches/patch-src_fsq_fsq.cxx @@ -1,11 +1,11 @@ -$NetBSD: patch-src_fsq_fsq.cxx,v 1.2 2015/10/11 03:59:56 mef Exp $ +$NetBSD: patch-src_fsq_fsq.cxx,v 1.3 2015/11/03 19:03:27 joerg Exp $ -date: 2015-08-11 04:26:43 +0900; author: joerg; state: Exp; commitid: PzvH77JwGWkn2Lwy; +Resolve conflict between std::next and the local variable of the same name. std::complex::imag() and std::complex::real() are not lvalues. ---- src/fsq/fsq.cxx.orig 2015-07-21 14:54:32.000000000 +0000 +--- src/fsq/fsq.cxx.orig 2015-09-28 18:24:41.000000000 +0000 +++ src/fsq/fsq.cxx -@@ -1197,9 +1197,12 @@ int fsq::rx_process(const double *buf, i +@@ -1193,9 +1193,12 @@ int fsq::rx_process(const double *buf, i &rx_stream[SHIFT_SIZE], // from BLOCK_SIZE*sizeof(*rx_stream)); // # bytes memset(fft_data, 0, sizeof(fft_data)); @@ -21,3 +21,34 @@ std::complex::imag() and std::complex::real() are not lvalues. fft->ComplexFFT(fft_data); process_tones(); } +@@ -1423,7 +1426,7 @@ static string tx_text_queue = ""; + + static vector<string> commands; + #define NUMCOMMANDS 10 +-static size_t next = 0; ++static size_t nextidx = 0; + + double fsq_xmtdelay() // in seconds + { +@@ -1440,9 +1443,9 @@ double fsq_xmtdelay() // in seconds + void fsq_repeat_last_command() + { + fsq_tx_text->clear(); +- fsq_tx_text->addstr(sz2utf8(commands[next].c_str())); +- next++; +- if (next == commands.size()) next = 0; ++ fsq_tx_text->addstr(sz2utf8(commands[nextidx].c_str())); ++ nextidx++; ++ if (nextidx == commands.size()) nextidx = 0; + } + + int get_fsq_tx_char(void) +@@ -1484,7 +1487,7 @@ void try_transmit(void *) + if (active_modem != fsq_modem) return; + + if (!active_modem->fsq_squelch_open() && trx_state == STATE_RX) { +- next = 0; ++ nextidx = 0; + fsq_que_clear(); + //LOG_WARN("%s", "start_tx()"); + start_tx(); diff --git a/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx b/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx new file mode 100644 index 00000000000..87693bd8f1f --- /dev/null +++ b/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx @@ -0,0 +1,21 @@ +$NetBSD: patch-src_ifkp_ifkp.cxx,v 1.1 2015/11/03 19:03:27 joerg Exp $ + +std::complex::imag() and std::complex::real() are not lvalues. + +--- src/ifkp/ifkp.cxx.orig 2015-10-25 14:22:27.000000000 +0000 ++++ src/ifkp/ifkp.cxx +@@ -580,9 +580,11 @@ int ifkp::rx_process(const double *buf, + &rx_stream[IFKP_SHIFT_SIZE], // from + IFKP_BLOCK_SIZE*sizeof(*rx_stream)); // # bytes + memset(fft_data, 0, sizeof(fft_data)); +- for (int i = 0; i < IFKP_BLOCK_SIZE; i++) +- fft_data[i].real() = fft_data[i].imag() = +- rx_stream[i] * a_blackman[i]; ++ for (int i = 0; i < IFKP_BLOCK_SIZE; i++) { ++ double r = rx_stream[i] * a_blackman[i]; ++ fft_data[i].real(r); ++ fft_data[i].imag(r); ++ } + fft->ComplexFFT(fft_data); + process_tones(); + } |