From: Carl Hetherington Date: Tue, 7 Jul 2015 15:54:07 +0000 (+0100) Subject: Arch build fix; whitespace. X-Git-Tag: v1.1.2~9 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=0d022c11fd502186caef368d9cd77e095f74026c;p=libsub.git Arch build fix; whitespace. --- diff --git a/src/dcp_reader.cc b/src/dcp_reader.cc index 4dcbe48..9727ef8 100644 --- a/src/dcp_reader.cc +++ b/src/dcp_reader.cc @@ -26,6 +26,7 @@ #include "dcp/subtitle.h" #include #include +#include using std::list; using std::cout; @@ -75,14 +76,14 @@ DCPReader::parse_node (xmlpp::Node const * node, ParseState& parse_state, option } } } - + void DCPReader::maybe_add_subtitle (string text, ParseState const & parse_state) { if (empty_or_white_space (text)) { return; } - + if (parse_state.text_nodes.empty() || parse_state.subtitle_nodes.empty ()) { return; } @@ -92,7 +93,7 @@ DCPReader::maybe_add_subtitle (string text, ParseState const & parse_state) dcp::Subtitle effective_subtitle (*parse_state.subtitle_nodes.back ()); RawSubtitle rs; - + rs.text = text; rs.font = effective_font.id; rs.font_size.set_proportional (float (effective_font.size) / (72 * 11));