summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/subtitle_asset.cc2
-rw-r--r--src/subtitle_asset.h2
-rw-r--r--tools/dcpdumpsub.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 083a8040..4c042974 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -648,7 +648,7 @@ SubtitleAsset::subtitles_as_xml (xmlpp::Element* xml_root, int time_code_rate, S
}
map<string, Data>
-SubtitleAsset::fonts_with_load_ids () const
+SubtitleAsset::font_data () const
{
map<string, Data> out;
BOOST_FOREACH (Font const & i, _fonts) {
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index fd233cc8..50f723da 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -94,7 +94,7 @@ public:
virtual void add (boost::shared_ptr<Subtitle>);
virtual void add_font (std::string id, boost::filesystem::path file) = 0;
- std::map<std::string, Data> fonts_with_load_ids () const;
+ std::map<std::string, Data> font_data () const;
virtual void write (boost::filesystem::path) const = 0;
virtual std::string xml_as_string () const = 0;
diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc
index 9558a82a..d9f11b47 100644
--- a/tools/dcpdumpsub.cc
+++ b/tools/dcpdumpsub.cc
@@ -128,7 +128,7 @@ main (int argc, char* argv[])
cout << sub.xml_as_string() << "\n";
if (extract_fonts) {
- map<string, dcp::Data> fonts = sub.fonts_with_load_ids ();
+ map<string, dcp::Data> fonts = sub.font_data ();
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) {