diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:16:50 -0600 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:19:29 -0600 |
| commit | f7cdfff6a85ce52b1d7c0b5131645fcb77405fe8 (patch) | |
| tree | 908af9bf8d1c512e22116cb3afbc89eb5883cc93 /gr-dtv/lib/dvbt/dvbt_demap_impl.cc | |
| parent | a867a290194228d09ba93f0f46e3a4e4523f5396 (diff) | |
| parent | af4323d1e471476efa255e3df745397f7c8a1b71 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-dtv/lib/dvbt/dvbt_demap_impl.cc')
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_demap_impl.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc index 4bdec1dc96..65d659226c 100644 --- a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2015 Free Software Foundation, Inc. + * Copyright 2015,2016 Free Software Foundation, Inc. * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ #include <gnuradio/io_signature.h> #include "dvbt_demap_impl.h" #include <volk/volk.h> -#include <stdio.h> namespace gr { namespace dtv { @@ -62,15 +61,15 @@ namespace gr { d_constellation_points = (gr_complex*) volk_malloc(sizeof(gr_complex) * d_constellation_size, volk_get_alignment()); if (d_constellation_points == NULL) { - std::cout << "cannot allocate memory for d_constellation_points" << std::endl; - exit(1); + GR_LOG_FATAL(d_logger, "DVB-T Demap, cannot allocate memory for d_constellation_points."); + throw std::bad_alloc(); } d_sq_dist = (float*) volk_malloc(sizeof(float) * d_constellation_size, volk_get_alignment()); if (d_sq_dist == NULL) { - std::cout << "cannot allocate memory for d_sq_dist" << std::endl; + GR_LOG_FATAL(d_logger, "DVB-T Demap, cannot allocate memory for d_sq_dist."); volk_free(d_constellation_points); - exit(1); + throw std::bad_alloc(); } make_constellation_points(d_constellation_size, d_step, d_alpha); |