From 6f856af55898f94b45e3be28aa4f7c962de8a398 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 12 Feb 2019 00:17:33 +0000 Subject: [PATCH] Try to fix some warnings. --- src/lib/content.cc | 2 +- src/lib/dcp_content.cc | 15 +++++++-------- src/lib/util.cc | 2 +- src/wx/content_menu.cc | 6 +++--- src/wx/film_viewer.cc | 11 ++++++++--- wscript | 1 + 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/lib/content.cc b/src/lib/content.cc index b288580cb..ca76b01a6 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -205,7 +205,7 @@ Content::signal_change (ChangeType c, int p) } else { emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent)); } - } catch (boost::bad_weak_ptr) { + } catch (boost::bad_weak_ptr &) { /* This must be during construction; never mind */ } } diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 469021d96..4c4486a28 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -547,10 +547,10 @@ DCPContent::can_reference (shared_ptr film, function reel_list; try { reel_list = reels (film); - } catch (dcp::DCPReadError) { + } catch (dcp::DCPReadError &) { /* We couldn't read the DCP; it's probably missing */ return false; - } catch (dcp::KDMDecryptionError) { + } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; } @@ -625,13 +625,13 @@ DCPContent::can_reference_audio (shared_ptr film, string& why_not) c shared_ptr decoder; try { decoder.reset (new DCPDecoder (film, shared_from_this(), false)); - } catch (dcp::DCPReadError) { + } catch (dcp::DCPReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; - } catch (DCPError) { + } catch (DCPError &) { /* We couldn't read the DCP, so it's probably missing */ return false; - } catch (dcp::KDMDecryptionError) { + } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; } @@ -660,11 +660,10 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri shared_ptr decoder; try { decoder.reset (new DCPDecoder (film, shared_from_this(), false)); - } catch (dcp::DCPReadError) { - + } catch (dcp::DCPReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; - } catch (dcp::KDMDecryptionError) { + } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; } diff --git a/src/lib/util.cc b/src/lib/util.cc index 544045bcb..0b6f4be72 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -726,7 +726,7 @@ relaxed_string_to_float (string s) try { boost::algorithm::replace_all (s, ",", "."); return lexical_cast (s); - } catch (bad_lexical_cast) { + } catch (bad_lexical_cast &) { boost::algorithm::replace_all (s, ".", ","); return lexical_cast (s); } diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 19c54abcc..e5cadd794 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -142,11 +142,11 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList ); item->Check (dcp->cpl() && dcp->cpl() == i->id()); } - } catch (dcp::DCPReadError) { + } catch (dcp::DCPReadError &) { /* The DCP is probably missing */ - } catch (dcp::KDMDecryptionError) { + } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ - } catch (KDMError) { + } catch (KDMError &) { /* We have an incorrect KDM */ } } else { diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index cb9e0aa2e..fee5605da 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -143,7 +143,7 @@ FilmViewer::set_film (shared_ptr film) if (_dcp_decode_reduction) { _player->set_dcp_decode_reduction (_dcp_decode_reduction); } - } catch (bad_alloc) { + } catch (bad_alloc &) { error_dialog (_panel, _("There is not enough free memory to do that.")); _film.reset (); return; @@ -311,9 +311,9 @@ FilmViewer::timer () } bool +#ifdef DCPOMATIC_VARIANT_SWAROOP FilmViewer::maybe_draw_background_image (wxPaintDC& dc) { -#ifdef DCPOMATIC_VARIANT_SWAROOP optional bg = Config::instance()->player_background_image(); if (bg) { wxImage image (std_to_wx(bg->string())); @@ -321,10 +321,15 @@ FilmViewer::maybe_draw_background_image (wxPaintDC& dc) dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2)); return true; } -#endif return false; } +#else +FilmViewer::maybe_draw_background_image (wxPaintDC &) +{ + return false; +} +#endif void FilmViewer::paint_panel () diff --git a/wscript b/wscript index 6fd048110..0cb49a076 100644 --- a/wscript +++ b/wscript @@ -99,6 +99,7 @@ def configure(conf): # Remove auto_ptr warnings from libxml++-2.6 '-Wno-deprecated-declarations', '-Wno-ignored-qualifiers', + '-Wno-parantheses', '-D_FILE_OFFSET_BITS=64']) if conf.options.force_cpp11: -- 2.30.2