|
Lines 153-159
Link Here
|
| 153 |
|
153 |
|
| 154 |
for (i = 0; i < m_vCharSet.size(); i += 2) |
154 |
for (i = 0; i < m_vCharSet.size(); i += 2) |
| 155 |
{ |
155 |
{ |
| 156 |
UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i])); |
156 |
UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i])); |
| 157 |
size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]); |
157 |
size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]); |
| 158 |
|
158 |
|
| 159 |
for (UT_UCSChar j = base; j < base + nb_chars; ++j) |
159 |
for (UT_UCSChar j = base; j < base + nb_chars; ++j) |
|
Lines 194-204
Link Here
|
| 194 |
UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy)); |
194 |
UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy)); |
| 195 |
for (size_t i = 0; i < m_vCharSet.size(); i += 2) |
195 |
for (size_t i = 0; i < m_vCharSet.size(); i += 2) |
| 196 |
{ |
196 |
{ |
| 197 |
count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]); |
197 |
count += reinterpret_cast<unsigned long>(m_vCharSet[i + 1]); |
| 198 |
if (count > index) |
198 |
if (count > index) |
| 199 |
{ |
199 |
{ |
| 200 |
UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1])))); |
200 |
UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1])))); |
| 201 |
return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1])); |
201 |
return static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i]) + index - count + reinterpret_cast<unsigned long>(m_vCharSet[i + 1])); |
| 202 |
} |
202 |
} |
| 203 |
} |
203 |
} |
| 204 |
|
204 |
|
|
Lines 227-234
Link Here
|
| 227 |
|
227 |
|
| 228 |
for (size_t i = 0; i < m_vCharSet.size(); i += 2) |
228 |
for (size_t i = 0; i < m_vCharSet.size(); i += 2) |
| 229 |
{ |
229 |
{ |
| 230 |
UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]); |
230 |
UT_uint32 base = reinterpret_cast<unsigned long>(m_vCharSet[i]); |
| 231 |
UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]); |
231 |
UT_uint32 size = reinterpret_cast<unsigned long>(m_vCharSet[i + 1]); |
| 232 |
|
232 |
|
| 233 |
if (base + size > c) |
233 |
if (base + size > c) |
| 234 |
{ |
234 |
{ |
