Try to fix some warnings.
authorCarl Hetherington <cth@carlh.net>
Tue, 12 Feb 2019 00:17:33 +0000 (00:17 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 12 Feb 2019 00:17:33 +0000 (00:17 +0000)
src/lib/content.cc
src/lib/dcp_content.cc
src/lib/util.cc
src/wx/content_menu.cc
src/wx/film_viewer.cc
wscript

index b288580..ca76b01 100644 (file)
@@ -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 */
        }
 }
index 469021d..4c4486a 100644 (file)
@@ -547,10 +547,10 @@ DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
        list<DCPTimePeriod> 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<const Film> film, string& why_not) c
        shared_ptr<DCPDecoder> 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<const Film> film, TextType type, stri
        shared_ptr<DCPDecoder> 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;
        }
index 544045b..0b6f4be 100644 (file)
@@ -726,7 +726,7 @@ relaxed_string_to_float (string s)
        try {
                boost::algorithm::replace_all (s, ",", ".");
                return lexical_cast<float> (s);
-       } catch (bad_lexical_cast) {
+       } catch (bad_lexical_cast &) {
                boost::algorithm::replace_all (s, ".", ",");
                return lexical_cast<float> (s);
        }
index 19c54ab..e5cadd7 100644 (file)
@@ -142,11 +142,11 @@ ContentMenu::popup (weak_ptr<Film> 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 {
index cb9e0aa..fee5605 100644 (file)
@@ -143,7 +143,7 @@ FilmViewer::set_film (shared_ptr<Film> 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<boost::filesystem::path> 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 6fd0481..0cb49a0 100644 (file)
--- 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: