root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-18 11:52:08 +01:00
Code Issues Projects Releases Activity

const correctness

Browse Source
This commit is contained in:
Martin Tůma 2024-12-10 19:13:00 +01:00
parent 6673281e1c
commit 80a8ac260d
4 changed files with 121 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/IMG/demfile.cpp
View File

@ -146,7 +146,7 @@ int DEMFile::level(const Zoom &zoom) const
} }
MapData::Elevation *DEMFile::elevations(Handle &hdl, int level, MapData::Elevation *DEMFile::elevations(Handle &hdl, int level,
const DEMTile *tile) const DEMTile *tile) const
{ {
const Level &l = _levels.at(level); const Level &l = _levels.at(level);
MapData::Elevation *ele = new MapData::Elevation(); MapData::Elevation *ele = new MapData::Elevation();

5
src/map/IMG/demfile.h
View File

@ -16,7 +16,8 @@ public:
bool load(Handle &hdl); bool load(Handle &hdl);
void clear(); void clear();
MapData::Elevation *elevations(Handle &hdl, int level, const DEMTile *tile); MapData::Elevation *elevations(Handle &hdl, int level,
const DEMTile *tile) const;
int level(const Zoom &zoom) const; int level(const Zoom &zoom) const;
QList<const DEMTile *> tiles(const RectC &rect, int level) const; QList<const DEMTile *> tiles(const RectC &rect, int level) const;
@ -44,7 +45,7 @@ private:
QList<DEMTile> tiles; QList<DEMTile> tiles;
}; };
qint16 meters(qint16 val) qint16 meters(qint16 val) const
{ {
return (_flags & 1) ? (qint16)qRound(val * 0.3048) : val; return (_flags & 1) ? (qint16)qRound(val * 0.3048) : val;
} }

160
src/map/IMG/jls.cpp
View File

