Build fixes for Boost >= 1.73

[dcpomatic.git] / src / tools / dcpomatic_batch.cc

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index e01ee911457de89f2e4808f23145b0b1e897e080..3517de9fef04650675663cf49132c25b710e8c2e 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -42,6 +42,7 @@
 #include <wx/wx.h>
 #include <boost/foreach.hpp>
 #include <iostream>
+#include <set>
 
 using std::exception;
 using std::string;
@@ -52,6 +53,9 @@ using boost::shared_ptr;
 using boost::thread;
 using boost::scoped_array;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static list<boost::filesystem::path> films_to_load;
 
@@ -196,8 +200,8 @@ public:
                                if (!confirm_dialog (
                                            this,
                                            wxString::Format(
-                                                   _("The DCPs for this film and the films already in the queue will take up about %1.f Gb.  The "
-                                                     "disks that you are using only have %.1f Gb available.  Do you want to add this film to the queue anyway?"),
+                                                   _("The DCPs for this film and the films already in the queue will take up about %.1f GB.  The "
+                                                     "disks that you are using only have %.1f GB available.  Do you want to add this film to the queue anyway?"),
                                                    total_required, available))) {
                                        return;
                                }
@@ -381,6 +385,8 @@ class App : public wxApp
 {
        bool OnInit ()
        {
+               wxInitAllImageHandlers ();
+
                SetAppName (_("DCP-o-matic Batch Converter"));
                is_batch_converter = true;