Make size_in_pixels() more accurate.

[libdcp.git] / test / rewrite_subs.cc

diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index ba27d1902a39a8c6011dff4988e4faf4dc1c46ae..0a6f4c6cc171e64e676665ede800dd7966d3d6ec 100644 (file)
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include <iostream>
@@ -29,13 +43,15 @@ using std::cout;
 using std::cerr;
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
 /** Load a DCP then re-write its subtitle XML or MXF in-place */
 int
 main (int argc, char* argv[])
 {
+       dcp::init ();
+
        try {
                if (argc < 2) {
                        cerr << "Syntax: " << argv[0] << " <dcp>\n";
@@ -43,16 +59,12 @@ main (int argc, char* argv[])
                }
 
                DCP* dcp = new DCP (argv[1]);
-               dcp->read (true);
-
-               list<shared_ptr<CPL> > cpls = dcp->cpls ();
-               for (list<boost::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
-
-                       list<shared_ptr<Reel> > reels = (*i)->reels ();
-                       for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
+               dcp->read ();
 
-                               if ((*j)->main_subtitle()) {
-                                       (*j)->main_subtitle()->asset()->write ((*j)->main_subtitle()->asset()->file ());
+               for (auto i: dcp->cpls()) {
+                       for (auto j: i->reels()) {
+                               if (j->main_subtitle()) {
+                                       j->main_subtitle()->asset()->write(j->main_subtitle()->asset()->file().get());
                                }
                        }
                }
@@ -63,7 +75,7 @@ main (int argc, char* argv[])
                cerr << e.what() << " (" << e.filename() << ") when reading " << argv[1] << "\n";
                exit (EXIT_FAILURE);
        }
-       catch (DCPReadError& e)
+       catch (ReadError& e)
        {
                cerr << e.what() << " when reading " << argv[1] << "\n";
                exit (EXIT_FAILURE);