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

Remove custom messages from enforce(xxx, Exiv2::kerCorruptedMetadata)

Browse Source
This commit is contained in:
Luis Diaz Mas 2018-05-23 12:06:59 +02:00 committed by Luis Díaz Más
parent c0a879aea4
commit 1371d677f9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pngchunk_int.cpp
View File

@ -165,7 +165,7 @@ namespace Exiv2 {
else if(type == iTXt_Chunk)
{
const int nullSeparators = std::count(&data.pData_[keysize+3], &data.pData_[data.size_], '\0');
enforce(nullSeparators >= 2, Exiv2::kerCorruptedMetadata, "iTXt chunk: not enough null separators");
enforce(nullSeparators >= 2, Exiv2::kerCorruptedMetadata);
// Extract a deflate compressed or uncompressed UTF-8 text chunk
@ -174,10 +174,8 @@ namespace Exiv2 {
// we get the compression method after the compression flag
const byte compressionMethod = data.pData_[keysize + 2];
enforce(compressionFlag == 0x00 || compressionFlag == 0x01, Exiv2::kerCorruptedMetadata,
"iTXt chunk: not valid value in compressionFlag");
enforce(compressionMethod == 0x00, Exiv2::kerCorruptedMetadata,
"iTXt chunk: not valid value in compressionMethod");
enforce(compressionFlag == 0x00 || compressionFlag == 0x01, Exiv2::kerCorruptedMetadata);
enforce(compressionMethod == 0x00, Exiv2::kerCorruptedMetadata);
// language description string after the compression technique spec
std::string languageText((const char*)(data.pData_ + keysize + 3));