Syping/gta5view
1
0
Fork 0
Code Issues Pull requests Releases 12 Wiki Activity

RagePhoto: Improve casting
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Syping 2020-11-12 00:24:21 +01:00
parent 05ccdc6689
commit 2cf9119c54
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
RagePhoto.cpp
View file

@ -466,7 +466,7 @@ bool RagePhoto::setPhotoData(const QByteArray &data)
bool RagePhoto::setPhotoData(const char *data, int size) bool RagePhoto::setPhotoData(const char *data, int size)
{ {
if ((quint32)size > p_photoBuffer) if (static_cast<quint32>(size) > p_photoBuffer)
return false; return false;
p_photoData = QByteArray(data, size); p_photoData = QByteArray(data, size);
return true; return true;
@ -721,12 +721,18 @@ RagePhoto* RagePhoto::loadFile(const QString &filePath)
quint32 RagePhoto::charToUInt32BE(char *x) quint32 RagePhoto::charToUInt32BE(char *x)
{ {
return (((unsigned char)x[0] << 24) | ((unsigned char)x[1] << 16) | ((unsigned char)x[2] << 8) | ((unsigned char)x[3])); return (static_cast<unsigned char>(x[0]) << 24 |
static_cast<unsigned char>(x[1]) << 16 |
static_cast<unsigned char>(x[2]) << 8 |
static_cast<unsigned char>(x[3]));
} }
quint32 RagePhoto::charToUInt32LE(char *x) quint32 RagePhoto::charToUInt32LE(char *x)
{ {
return (((unsigned char)x[3] << 24) | ((unsigned char)x[2] << 16) | ((unsigned char)x[1] << 8) | ((unsigned char)x[0])); return (static_cast<unsigned char>(x[3]) << 24 |
static_cast<unsigned char>(x[2]) << 16 |
static_cast<unsigned char>(x[1]) << 8 |
static_cast<unsigned char>(x[0]));
} }
void RagePhoto::uInt32ToCharBE(quint32 *x, char *y) void RagePhoto::uInt32ToCharBE(quint32 *x, char *y)

5
SnapmaticPicture.cpp
View file

@ -82,7 +82,6 @@ bool SnapmaticPicture::preloadFile()
QFile *picFile = new QFile(picFilePath); QFile *picFile = new QFile(picFilePath);
picFileName = QFileInfo(picFilePath).fileName(); picFileName = QFileInfo(picFilePath).fileName();
bool g5eMode = false;
isFormatSwitch = false; isFormatSwitch = false;
if (!picFile->open(QFile::ReadOnly)) if (!picFile->open(QFile::ReadOnly))
@ -104,10 +103,6 @@ bool SnapmaticPicture::preloadFile()
if (ragePhoto.photoFormat() == RagePhoto::PhotoFormat::G5EX) if (ragePhoto.photoFormat() == RagePhoto::PhotoFormat::G5EX)
isFormatSwitch = true; isFormatSwitch = true;
} }
else
{
g5eMode = true;
}
emit preloaded(); emit preloaded();
return ok; return ok;
} }