summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-10 10:55:22 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-10 10:55:22 +0100
commit8771c1f7b00ab0fb5c252adaa437d753155b7c18 (patch)
treef1f4c6109c1b64c795a05ff2a6188f246028e767 /src/dcp.cc
parent91e1e17b4c9771e00b48d9fcc0dcbe2bdfa94c17 (diff)
Rename Font -> FontAsset; add dcpdumpsub tool.
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 12aaee47..c1675401 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -41,7 +41,7 @@
#include "decrypted_kdm_key.h"
#include "dcp_assert.h"
#include "reel_asset.h"
-#include "font.h"
+#include "font_asset.h"
#include <xmlsec/xmldsig.h>
#include <xmlsec/app.h>
#include <libxml++/libxml++.h>
@@ -176,7 +176,7 @@ DCP::read (bool keep_going, ReadErrors* errors)
throw DCPReadError ("Unknown MXF essence type");
}
} else if (boost::filesystem::extension (path) == ".ttf") {
- other_assets.push_back (shared_ptr<Font> (new Font (path)));
+ other_assets.push_back (shared_ptr<FontAsset> (new FontAsset (path)));
}
}