diff --git a/src/cr2image.cpp b/src/cr2image.cpp index d5bed61b..1621def7 100644 --- a/src/cr2image.cpp +++ b/src/cr2image.cpp @@ -46,7 +46,7 @@ void Cr2Image::printStructure(std::ostream& out, Exiv2::PrintStructureOption opt if (io_->open() != 0) throw Error(ErrorCode::kerDataSourceOpenFailed, io_->path(), strError()); io_->seek(0, BasicIo::beg); - printTiffStructure(io(), out, option, depth - 1); + printTiffStructure(io(), out, option, depth); } void Cr2Image::setComment(const std::string&) { diff --git a/src/image.cpp b/src/image.cpp index f51755a8..a3bcc291 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -442,7 +442,7 @@ void Image::printIFDStructure(BasicIo& io, std::ostream& out, Exiv2::PrintStruct DataBuf bytes(byteslen); // allocate a buffer io.readOrThrow(bytes.data(), byteslen, ErrorCode::kerCorruptedMetadata); // read MemIo memIo(bytes.c_data(), byteslen); // create a file - printTiffStructure(memIo, out, option, depth); + printTiffStructure(memIo, out, option, depth+1); } else { // tag is an IFD uint32_t punt = bSony ? 12 : 0; @@ -486,7 +486,7 @@ void Image::printTiffStructure(BasicIo& io, std::ostream& out, Exiv2::PrintStruc auto c = dir.read_uint8(0); bool bSwap = (c == 'M' && isLittleEndianPlatform()) || (c == 'I' && isBigEndianPlatform()); size_t start = byteSwap4(dir, 4, bSwap); - printIFDStructure(io, out, option, start + offset, bSwap, c, depth+1); + printIFDStructure(io, out, option, start + offset, bSwap, c, depth); } } diff --git a/src/jp2image.cpp b/src/jp2image.cpp index 380828da..cf7c5c53 100644 --- a/src/jp2image.cpp +++ b/src/jp2image.cpp @@ -553,7 +553,7 @@ void Jp2Image::printStructure(std::ostream& out, PrintStructureOption option, in const char b = rawData.read_uint8(1); if (a == b && (a == 'I' || a == 'M')) { MemIo p(rawData.c_data(), rawData.size()); - printTiffStructure(p, out, option, depth); + printTiffStructure(p, out, option, depth+1); } } diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp index 896cfb81..32998eec 100644 --- a/src/jpgimage.cpp +++ b/src/jpgimage.cpp @@ -485,7 +485,7 @@ void JpegBase::printStructure(std::ostream& out, PrintStructureOption option, in if (start < max) { // create a copy on write memio object with the data, then print the structure MemIo p(buf.c_data(start), size - start); - printTiffStructure(p, out, option, depth); + printTiffStructure(p, out, option, depth+1); } } diff --git a/src/orfimage.cpp b/src/orfimage.cpp index a8473cf0..531b7d49 100644 --- a/src/orfimage.cpp +++ b/src/orfimage.cpp @@ -65,7 +65,7 @@ void OrfImage::printStructure(std::ostream& out, PrintStructureOption option, in io_->seek(0, BasicIo::beg); - printTiffStructure(io(), out, option, depth - 1); + printTiffStructure(io(), out, option, depth); } // OrfImage::printStructure void OrfImage::readMetadata() { diff --git a/src/pngimage.cpp b/src/pngimage.cpp index 64078b9a..1cd79bfa 100644 --- a/src/pngimage.cpp +++ b/src/pngimage.cpp @@ -330,7 +330,7 @@ void PngImage::printStructure(std::ostream& out, PrintStructureOption option, in if (bExif) { // create memio object with the data, then print the structure MemIo p(parsedBuf.c_data(6), parsedBuf.size() - 6); - printTiffStructure(p, out, option, depth); + printTiffStructure(p, out, option, depth+1); } if (bIptc) { IptcData::printStructure(out, makeSlice(parsedBuf, 0, parsedBuf.size()), depth); @@ -361,7 +361,7 @@ void PngImage::printStructure(std::ostream& out, PrintStructureOption option, in if (eXIf && option == kpsRecursive) { // create memio object with the data, then print the structure MemIo p(data.c_data(), dataOffset); - printTiffStructure(p, out, option, depth); + printTiffStructure(p, out, option, depth+1); } if (bLF) diff --git a/src/rw2image.cpp b/src/rw2image.cpp index 4147698a..8fa05acd 100644 --- a/src/rw2image.cpp +++ b/src/rw2image.cpp @@ -75,7 +75,7 @@ void Rw2Image::printStructure(std::ostream& out, PrintStructureOption option, in io_->seek(0, BasicIo::beg); - printTiffStructure(io(), out, option, depth - 1); + printTiffStructure(io(), out, option, depth); } // Rw2Image::printStructure void Rw2Image::readMetadata() { diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp index 72ad9109..48c1c584 100644 --- a/src/tiffimage.cpp +++ b/src/tiffimage.cpp @@ -276,7 +276,7 @@ void TiffImage::printStructure(std::ostream& out, Exiv2::PrintStructureOption op io_->seek(0, BasicIo::beg); - printTiffStructure(io(), out, option, depth - 1); + printTiffStructure(io(), out, option, depth); } } // namespace Exiv2 diff --git a/src/webpimage.cpp b/src/webpimage.cpp index 53387cce..7e054d3a 100644 --- a/src/webpimage.cpp +++ b/src/webpimage.cpp @@ -450,7 +450,7 @@ void WebPImage::printStructure(std::ostream& out, PrintStructureOption option, i if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_EXIF) && option == kpsRecursive) { // create memio object with the payload, then print the structure MemIo p(payload.c_data(), payload.size()); - printTiffStructure(p, out, option, depth); + printTiffStructure(p, out, option, depth+1); } bool bPrintPayload = (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_XMP) && option == kpsXMP) ||