@ -32,7 +32,8 @@ JLS::JLS(quint16 maxval, quint16 near)
_limit = LIMIT - _qbpp - 1; _limit = LIMIT - _qbpp - 1;
} }
bool JLS::processRunMode(BitStream &bs, quint16 col, quint16 &samples) bool JLS::processRunMode(BitStream &bs, Context &ctx, quint16 col,
quint16 &samples) const
{ {
quint8 z; quint8 z;
quint16 cnt = 0; quint16 cnt = 0;
@ -42,12 +43,12 @@ bool JLS::processRunMode(BitStream &bs, quint16 col, quint16 &samples)
z = Z[(bs.value() >> 0x18) ^ 0xff]; z = Z[(bs.value() >> 0x18) ^ 0xff];
for (quint8 i = 0; i < z; i++) { for (quint8 i = 0; i < z; i++) {
cnt = cnt + _rg; cnt = cnt + ctx.rg;
if (cnt <= col && _runIndex < 31) { if (cnt <= col && ctx.runIndex < 31) {
_runIndex++; ctx.runIndex++;
_rk = J[_runIndex]; ctx.rk = J[ctx.runIndex];
_rg = 1U << _rk; ctx.rg = 1U << ctx.rk;
} }
if (cnt >= col) { if (cnt >= col) {
@ -65,18 +66,18 @@ bool JLS::processRunMode(BitStream &bs, quint16 col, quint16 &samples)
if (!bs.read(z + 1)) if (!bs.read(z + 1))
return false; return false;
if (_rk) { if (ctx.rk) {
samples = (bs.value() >> (32 - _rk)) + cnt; samples = (bs.value() >> (32 - ctx.rk)) + cnt;
if (!bs.read(_rk)) if (!bs.read(ctx.rk))
return false; return false;
} else } else
samples = cnt; samples = cnt;
_lrk = _rk + 1; ctx.lrk = ctx.rk + 1;
if (_runIndex != 0) { if (ctx.runIndex != 0) {
_runIndex--; ctx.runIndex--;
_rk = J[_runIndex]; ctx.rk = J[ctx.runIndex];
_rg = 1U << _rk; ctx.rg = 1U << ctx.rk;
} }
return true; return true;
@ -87,7 +88,8 @@ bool JLS::processRunMode(BitStream &bs, quint16 col, quint16 &samples)
} }
} }
bool JLS::decodeError(BitStream &bs, quint8 limit, quint8 k, uint &MErrval) bool JLS::decodeError(BitStream &bs, quint8 limit, quint8 k,
uint &MErrval) const
{ {
quint8 cnt = 0; quint8 cnt = 0;
MErrval = 0; MErrval = 0;
@ -122,19 +124,19 @@ bool JLS::decodeError(BitStream &bs, quint8 limit, quint8 k, uint &MErrval)
return true; return true;
} }
bool JLS::readLine(BitStream &bs) bool JLS::readLine(BitStream &bs, Context &ctx) const
{ {
quint8 ictx, rctx; quint8 ictx, rctx;
quint8 k; quint8 k;
uint MErrval; uint MErrval;
int Errval; int Errval;
int Rx; int Rx;
int Ra = _last[1]; int Ra = ctx.last[1];
int Rb = _last[1]; int Rb = ctx.last[1];
int Rc = _last[0]; int Rc = ctx.last[0];
uint col = 1; uint col = 1;
*_current = _last[1]; *ctx.current = ctx.last[1];
do { do {
if (abs(Rb - Ra) > _near) { if (abs(Rb - Ra) > _near) {
@ -144,7 +146,7 @@ bool JLS::readLine(BitStream &bs)
else if (Px > _maxval) else if (Px > _maxval)
Px = _maxval; Px = _maxval;
for (k = 0; _n[1] << k < _a[1]; k++) for (k = 0; ctx.n[1] << k < ctx.a[1]; k++)
; ;
if (!decodeError(bs, _limit, k, MErrval)) if (!decodeError(bs, _limit, k, MErrval))
@ -158,7 +160,7 @@ bool JLS::readLine(BitStream &bs)
meh = MErrval >> 1; meh = MErrval >> 1;
mes = meh; mes = meh;
} }
if ((_near == 0) && (k == 0) && (_b[1] * 2 <= -_n[1])) { if ((_near == 0) && (k == 0) && (ctx.b[1] * 2 <= -ctx.n[1])) {
meh = mes + 1; meh = mes + 1;
mes = -mes - 1; mes = -mes - 1;
if (MErrval & 1) if (MErrval & 1)
@ -179,67 +181,67 @@ bool JLS::readLine(BitStream &bs)
if (Rx > _maxval) if (Rx > _maxval)
Rx = _maxval; Rx = _maxval;
_a[1] = _a[1] + meh; ctx.a[1] = ctx.a[1] + meh;
_b[1] = _b[1] + mes; ctx.b[1] = ctx.b[1] + mes;
if (_n[1] == 0x40) { if (ctx.n[1] == 0x40) {
_a[1] = _a[1] >> 1; ctx.a[1] = ctx.a[1] >> 1;
if (_b[1] >= 0) if (ctx.b[1] >= 0)
_b[1] = _b[1] >> 1; ctx.b[1] = ctx.b[1] >> 1;
else else
_b[1] = -((1 - _b[1]) >> 1); ctx.b[1] = -((1 - ctx.b[1]) >> 1);
_n[1] = 0x21; ctx.n[1] = 0x21;
} else } else
_n[1] = _n[1] + 1; ctx.n[1] = ctx.n[1] + 1;
if (_b[1] <= -_n[1]) { if (ctx.b[1] <= -ctx.n[1]) {
_b[1] = _b[1] + _n[1]; ctx.b[1] = ctx.b[1] + ctx.n[1];
if (_b[1] <= -_n[1]) if (ctx.b[1] <= -ctx.n[1])
_b[1] = 1 - _n[1]; ctx.b[1] = 1 - ctx.n[1];
} else if (_b[1] > 0) { } else if (ctx.b[1] > 0) {
_b[1] = _b[1] - _n[1]; ctx.b[1] = ctx.b[1] - ctx.n[1];
if (_b[1] > 0) if (ctx.b[1] > 0)
_b[1] = 0; ctx.b[1] = 0;
} }
Rc = Rb; Rc = Rb;
Rb = _last[col + 1]; Rb = ctx.last[col + 1];
} else { } else {
quint16 samples; quint16 samples;
if (!processRunMode(bs, _w - col + 1, samples)) if (!processRunMode(bs, ctx, ctx.w - col + 1, samples))
return false; return false;
if (samples != 0) { if (samples != 0) {
for (int i = 0; i < samples; i++) { for (int i = 0; i < samples; i++) {
if (col > _w) if (col > ctx.w)
return false; return false;
_current[col] = Ra; ctx.current[col] = Ra;
col++; col++;
} }
if (col > _w) if (col > ctx.w)
break; break;
Rc = _last[col]; Rc = ctx.last[col];
Rb = _last[col + 1]; Rb = ctx.last[col + 1];
} else { } else {
Rc = Rb; Rc = Rb;
Rb = _last[col + 1]; Rb = ctx.last[col + 1];
} }
rctx = (abs(Rc - Ra) <= _near); rctx = (abs(Rc - Ra) <= _near);
quint16 TEMP = _a[rctx + 2]; quint16 TEMP = ctx.a[rctx + 2];
if (rctx) if (rctx)
TEMP += _n[rctx + 2] >> 1; TEMP += ctx.n[rctx + 2] >> 1;
ictx = rctx | 2; ictx = rctx | 2;
for (k = 0; _n[rctx + 2] << k < TEMP; k++) for (k = 0; ctx.n[rctx + 2] << k < TEMP; k++)
; ;
if (!decodeError(bs, _limit - _lrk, k, MErrval)) if (!decodeError(bs, _limit - ctx.lrk, k, MErrval))
return false; return false;
quint16 s = ((k == 0) && (rctx || MErrval)) ? quint16 s = ((k == 0) && (rctx || MErrval)) ?
(_b[ictx] * 2 < _n[ictx]) : 0; (ctx.b[ictx] * 2 < ctx.n[ictx]) : 0;
Errval = MErrval + rctx + s; Errval = MErrval + rctx + s;
int evh; int evh;
@ -249,7 +251,7 @@ bool JLS::readLine(BitStream &bs)
} else { } else {
Errval = s - ((Errval + 1) >> 1); Errval = s - ((Errval + 1) >> 1);
evh = -Errval; evh = -Errval;
_b[ictx] = _b[ictx] + 1; ctx.b[ictx] = ctx.b[ictx] + 1;
} }
Errval *= (_near * 2 + 1); Errval *= (_near * 2 + 1);
@ -274,59 +276,45 @@ bool JLS::readLine(BitStream &bs)
if (Rx > _maxval) if (Rx > _maxval)
Rx = _maxval; Rx = _maxval;
_a[ictx] = _a[ictx] + (evh - rctx); ctx.a[ictx] = ctx.a[ictx] + (evh - rctx);
if (_n[ictx] == 0x40) { if (ctx.n[ictx] == 0x40) {
_a[ictx] = _a[ictx] >> 1; ctx.a[ictx] = ctx.a[ictx] >> 1;
if (_b[ictx] >= 0) if (ctx.b[ictx] >= 0)
_b[ictx] = _b[ictx] >> 1; ctx.b[ictx] = ctx.b[ictx] >> 1;
else else
_b[ictx] = -((1 - _b[ictx]) >> 1); ctx.b[ictx] = -((1 - ctx.b[ictx]) >> 1);
_n[ictx] = 0x21; ctx.n[ictx] = 0x21;
} else } else
_n[ictx] = _n[ictx] + 1; ctx.n[ictx] = ctx.n[ictx] + 1;
} }
_current[col] = Rx; ctx.current[col] = Rx;
Ra = Rx; Ra = Rx;
col = col + 1; col = col + 1;
} while (col <= _w); } while (col <= ctx.w);
return true; return true;
} }
bool JLS::decode(const SubFile *file, SubFile::Handle &hdl, Matrix<qint16> &img) bool JLS::decode(const SubFile *file, SubFile::Handle &hdl,
Matrix<qint16> &img) const
{ {
Context ctx(img.w(), _range);
BitStream bs(file, hdl); BitStream bs(file, hdl);
if (!bs.init()) if (!bs.init())
return false; return false;
_w = img.w();
_data = QVector<quint16>((_w + 3) * 2);
_last = _data.data();
_current = _data.data() + (_w + 3);
_runIndex = 0;
_rk = 0;
_rg = 1;
_lrk = 0;
quint16 A = qMax(2, (_range + 32) / 64);
for (int i = 0; i < 4; i++) {
_a[i] = A;
_b[i] = 0;
_n[i] = 1;
}
for (int i = 0; i < img.h(); i++) { for (int i = 0; i < img.h(); i++) {
if (!readLine(bs)) if (!readLine(bs, ctx))
return false; return false;
memcpy(img.row(i), _current + 1, _w * sizeof(quint16)); memcpy(img.row(i), ctx.current + 1, img.w() * sizeof(quint16));
quint16 *tmp = _last; quint16 *tmp = ctx.last;
_last = _current; ctx.last = ctx.current;
_current = tmp; ctx.current = tmp;
} }
return true; return true;

60
src/map/IMG/jls.h
View File

@ -12,7 +12,8 @@ class JLS
public: public:
JLS(quint16 maxval, quint16 near); JLS(quint16 maxval, quint16 near);
bool decode(const SubFile *file, SubFile::Handle &hdl, Matrix<qint16> &img); bool decode(const SubFile *file, SubFile::Handle &hdl,
Matrix<qint16> &img) const;
private: private:
class BitStream class BitStream
@ -56,28 +57,53 @@ private:
qint8 _shift; qint8 _shift;
}; };
bool readLine(BitStream &bs); struct Context
bool processRunMode(BitStream &bs, quint16 col, quint16 &samples); {
bool decodeError(BitStream &bs, quint8 limit, quint8 k, uint &MErrval); Context(quint16 width, quint16 range)
{
w = width;
data = QVector<quint16>((w + 3) * 2);
last = data.data();
current = data.data() + (w + 3);
runIndex = 0;
rk = 0;
rg = 1;
lrk = 0;
quint16 A = qMax(2, (range + 32) / 64);
for (int i = 0; i < 4; i++) {
a[i] = A;
b[i] = 0;
n[i] = 1;
}
}
quint8 runIndex;
quint8 rk;
quint16 rg;
quint16 n[4];
quint16 a[4];
qint16 b[4];
quint8 lrk;
quint16 w;
QVector<quint16> data;
quint16 *current;
quint16 *last;
};
bool readLine(BitStream &bs, Context &ctx) const;
bool processRunMode(BitStream &bs, Context &ctx, quint16 col,
quint16 &samples) const;
bool decodeError(BitStream &bs, quint8 limit, quint8 k,
uint &MErrval) const;
quint16 _maxval; quint16 _maxval;
quint16 _near; quint16 _near;
quint16 _range; quint16 _range;
quint8 _qbpp; quint8 _qbpp;
quint8 _limit; quint8 _limit;
quint8 _runIndex;
quint8 _rk;
quint16 _rg;
quint16 _n[4];
quint16 _a[4];
qint16 _b[4];
quint8 _lrk;
quint16 _w;
QVector<quint16> _data;
quint16 *_current;
quint16 *_last;
}; };
} }