benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix: 32/64bit problems found while packaging

Browse source 
This changeset combines several small fixes done while preparing the
current debian package. They were included into the package and applied to master
This commit is contained in:
Fischlurch 2013-11-10 04:17:53 +01:00
parent f77f396afc
commit 73876cdac9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/time/digxel.hpp
View file

@ -317,7 +317,7 @@ namespace time {
typedef Digxel< int, digxel::SexaFormatter> SexaDigit; ///< for displaying time components (sexagesimal)
typedef Digxel<uint, digxel::HexaFormatter> HexaDigit; ///< for displaying a hex byte
typedef Digxel< int, digxel::HourFormatter> HourDigit; ///< for displaying hours in H:M.S
typedef Digxel<long, digxel::CountFormatter> CountVal; ///< for displaying a counter ///////////TICKET #882 : outch!
typedef Digxel<int64_t, digxel::CountFormatter> CountVal; ///< for displaying a counter ///////////TICKET #882 : should better use a typedef for frame counts
/** special Digxel to show a sign.

2
tests/library/time/quantiser-basics-test.cpp
View file

@ -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);

4
tests/library/time/time-formats-test.cpp
View file

@ -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;