3 files changed, 8 insertions, 4 deletions
diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc
index da79f2caa..8b34d9e6b 100644
--- a/gr-digital/lib/digital_constellation.cc
+++ b/gr-digital/lib/digital_constellation.cc
@@ -77,6 +77,10 @@ digital_constellation::digital_constellation () :
   calc_arity();
 }
 
+digital_constellation::~digital_constellation()
+{
+}
+
 //! Returns the constellation points for a symbol value
 void
 digital_constellation::map_to_points(unsigned int value, gr_complex *points)
diff --git a/gr-digital/lib/digital_impl_mpsk_snr_est.cc b/gr-digital/lib/digital_impl_mpsk_snr_est.cc
index 38177083f..b2ad0369f 100644
--- a/gr-digital/lib/digital_impl_mpsk_snr_est.cc
+++ b/gr-digital/lib/digital_impl_mpsk_snr_est.cc
@@ -236,9 +236,9 @@ digital_impl_mpsk_snr_est_svr::update(
 		 int noutput_items,
 		 const gr_complex *in)
 {
-  for (int i = 0; i < noutput_items; i++){
-    double x = abs(in[i]);
-      double x1 = abs(in[i-1]);
+  for(int i = 0; i < noutput_items; i++) {
+    double x = abs(in[i+1]);
+    double x1 = abs(in[i]);
     double y1 = (x*x)*(x1*x1);
     d_y1 = d_alpha*y1 + d_beta*d_y1;
     
diff --git a/gr-digital/lib/digital_mpsk_snr_est_cc.cc b/gr-digital/lib/digital_mpsk_snr_est_cc.cc
index b5a60f0d3..38a452ac2 100644
--- a/gr-digital/lib/digital_mpsk_snr_est_cc.cc
+++ b/gr-digital/lib/digital_mpsk_snr_est_cc.cc
@@ -82,7 +82,7 @@ digital_mpsk_snr_est_cc::work(int noutput_items,
   // Update, calculate, and issue an SNR tag every d_nsamples
   int index = 0, x = 0;
   int64_t nwritten = nitems_written(0);
-  while(index + (d_nsamples-d_count) <= noutput_items) {
+  while(index + (d_nsamples-d_count) < noutput_items) {
     x = d_nsamples - d_count;
     nwritten += x;