root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2024-11-24 03:35:54 +01:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2018-11-10 08:09:42 +01:00
parent b7fb925178
commit dfa3316660
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pbfhandler.cpp
View File

@ -13,6 +13,22 @@
#define PBF_MAGIC 0x1A000000 #define PBF_MAGIC 0x1A000000
#define PBF_MAGIC_MASK 0xFF000000 #define PBF_MAGIC_MASK 0xFF000000
static bool isMagic(quint32 magic, quint32 mask, quint32 value)
{
return ((qFromBigEndian(value) & mask) == magic);
}
static bool isGZIPPBF(quint32 magic)
{
return isMagic(GZIP_MAGIC, GZIP_MAGIC_MASK, magic);
}
static bool isPlainPBF(quint32 magic)
{
return isMagic(PBF_MAGIC, PBF_MAGIC_MASK, magic);
}
bool PBFHandler::canRead() const bool PBFHandler::canRead() const
{ {
return canRead(device()); return canRead(device());
@ -25,12 +41,7 @@ bool PBFHandler::canRead(QIODevice *device)
if (size != sizeof(magic)) if (size != sizeof(magic))
return false; return false;
if ((qFromBigEndian(magic) & GZIP_MAGIC_MASK) == GZIP_MAGIC) return (isGZIPPBF(magic) || isPlainPBF(magic));
return true;
if ((qFromBigEndian(magic) & PBF_MAGIC_MASK) == PBF_MAGIC)
return true;
return false;
} }
bool PBFHandler::read(QImage *image) bool PBFHandler::read(QImage *image)
@ -42,9 +53,9 @@ bool PBFHandler::read(QImage *image)
QByteArray ba; QByteArray ba;
if ((qFromBigEndian(magic) & GZIP_MAGIC_MASK) == GZIP_MAGIC) if (isGZIPPBF(magic))
ba = Gzip::uncompress(device()->readAll()); ba = Gzip::uncompress(device()->readAll());
else if ((qFromBigEndian(magic) & PBF_MAGIC_MASK) == PBF_MAGIC) else if (isPlainPBF(magic))
ba = device()->readAll(); ba = device()->readAll();
if (ba.isNull()) if (ba.isNull())
return false; return false;