Fix some warnings (part of #1135).
authorCarl Hetherington <cth@carlh.net>
Sun, 8 Oct 2017 21:31:22 +0000 (22:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 8 Oct 2017 21:31:22 +0000 (22:31 +0100)
src/lib/emailer.cc
src/lib/job.cc
src/lib/subtitle_decoder.cc

index 8effc19bcf6de0d51f7cb82733af7a2760d53a7c..7edad20b1d41de299e84dba3ae5558460866f6f6 100644 (file)
@@ -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"
index b5be02b4c2ce0a9da71196383b4b16fecd4619b0..61c5b376734d202624967f24156dbfe5e7c8f002 100644 (file)
@@ -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
index a3eed637416b7d226e983c5cd3d8f9df7ab09bbe..802c9ef84cfaa7578b84a58995819cd9da5cc73b 100644 (file)
@@ -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 (