Syping/libragephoto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix MSVC warnings and add consts

Browse source
This commit is contained in:
Syping 2021-09-22 05:14:04 +02:00
parent 3c59996591
commit cfc0af179f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/RagePhoto.cpp
View file

@ -133,7 +133,7 @@ bool RagePhoto::load(const char *data, size_t length)
if (p_photoFormat == PhotoFormat::RDR2) if (p_photoFormat == PhotoFormat::RDR2)
pos = pos + 8; pos = pos + 8;
uint32_t headerSize = pos; const size_t headerSize = pos;
size = readBuffer(data, uInt32Buffer, &pos, 4, length); size = readBuffer(data, uInt32Buffer, &pos, 4, length);
if (size != 4) { if (size != 4) {
@ -443,7 +443,7 @@ bool RagePhoto::save(char *data, PhotoFormat photoFormat)
#ifdef CODECVT_COMPATIBLE #ifdef CODECVT_COMPATIBLE
std::wstring_convert<std::codecvt_utf8_utf16<char16_t, 0x10ffff, std::little_endian>,char16_t> convert; std::wstring_convert<std::codecvt_utf8_utf16<char16_t, 0x10ffff, std::little_endian>,char16_t> convert;
std::u16string photoString = convert.from_bytes(p_photoString); std::u16string photoString = convert.from_bytes(p_photoString);
uint32_t photoString_size = photoString.size() * 2 + 1; const size_t photoString_size = photoString.size() * 2 + 1;
if (photoString_size > 256) { if (photoString_size > 256) {
p_error = Error::HeaderBufferTight; // 34 p_error = Error::HeaderBufferTight; // 34
return false; return false;
@ -461,25 +461,25 @@ bool RagePhoto::save(char *data, PhotoFormat photoFormat)
return false; return false;
} }
uint32_t jsonString_size = p_jsonString.size() + 1; const size_t jsonString_size = p_jsonString.size() + 1;
if (jsonString_size > p_jsonBuffer) { if (jsonString_size > p_jsonBuffer) {
p_error = Error::JsonBufferTight; // 36 p_error = Error::JsonBufferTight; // 36
return false; return false;
} }
uint32_t titlString_size = p_titleString.size() + 1; const size_t titlString_size = p_titleString.size() + 1;
if (titlString_size > p_titlBuffer) { if (titlString_size > p_titlBuffer) {
p_error = Error::TitleBufferTight; // 37 p_error = Error::TitleBufferTight; // 37
return false; return false;
} }
uint32_t descString_size = p_descriptionString.size() + 1; const size_t descString_size = p_descriptionString.size() + 1;
if (descString_size > p_descBuffer) { if (descString_size > p_descBuffer) {
p_error = Error::DescBufferTight; // 38 p_error = Error::DescBufferTight; // 38
return false; return false;
} }
size_t length = saveSize(photoFormat); const size_t length = saveSize(photoFormat);
size_t pos = 0; size_t pos = 0;
char uInt32Buffer[4]; char uInt32Buffer[4];
@ -507,7 +507,7 @@ bool RagePhoto::save(char *data, PhotoFormat photoFormat)
writeBuffer("\0", data, &pos, length, 1); writeBuffer("\0", data, &pos, length, 1);
} }
} }
uint32_t headerSize = pos; const size_t headerSize = pos;
#if __BYTE_ORDER == __LITTLE_ENDIAN #if __BYTE_ORDER == __LITTLE_ENDIAN
memcpy(uInt32Buffer, &p_endOfFile, 4); memcpy(uInt32Buffer, &p_endOfFile, 4);
@ -621,7 +621,7 @@ bool RagePhoto::save(char *data)
const std::string RagePhoto::save(PhotoFormat photoFormat, bool *ok) const std::string RagePhoto::save(PhotoFormat photoFormat, bool *ok)
{ {
size_t size = saveSize(photoFormat); const size_t size = saveSize(photoFormat);
if (size == 0) { if (size == 0) {
if (ok) if (ok)
*ok = false; *ok = false;
@ -745,7 +745,7 @@ bool RagePhoto::setPhoto(const char *data, uint32_t size, uint32_t bufferSize)
bool RagePhoto::setPhoto(const std::string &data, uint32_t bufferSize) bool RagePhoto::setPhoto(const std::string &data, uint32_t bufferSize)
{ {
return setPhoto(data.data(), data.size(), bufferSize); return setPhoto(data.data(), static_cast<uint32_t>(data.size()), bufferSize);
} }
void RagePhoto::setTitle(const std::string &title, uint32_t bufferSize) void RagePhoto::setTitle(const std::string &title, uint32_t bufferSize)