1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From 57ecf581d053f5cacf2e8fc3c024490e0bbe536f Mon Sep 17 00:00:00 2001
From: Brendan Bolles <brendan@fnordware.com>
Date: Wed, 13 Aug 2014 19:54:10 -0700
Subject: [PATCH] Use ULL for 64-bit literals
On a 32-bit architecture, these literals are too big for just a long,
they need to be ULL, since Int64 is unsigned.
---
IlmImf/ImfFastHuf.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/IlmImf/ImfFastHuf.cpp b/IlmImf/ImfFastHuf.cpp
index 86c84dc..01edad4 100644
--- a/IlmImf/ImfFastHuf.cpp
+++ b/IlmImf/ImfFastHuf.cpp
@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
for (int i = 0; i <= MAX_CODE_LEN; ++i)
{
codeCount[i] = 0;
- base[i] = 0xffffffffffffffffL;
+ base[i] = 0xffffffffffffffffULL;
offset[i] = 0;
}
@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
for (int i = 0; i <= MAX_CODE_LEN; ++i)
{
- if (base[i] != 0xffffffffffffffffL)
+ if (base[i] != 0xffffffffffffffffULL)
{
_ljBase[i] = base[i] << (64 - i);
}
@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
// Unused code length - insert dummy values
//
- _ljBase[i] = 0xffffffffffffffffL;
+ _ljBase[i] = 0xffffffffffffffffULL;
}
}
@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
int minIdx = TABLE_LOOKUP_BITS;
- while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
+ while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
minIdx--;
if (minIdx < 0)
@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
// Set the min value such that the table is never tested.
//
- _tableMin = 0xffffffffffffffffL;
+ _tableMin = 0xffffffffffffffffULL;
}
else
{
|
