Still more licence fixups.

[libdcp.git] / tools / dcpdumpsub.cc

diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc
index 06802320e89d928def23168f5db7f6c3a4c7d488..6cb641e4e0cb97036d075cae2ad199de4d7c8962 100644 (file)
--- a/tools/dcpdumpsub.cc
+++ b/tools/dcpdumpsub.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "smpte_subtitle_asset.h"
@@ -41,7 +41,7 @@ int
 main (int argc, char* argv[])
 {
        bool extract_fonts = true;
-       
+
        int option_index = 0;
        while (1) {
                static struct option long_options[] = {
@@ -76,14 +76,14 @@ main (int argc, char* argv[])
        cout << sub.xml_as_string() << "\n";
 
        if (extract_fonts) {
-               map<string, dcp::Data> fonts = sub.fonts ();
+               map<string, dcp::Data> fonts = sub.fonts_with_load_ids ();
                for (map<string, dcp::Data>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
                        FILE* f = dcp::fopen_boost (i->first + ".ttf", "wb");
                        if (!f) {
                                cerr << "Could not open font file " << i->first << ".ttf for writing";
                                exit (EXIT_FAILURE);
                        }
-                       fwrite (i->second.data.get(), 1, i->second.size, f);
+                       fwrite (i->second.data().get(), 1, i->second.size(), f);
                        fclose (f);
                }
        }