diff --git a/src/lib/time/digxel.hpp b/src/lib/time/digxel.hpp index 964985c3e..8237d95dc 100644 --- a/src/lib/time/digxel.hpp +++ b/src/lib/time/digxel.hpp @@ -317,7 +317,7 @@ namespace time { typedef Digxel< int, digxel::SexaFormatter> SexaDigit; ///< for displaying time components (sexagesimal) typedef Digxel HexaDigit; ///< for displaying a hex byte typedef Digxel< int, digxel::HourFormatter> HourDigit; ///< for displaying hours in H:M.S - typedef Digxel CountVal; ///< for displaying a counter ///////////TICKET #882 : outch! + typedef Digxel CountVal; ///< for displaying a counter ///////////TICKET #882 : should better use a typedef for frame counts /** special Digxel to show a sign. diff --git a/tests/library/time/quantiser-basics-test.cpp b/tests/library/time/quantiser-basics-test.cpp index dbcfa695a..edc4ced6a 100644 --- a/tests/library/time/quantiser-basics-test.cpp +++ b/tests/library/time/quantiser-basics-test.cpp @@ -90,7 +90,7 @@ namespace test{ uint frames = (rand() % MAX_FRAMES); FSecs dirt = (F25 / (2 + rand() % DIRT_GRAIN)); - Time rawTime (dirt + frames*F25); + Time rawTime = Time(frames*F25) + Duration(dirt); ////////////////TICKET #939 : should better use 64bit base type for FSecs ?? CHECK (Time( frames *F25) <= rawTime); CHECK (Time((frames+1)*F25) > rawTime); diff --git a/tests/library/time/time-formats-test.cpp b/tests/library/time/time-formats-test.cpp index fef32a278..1b9d23116 100644 --- a/tests/library/time/time-formats-test.cpp +++ b/tests/library/time/time-formats-test.cpp @@ -52,12 +52,12 @@ namespace test{ using format::Smpte; namespace{ - const int MAX_FRAME = 265*24*60*60*25; + const int64_t MAX_FRAME = 265*24*60*60*25; string generateRandomFrameNr() { - uint frameNr(0); + int64_t frameNr(0); /////////TICKET #882 : better use a typedef for frame counts while (!frameNr) frameNr = rand() % (2*MAX_FRAME) - MAX_FRAME;