xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switching short strings from 4 to 8 bytes; fixing recursive tags

Browse Source
v0.27.3
Michał Walenciak 8 years ago
parent 79f0953967
commit 2f39402466
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
bigtiff/parse.cpp
Unescape Escape View File

@ -301,7 +301,7 @@ void printIFD(Exiv2::BasicIo& io, std::ostream& out, Exiv2::PrintStructureOption
Exiv2::DataBuf buf(size*count + pad); // allocate a buffer Exiv2::DataBuf buf(size*count + pad); // allocate a buffer
std::memcpy(buf.pData_, &data, 8); // copy data into buffer (short strings) std::memcpy(buf.pData_, &data, 8); // copy data into buffer (short strings)
if ( count*size > 4 ) { // read into buffer if ( count*size > 8 ) { // read into buffer
size_t restore = io.tell(); // save size_t restore = io.tell(); // save
io.seek(offset, Exiv2::BasicIo::beg); // position io.seek(offset, Exiv2::BasicIo::beg); // position
io.read(buf.pData_,count*size); // read io.read(buf.pData_,count*size); // read
@ -343,7 +343,7 @@ void printIFD(Exiv2::BasicIo& io, std::ostream& out, Exiv2::PrintStructureOption
size_t restore = io.tell(); size_t restore = io.tell();
uint32_t offset = conditional_byte_swap_4_array<32>(&buf, k*size, bSwap); uint32_t offset = conditional_byte_swap_4_array<32>(&buf, k*size, bSwap);
std::cerr << "tag = " << Exiv2::Internal::stringFormat("%#x",tag) << std::endl; std::cerr << "tag = " << Exiv2::Internal::stringFormat("%#x",tag) << std::endl;
//Exiv2::RiffVideo(io).printIFDStructure(io,out,option,offset,bSwap,c,depth); // TODO: blind fix printIFD(io, out, option, offset, bSwap, depth);
io.seek(restore, Exiv2::BasicIo::beg); io.seek(restore, Exiv2::BasicIo::beg);
} }
} else if ( option == Exiv2::kpsRecursive && tag == 0x83bb /* IPTCNAA */ ) { } else if ( option == Exiv2::kpsRecursive && tag == 0x83bb /* IPTCNAA */ ) {

Write Preview
Loading…
Cancel
Save