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

Update tests/bugfixes/github/test_issue_742.py

Browse Source 
Co-Authored-By: piponazo <piponazo@gmail.com>
(cherry picked from commit 39d8904696338d5bd4a9c7e9a96a798a791d0973)
This commit is contained in:
D4N 2019-03-31 09:41:11 +02:00 committed by Luis Diaz Mas
parent f33d8daaa0
commit adfc01f2e0
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/jp2image.cpp
View File

@ -469,7 +469,6 @@ namespace Exiv2
out << " address | length | box | data" << std::endl;
}
<<<<<<< HEAD
if ( bPrint || bXMP || bICC || bIPTCErase ) {
long position = 0;
@ -481,16 +480,6 @@ namespace Exiv2
while (box.length && box.type != kJp2BoxTypeClose && io_->read((byte*)&box, sizeof(box)) == sizeof(box))
{
position = io_->tell();
=======
if (bPrint || bXMP || bICC || bIPTCErase) {
Jp2BoxHeader box = {1, 1};
Jp2BoxHeader subBox = {1, 1};
Jp2UuidBox uuid = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
bool bLF = false;
while (box.length && box.type != kJp2BoxTypeClose && io_->read((byte*)&box, sizeof(box)) == sizeof(box)) {
long position = io_->tell();
>>>>>>> b6e4ca0a8... clang-format Jp2Image::printStructure()
box.length = getLong((byte*)&box.length, bigEndian);
box.type = getLong((byte*)&box.type, bigEndian);
@ -582,21 +571,11 @@ namespace Exiv2
}
lf(out, bLF);
<<<<<<< HEAD
if(bIsExif && bRecursive && rawData.size_ > 0)
{
if ( (rawData.pData_[0] == rawData.pData_[1])
&& (rawData.pData_[0]=='I' || rawData.pData_[0]=='M' )
) {
BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(rawData.pData_,rawData.size_));
printTiffStructure(*p,out,option,depth);
=======
if (bIsExif && bRecursive && rawData.size_ > 0) {
if ((rawData.pData_[0] == rawData.pData_[1]) &&
(rawData.pData_[0] == 'I' || rawData.pData_[0] == 'M')) {
BasicIo::UniquePtr p = BasicIo::UniquePtr(new MemIo(rawData.pData_, rawData.size_));
BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(rawData.pData_, rawData.size_));
printTiffStructure(*p, out, option, depth);
>>>>>>> b6e4ca0a8... clang-format Jp2Image::printStructure()
}
}

2
tests/bugfixes/github/test_issue_742.py
View File

@ -8,7 +8,7 @@ class ThrowsWhenSubBoxLengthIsNotGood(metaclass=system_tests.CaseMeta):
filename = system_tests.path("$data_path/issue_742_poc")
commands = ["$exiv2 -pX $filename"]
stdout = [""]
stderr = ["""$exiv2_exception_message """ + filename + """:
stderr = ["""$exiv2_exception_message $filename:
$kerCorruptedMetadata
"""]
retval = [1]