Merge branch 'master' into gtk3

2016-07-09 23:49:31 +02:00
parent 93360770e1 3b734e4a7a
commit 040962c1b7
49 changed files with 418 additions and 419 deletions
--- a/rtgui/batchqueue.cc
+++ b/rtgui/batchqueue.cc
@@ -361,12 +361,12 @@ bool BatchQueue::loadBatchQueue ()
    return !fd.empty ();
 }

-Glib::ustring BatchQueue::getTempFilenameForParams( const Glib::ustring filename )
+Glib::ustring BatchQueue::getTempFilenameForParams( const Glib::ustring &filename )
 {
    timeval tv;
    gettimeofday(&tv, 0);
    char mseconds[4];
-    sprintf(mseconds, "%d", tv.tv_usec / 1000);
+    sprintf(mseconds, "%d", (int)(tv.tv_usec / 1000));
    time_t rawtime;
    struct tm *timeinfo;
    char stringTimestamp [80];