From: Carl Hetherington Date: Sun, 8 Oct 2017 21:31:22 +0000 (+0100) Subject: Fix some warnings (part of #1135). X-Git-Tag: v2.11.25~3 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=85c2c9250f86dcc685b6e93e1e671a64cc0a24f3 Fix some warnings (part of #1135). --- 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::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 (