Assorted image subtitle fixes.

[dcpomatic.git] / src / lib / dcpomatic_time.h

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 2408bff812991dd8da237499eeb6509c9ba76fa2..ae8f251996088814f507ff63f0b2c6427ea68d97 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -22,6 +22,7 @@
 
 #include "frame_rate_change.h"
 #include "safe_stringstream.h"
+#include "dcpomatic_assert.h"
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
@@ -58,7 +59,7 @@ public:
 
        template <typename T>
        int64_t frames (T r) const {
-               return rint (_t * r / HZ);
+               return rint (double (_t) * r / HZ);
        }
 
        /** @param r Frames per second */
@@ -177,7 +178,7 @@ public:
 
        template <class T>
        static ContentTime from_frames (int64_t f, T r) {
-               assert (r > 0);
+               DCPOMATIC_ASSERT (r > 0);
                return ContentTime (f * HZ / r);
        }
 
@@ -192,6 +193,7 @@ class ContentTimePeriod
 {
 public:
        ContentTimePeriod () {}
+       
        ContentTimePeriod (ContentTime f, ContentTime t)
                : from (f)
                , to (t)
@@ -281,7 +283,7 @@ public:
 
        template <class T>
        static DCPTime from_frames (int64_t f, T r) {
-               assert (r > 0);
+               DCPOMATIC_ASSERT (r > 0);
                return DCPTime (f * HZ / r);
        }