head 1.2; access; symbols pkgsrc-2015Q4:1.1.0.2 pkgsrc-2015Q4-base:1.1; locks; strict; comment @// @; 1.2 date 2016.03.15.14.40.03; author mef; state dead; branches; next 1.1; commitid asQRxloCbpSDrKYy; 1.1 date 2015.11.03.19.03.27; author joerg; state Exp; branches; next ; commitid DzTVv4V4Fh54bGHy; desc @@ 1.2 log @(pkgsrc) - Drop two patches, they are now included (but not exactly the same as our patches). (upstream) - Update 3.23.07 to 3.23.08 ------------------------- =Version 3.23.08= 2016-02-21 Rik van Riel bbbeed4: NAVTEX update 2016-02-16 David Freese 5b2edad: Save Logbook 1c8e0e9: Analysis mode 0f650e9: flrig PTT 106e3e2: flrig waiting 71fa224: COM port close dd1165a: fsq repeat last fb0fd4c: Mac Logger 2016-02-04 Jonathan Wakely 813b58a: GCC 6 build 2016-02-01 David Freese d808977: CALL capture bea9cfe: Scope View 8bcc9e8: RigCAT modifications @ text @$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(); } @ 1.1 log @More std::complex abuse. Deal with C++11's std::next. @ text @d1 1 a1 1 $NetBSD$ @