From 92bd37c481bb98ff3d7eaa6c5466d867e35f0909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 21 Aug 2024 08:24:37 +0200 Subject: [PATCH] Code cleanup --- src/map/IMG/jls.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/map/IMG/jls.cpp b/src/map/IMG/jls.cpp index c9726c7b..b90f90ac 100644 --- a/src/map/IMG/jls.cpp +++ b/src/map/IMG/jls.cpp @@ -3,8 +3,6 @@ using namespace IMG; -#define max(a, b) ((a) > (b) ? (a) : (b)) - static const quint8 Z[] = { 8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -28,8 +26,8 @@ JLS::JLS(quint16 maxval, quint16 near) _range = ((_maxval + _near * 2) / (_near * 2 + 1)) + 1; _qbpp = ceil(log2(_range)); - quint8 bpp = max(2, ceil(log2(_maxval + 1))); - quint8 LIMIT = 2 * (bpp + max(8, bpp)); + quint8 bpp = qMax(2, qCeil(log2(_maxval + 1))); + quint8 LIMIT = 2 * (bpp + qMax(8u, bpp)); _limit = LIMIT - _qbpp - 1; } @@ -312,7 +310,7 @@ bool JLS::decode(const SubFile *file, SubFile::Handle &hdl, Matrix &img) _rg = 1; _lrk = 0; - quint16 A = max(2, (_range + 32) / 64); + quint16 A = qMax(2, (_range + 32) / 64); for (int i = 0; i < 4; i++) { _a[i] = A; _b[i] = 0;