diff --git a/ChangeLog b/ChangeLog index f7a4bba8..7d211874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Change Log: 2) Added mousewheel over Macro buttons to move between macro button sets. 3) Fixed bug in Olivia signal level display. +2.10.3) + 1) Corrected memory leak bug. 2.10.2 1) Bug fix for QRZ CDROM access 2.10.1 diff --git a/configure.ac b/configure.ac index a6c3048b..bd998857 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may dnl contain other characters or be empty m4_define(FLDIGI_MAJOR, [2]) m4_define(FLDIGI_MINOR, [11]) -m4_define(FLDIGI_PATCH, [F]) +m4_define(FLDIGI_PATCH, [G]) AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com]) diff --git a/src/psk/pskeval.cxx b/src/psk/pskeval.cxx index 311a5e82..bcfb78bd 100644 --- a/src/psk/pskeval.cxx +++ b/src/psk/pskeval.cxx @@ -40,7 +40,6 @@ pskeval::pskeval() { pskeval::~pskeval() { } -//static int evalcount = 1; void pskeval::sigdensity() { double sig = 0.0; @@ -58,7 +57,6 @@ void pskeval::sigdensity() { val = wf->Pwr(i); if (i >= fstart) { sigpwr[i - ihbw - 1] = (1-alpha)*sigpwr[i - ihbw - 1] + alpha * sig; -// sigpwr[i - ihbw - 1] = sig; sig -= vals[j]; } vals[j] = val; @@ -67,11 +65,7 @@ void pskeval::sigdensity() { } sigavg /= (FFT_LEN - FLOWER); if (sigavg == 0) sigavg = 1e-20; -// if (evalcount++ < 100) { -// for (int i = FLOWER; i < IMAGE_WIDTH; i++) -// std::cout << i << "," << sigpwr[i] / sigavg << std::endl; -// std::cout.flush(); -// } + delete [] vals; } double pskeval::sigpeak(int &f, int f1, int f2) diff --git a/src/rigcontrol/rigio.cxx b/src/rigcontrol/rigio.cxx index 95b16d59..e209bd57 100644 --- a/src/rigcontrol/rigio.cxx +++ b/src/rigcontrol/rigio.cxx @@ -80,7 +80,7 @@ bool hexout( string s, int retnbr) // reset the readpending & return false if a timeout occurs // debug code -//std::cout << printtime() << "Cmd: "; printhex(s); +std::cout << printtime() << "Cmd: "; printhex(s); readtimeout = (rig.wait +rig.timeout) * rig.retries + 2000; // 2 second min timeout while (readpending && readtimeout--) @@ -114,14 +114,14 @@ bool hexout( string s, int retnbr) if (retnbr > 0) { num = rigio.ReadBuffer (replybuff, retnbr > 200 ? 200 : retnbr); // debug code -/* + if (num) { std::cout << printtime() << "Rsp (" << n << "): "; printhex(replybuff, num); } else std::cout << printtime() << "Rsp (" << n << "): no reply" << std::endl; std::cout.flush(); -*/ +// to here } if (retnbr == 0 || num == retnbr) {