/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
#include "subtitle_string.h"
#include "subtitle_image.h"
#include "dcp_assert.h"
+#include "load_font_node.h"
#include <asdcp/AS_DCP.h>
#include <asdcp/KM_util.h>
#include <libxml++/nodes/element.h>
}
return out;
}
+
+/** Replace empty IDs in any <LoadFontId> and <Font> tags with
+ * a dummy string. Some systems give errors with empty font IDs
+ * (see DCP-o-matic bug #1689).
+ */
+void
+SubtitleAsset::fix_empty_font_ids ()
+{
+ bool have_empty = false;
+ list<string> ids;
+ BOOST_FOREACH (shared_ptr<LoadFontNode> i, load_font_nodes()) {
+ if (i->id == "") {
+ have_empty = true;
+ } else {
+ ids.push_back (i->id);
+ }
+ }
+
+ if (!have_empty) {
+ return;
+ }
+
+ string const empty_id = unique_string (ids, "font");
+
+ BOOST_FOREACH (shared_ptr<LoadFontNode> i, load_font_nodes()) {
+ if (i->id == "") {
+ i->id = empty_id;
+ }
+ }
+
+ BOOST_FOREACH (shared_ptr<Subtitle> i, _subtitles) {
+ shared_ptr<SubtitleString> j = dynamic_pointer_cast<SubtitleString> (i);
+ if (j && j->font() && j->font().get() == "") {
+ j->set_font (empty_id);
+ }
+ }
+}
Time latest_subtitle_out () const;
+ void fix_empty_font_ids ();
+
virtual std::list<boost::shared_ptr<LoadFontNode> > load_font_nodes () const = 0;
protected:
return _aspect_adjust;
}
+ void set_font (std::string id) {
+ _font = id;
+ }
+
void set_size (int s) {
_size = s;
}
element->add_child_text (last, "\n" + spaces(initial));
}
}
+
+/** Try quite hard to find a string which starts with \ref base and is
+ * not in \ref existing.
+ */
+string
+dcp::unique_string (list<string> existing, string base)
+{
+ int const max_tries = existing.size() + 1;
+ for (int i = 0; i < max_tries; ++i) {
+ string trial = String::compose("%1%2", base, i);
+ if (find(existing.begin(), existing.end(), trial) == existing.end()) {
+ return trial;
+ }
+ }
+
+ DCP_ASSERT (false);
+}
extern std::string openjpeg_version();
extern std::string spaces (int n);
extern void indent (xmlpp::Element* element, int initial);
+extern std::string unique_string (std::list<std::string> existing, std::string base);
}
using std::ifstream;
using std::string;
+using std::list;
/** Test dcp::base64_decode */
BOOST_AUTO_TEST_CASE (base64_decode_test)
{
BOOST_CHECK_EQUAL (dcp::private_key_fingerprint (dcp::file_to_string ("test/data/private.key")), "Jdz1bFpCcKI7R16Ccx9JHYytag0=");
}
+
+BOOST_AUTO_TEST_CASE (unique_string_test)
+{
+ list<string> existing;
+ for (int i = 0; i < 16; i++) {
+ string s;
+ BOOST_CHECK_NO_THROW (s = dcp::unique_string(existing, "foo"));
+ BOOST_CHECK (find(existing.begin(), existing.end(), s) == existing.end());
+ existing.push_back (s);
+ }
+}