X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=c0dbf0562631de24d2d5b1fdfbbc78aa340375a6;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=85099062f1493e7f742f8297a1c34d2d8ae8de19;hpb=ada96204dfa1456da77e2ea7469f492cfc0a5483;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 85099062f..c0dbf0562 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -39,6 +39,7 @@
 #include <fstream>
 #include <cerrno>
 #include <iostream>
+#include <cfloat>
 
 #include "i18n.h"
 
@@ -319,9 +320,9 @@ try
 				LOG_WARNING (N_("Finishing writer with a left-over queue of %1:"), _queue.size());
 				for (list<QueueItem>::const_iterator i = _queue.begin(); i != _queue.end(); ++i) {
 					if (i->type == QueueItem::FULL) {
-						LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, i->eyes);
+						LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, (int) i->eyes);
 					} else {
-						LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, i->eyes);
+						LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, (int) i->eyes);
 					}
 				}
 			}
@@ -342,7 +343,7 @@ try
 
 			switch (qi.type) {
 			case QueueItem::FULL:
-				LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes);
+				LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, (int) qi.eyes);
 				if (!qi.encoded) {
 					qi.encoded = Data (_film->j2c_path (qi.reel, qi.frame, qi.eyes, false));
 				}
@@ -632,7 +633,7 @@ Writer::set_digest_progress (Job* job, float progress)
 	_digest_progresses[boost::this_thread::get_id()] = progress;
 
 	boost::mutex::scoped_lock lm (_digest_progresses_mutex);
-	float min_progress = 0;
+	float min_progress = FLT_MAX;
 	for (map<boost::thread::id, float>::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) {
 		min_progress = min (min_progress, i->second);
 	}