third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -Wsign-compare issues

Browse Source
This commit is contained in:
Luis Díaz Más 2018-09-11 16:12:10 +02:00
parent 320e186f44
commit 94375034e6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pngchunk_int.cpp
View File

@ -190,7 +190,8 @@ namespace Exiv2 {
string_from_unterminated((const char*)(data.pData_ + Safe::add(keysize, 3)), languageTextMaxSize);
const size_t languageTextSize = languageText.size();
enforce(data.size_ >= Safe::add(static_cast<size_t>(Safe::add(keysize, 4)), languageTextSize),
enforce(static_cast<unsigned long>(data.size_) >=
Safe::add(static_cast<size_t>(Safe::add(keysize, 4)), languageTextSize),
Exiv2::kerCorruptedMetadata);
// translated keyword string after the language description
std::string translatedKeyText =

5
unitTests/test_futils.cpp
View File

@ -132,7 +132,8 @@ TEST(base64decode, decodesValidString)
const std::string original ("VGhpcyBpcyBhIHVuaXQgdGVzdA==");
const std::string expected ("This is a unit test");
char * result = new char [original.size()];
ASSERT_EQ(expected.size()+1, base64decode(original.c_str(), result, original.size()));
ASSERT_EQ(static_cast<long>(expected.size()+1),
base64decode(original.c_str(), result, original.size()));
ASSERT_STREQ(expected.c_str(), result);
delete [] result;
}
@ -151,4 +152,4 @@ TEST(AUri, parsesAndDecoreUrl)
ASSERT_EQ("", uri.Password);
Uri::Decode(uri);
}
}