root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-27 21:24:47 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2022-04-14 04:31:46 +02:00
parent 53cdc86aa0
commit ec06793a19
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/IMG/nodfile.cpp
View File

@ -6,8 +6,8 @@ using namespace IMG;
#define ARRAY_SIZE(array) \ #define ARRAY_SIZE(array) \
(sizeof(array) / sizeof(array[0])) (sizeof(array) / sizeof(array[0]))
#define DELTA(val, s1, s2) \ #define DELTA(val, llBits, maxBits) \
(((int)((val) << (s1)) >> (s1)) << (s2)) (((int)((val) << (32 - (llBits))) >> (32 - (llBits))) << (32 - (maxBits)))
static const struct static const struct
{ {
@ -207,10 +207,9 @@ bool NODFile::nodeInfo(Handle &hdl, AdjacencyInfo &adj) const
if (!(bs.read(lonBits, lon) && bs.read(latBits, lat))) if (!(bs.read(lonBits, lon) && bs.read(latBits, lat)))
return false; return false;
quint8 shift = 0x20 - maxBits;
QPoint pos( QPoint pos(
adj.blockInfo.hdr.nodeLonBase + DELTA(lon, 0x20 - lonBits, shift), adj.blockInfo.hdr.nodeLonBase + DELTA(lon, lonBits, maxBits),
adj.blockInfo.hdr.nodeLatBase + DELTA(lat, 0x20 - latBits, shift)); adj.blockInfo.hdr.nodeLatBase + DELTA(lat, latBits, maxBits));
adj.nodeInfo.bytes = ((lonBits + latBits) >> 3) + 1; adj.nodeInfo.bytes = ((lonBits + latBits) >> 3) + 1;
if ((maxBits < 0x1c) && (adj.nodeInfo.flags & 8)) { if ((maxBits < 0x1c) && (adj.nodeInfo.flags & 8)) {