projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
394c834
)
Try to fix some warnings.
author
Carl Hetherington
<cth@carlh.net>
Tue, 12 Feb 2019 00:17:33 +0000
(
00:17
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 12 Feb 2019 00:17:33 +0000
(
00:17
+0000)
src/lib/content.cc
patch
|
blob
|
history
src/lib/dcp_content.cc
patch
|
blob
|
history
src/lib/util.cc
patch
|
blob
|
history
src/wx/content_menu.cc
patch
|
blob
|
history
src/wx/film_viewer.cc
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/src/lib/content.cc
b/src/lib/content.cc
index b288580cb11d94f461f66c600a00c99c21ba62ae..ca76b01a6c8ad627f851fa7503c2eb9e18eaaa85 100644
(file)
--- 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));
}
} 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 */
}
}
/* This must be during construction; never mind */
}
}
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index 469021d96ee4a641b7ede8f4f4eed066ea821f44..4c4486a281e77c0be0656fa93cc2c5da80e32dd4 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-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);
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;
/* 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;
}
/* 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));
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;
/* 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;
/* 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;
}
/* 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));
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;
/* 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;
}
/* We have an incorrect KDM */
return false;
}
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index 544045bcb555e528156d01954ee1b7cad7b19b1f..0b6f4be72b63c7ce1edbbc30fc06f5f33b19b5c0 100644
(file)
--- 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<float> (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);
}
boost::algorithm::replace_all (s, ".", ",");
return lexical_cast<float> (s);
}
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index 19c54abcc33529375563d6c452df17fdc5670f41..e5cadd7942870f90512d57f2320fc1cd2f2e7a88 100644
(file)
--- a/
src/wx/content_menu.cc
+++ b/
src/wx/content_menu.cc
@@
-142,11
+142,11
@@
ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
);
item->Check (dcp->cpl() && dcp->cpl() == i->id());
}
);
item->Check (dcp->cpl() && dcp->cpl() == i->id());
}
- } catch (dcp::DCPReadError) {
+ } catch (dcp::DCPReadError
&
) {
/* The DCP is probably missing */
/* The DCP is probably missing */
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError
&
) {
/* We have an incorrect KDM */
/* We have an incorrect KDM */
- } catch (KDMError) {
+ } catch (KDMError
&
) {
/* We have an incorrect KDM */
}
} else {
/* We have an incorrect KDM */
}
} else {
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index cb9e0aa2e85b3d9101d749360284269b3cd1e775..fee5605da9c3352193610325752a68dbe0ca03ba 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-143,7
+143,7
@@
FilmViewer::set_film (shared_ptr<Film> film)
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
}
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;
error_dialog (_panel, _("There is not enough free memory to do that."));
_film.reset ();
return;
@@
-311,9
+311,9
@@
FilmViewer::timer ()
}
bool
}
bool
+#ifdef DCPOMATIC_VARIANT_SWAROOP
FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
{
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()));
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;
}
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;
}
return false;
}
+#else
+FilmViewer::maybe_draw_background_image (wxPaintDC &)
+{
+ return false;
+}
+#endif
void
FilmViewer::paint_panel ()
void
FilmViewer::paint_panel ()
diff --git
a/wscript
b/wscript
index 6fd048110c76ba1c6fcaf52ab3204bfd17034892..0cb49a076dee54f2c8b7b173b35ac3751fec32dd 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',
# 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:
'-D_FILE_OFFSET_BITS=64'])
if conf.options.force_cpp11: