summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-10-08 22:31:22 +0100
committerCarl Hetherington <cth@carlh.net>2017-10-08 22:31:22 +0100
commit85c2c9250f86dcc685b6e93e1e671a64cc0a24f3 (patch)
treedfd73bfa8c293507e4097bc06422bd2c597a495f /src
parentd0ca1c2dc93c9f2747b84e3243e3edffba93bf19 (diff)
Fix some warnings (part of #1135).
Diffstat (limited to 'src')
-rw-r--r--src/lib/emailer.cc2
-rw-r--r--src/lib/job.cc4
-rw-r--r--src/lib/subtitle_decoder.cc3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc
index 8effc19bc..7edad20b1 100644
--- a/src/lib/emailer.cc
+++ b/src/lib/emailer.cc
@@ -108,7 +108,7 @@ Emailer::send (string server, int port, string user, string password)
boost::posix_time::ptime const utc_now = boost::posix_time::second_clock::universal_time ();
boost::posix_time::ptime const local_now = boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local (utc_now);
boost::posix_time::time_duration offset = local_now - utc_now;
- sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), abs (offset.hours()), offset.minutes());
+ sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), int(abs(offset.hours())), int(offset.minutes()));
_email = "Date: " + string(date_buffer) + "\r\n"
"To: " + address_list (_to) + "\r\n"
diff --git a/src/lib/job.cc b/src/lib/job.cc
index b5be02b4c..61c5b3767 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -425,8 +425,8 @@ Job::status () const
if (t > 10 && r > 0) {
boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
boost::posix_time::ptime finish = now + boost::posix_time::seconds(r);
- char finish_string[6];
- snprintf (finish_string, sizeof(finish_string), "%02d:%02d", finish.time_of_day().hours(), finish.time_of_day().minutes());
+ char finish_string[16];
+ snprintf (finish_string, sizeof(finish_string), "%02d:%02d", int(finish.time_of_day().hours()), int(finish.time_of_day().minutes()));
string day;
if (now.date() != finish.date()) {
/// TRANSLATORS: the %1 in this string will be filled in with a day of the week
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index a3eed6374..802c9ef84 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -171,6 +171,9 @@ SubtitleDecoder::emit_text_start (ContentTime from, sub::Subtitle const & subtit
case sub::RIGHT_OF_SCREEN:
h_align = dcp::HALIGN_RIGHT;
break;
+ default:
+ h_align = dcp::HALIGN_CENTER;
+ break;
}
out.push_back (