|
|
|
@ -290,7 +290,8 @@ namespace Exiv2 {
|
|
|
|
append(psBlob, pPsData + pos, sizePsData - pos);
|
|
|
|
append(psBlob, pPsData + pos, sizePsData - pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Data is rounded to be even
|
|
|
|
// Data is rounded to be even
|
|
|
|
if (psBlob.size() > 0) rc = DataBuf(&psBlob[0], static_cast<long>(psBlob.size()));
|
|
|
|
if (!psBlob.empty())
|
|
|
|
|
|
|
|
rc = DataBuf(&psBlob[0], static_cast<long>(psBlob.size()));
|
|
|
|
#ifdef EXIV2_DEBUG_MESSAGES
|
|
|
|
#ifdef EXIV2_DEBUG_MESSAGES
|
|
|
|
std::cerr << "IRB block at the end of Photoshop::setIptcIrb\n";
|
|
|
|
std::cerr << "IRB block at the end of Photoshop::setIptcIrb\n";
|
|
|
|
if (rc.size_ == 0) std::cerr << " None.\n";
|
|
|
|
if (rc.size_ == 0) std::cerr << " None.\n";
|
|
|
|
@ -406,7 +407,7 @@ namespace Exiv2 {
|
|
|
|
io_->read(xmpPacket.pData_, xmpPacket.size_);
|
|
|
|
io_->read(xmpPacket.pData_, xmpPacket.size_);
|
|
|
|
if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
|
|
|
|
if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
|
|
|
|
xmpPacket_.assign(reinterpret_cast<char*>(xmpPacket.pData_), xmpPacket.size_);
|
|
|
|
xmpPacket_.assign(reinterpret_cast<char*>(xmpPacket.pData_), xmpPacket.size_);
|
|
|
|
if (xmpPacket_.size() > 0 && XmpParser::decode(xmpData_, xmpPacket_)) {
|
|
|
|
if (!xmpPacket_.empty() && XmpParser::decode(xmpData_, xmpPacket_)) {
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
EXV_WARNING << "Failed to decode XMP metadata.\n";
|
|
|
|
EXV_WARNING << "Failed to decode XMP metadata.\n";
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
@ -432,7 +433,7 @@ namespace Exiv2 {
|
|
|
|
// Append to psBlob
|
|
|
|
// Append to psBlob
|
|
|
|
append(psBlob, psData.pData_, psData.size_);
|
|
|
|
append(psBlob, psData.pData_, psData.size_);
|
|
|
|
// Check whether psBlob is complete
|
|
|
|
// Check whether psBlob is complete
|
|
|
|
if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0], (long) psBlob.size())) {
|
|
|
|
if (!psBlob.empty() && Photoshop::valid(&psBlob[0], (long)psBlob.size())) {
|
|
|
|
--search;
|
|
|
|
--search;
|
|
|
|
foundCompletePsData = true;
|
|
|
|
foundCompletePsData = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -531,7 +532,7 @@ namespace Exiv2 {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} // while there are segments to process
|
|
|
|
} // while there are segments to process
|
|
|
|
|
|
|
|
|
|
|
|
if (psBlob.size() > 0) {
|
|
|
|
if (!psBlob.empty()) {
|
|
|
|
// Find actual IPTC data within the psBlob
|
|
|
|
// Find actual IPTC data within the psBlob
|
|
|
|
Blob iptcBlob;
|
|
|
|
Blob iptcBlob;
|
|
|
|
const byte *record = 0;
|
|
|
|
const byte *record = 0;
|
|
|
|
@ -550,16 +551,14 @@ namespace Exiv2 {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pCur = record + sizeHdr + sizeIptc + (sizeIptc & 1);
|
|
|
|
pCur = record + sizeHdr + sizeIptc + (sizeIptc & 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( iptcBlob.size() > 0
|
|
|
|
if (!iptcBlob.empty() &&
|
|
|
|
&& IptcParser::decode(iptcData_,
|
|
|
|
IptcParser::decode(iptcData_, &iptcBlob[0], static_cast<uint32_t>(iptcBlob.size()))) {
|
|
|
|
&iptcBlob[0],
|
|
|
|
|
|
|
|
static_cast<uint32_t>(iptcBlob.size()))) {
|
|
|
|
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
EXV_WARNING << "Failed to decode IPTC metadata.\n";
|
|
|
|
EXV_WARNING << "Failed to decode IPTC metadata.\n";
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
iptcData_.clear();
|
|
|
|
iptcData_.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} // psBlob.size() > 0
|
|
|
|
} // psBlob.size() > 0
|
|
|
|
|
|
|
|
|
|
|
|
if (rc != 0) {
|
|
|
|
if (rc != 0) {
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
@ -833,7 +832,7 @@ namespace Exiv2 {
|
|
|
|
out << std::endl;
|
|
|
|
out << std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (option == kpsIptcErase && iptcDataSegs.size()) {
|
|
|
|
if (option == kpsIptcErase && !iptcDataSegs.empty()) {
|
|
|
|
#ifdef EXIV2_DEBUG_MESSAGES
|
|
|
|
#ifdef EXIV2_DEBUG_MESSAGES
|
|
|
|
std::cout << "iptc data blocks: " << iptcDataSegs.size() << std::endl;
|
|
|
|
std::cout << "iptc data blocks: " << iptcDataSegs.size() << std::endl;
|
|
|
|
uint32_t toggle = 0;
|
|
|
|
uint32_t toggle = 0;
|
|
|
|
@ -1013,7 +1012,7 @@ namespace Exiv2 {
|
|
|
|
// Append to psBlob
|
|
|
|
// Append to psBlob
|
|
|
|
append(psBlob, psData.pData_, psData.size_);
|
|
|
|
append(psBlob, psData.pData_, psData.size_);
|
|
|
|
// Check whether psBlob is complete
|
|
|
|
// Check whether psBlob is complete
|
|
|
|
if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0], (long)psBlob.size())) {
|
|
|
|
if (!psBlob.empty() && Photoshop::valid(&psBlob[0], (long)psBlob.size())) {
|
|
|
|
foundCompletePsData = true;
|
|
|
|
foundCompletePsData = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (marker == com_ && skipCom == -1) {
|
|
|
|
} else if (marker == com_ && skipCom == -1) {
|
|
|
|
@ -1046,7 +1045,7 @@ namespace Exiv2 {
|
|
|
|
++count;
|
|
|
|
++count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!foundCompletePsData && psBlob.size() > 0)
|
|
|
|
if (!foundCompletePsData && !psBlob.empty())
|
|
|
|
throw Error(kerNoImageInInputData);
|
|
|
|
throw Error(kerNoImageInInputData);
|
|
|
|
search += (int)skipApp13Ps3.size() + (int)skipApp2Icc.size();
|
|
|
|
search += (int)skipApp13Ps3.size() + (int)skipApp2Icc.size();
|
|
|
|
|
|
|
|
|
|
|
|
@ -1061,7 +1060,7 @@ namespace Exiv2 {
|
|
|
|
++search;
|
|
|
|
++search;
|
|
|
|
if (!writeXmpFromPacket() && xmpData_.count() > 0)
|
|
|
|
if (!writeXmpFromPacket() && xmpData_.count() > 0)
|
|
|
|
++search;
|
|
|
|
++search;
|
|
|
|
if (writeXmpFromPacket() && xmpPacket_.size() > 0)
|
|
|
|
if (writeXmpFromPacket() && !xmpPacket_.empty())
|
|
|
|
++search;
|
|
|
|
++search;
|
|
|
|
if (foundCompletePsData || iptcData_.count() > 0)
|
|
|
|
if (foundCompletePsData || iptcData_.count() > 0)
|
|
|
|
++search;
|
|
|
|
++search;
|
|
|
|
@ -1102,7 +1101,7 @@ namespace Exiv2 {
|
|
|
|
const byte* pExifData = rawExif.pData_;
|
|
|
|
const byte* pExifData = rawExif.pData_;
|
|
|
|
uint32_t exifSize = rawExif.size_;
|
|
|
|
uint32_t exifSize = rawExif.size_;
|
|
|
|
if (wm == wmIntrusive) {
|
|
|
|
if (wm == wmIntrusive) {
|
|
|
|
pExifData = blob.size() > 0 ? &blob[0] : 0;
|
|
|
|
pExifData = !blob.empty() ? &blob[0] : 0;
|
|
|
|
exifSize = static_cast<uint32_t>(blob.size());
|
|
|
|
exifSize = static_cast<uint32_t>(blob.size());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (exifSize > 0) {
|
|
|
|
if (exifSize > 0) {
|
|
|
|
@ -1133,7 +1132,7 @@ namespace Exiv2 {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (xmpPacket_.size() > 0) {
|
|
|
|
if (!xmpPacket_.empty()) {
|
|
|
|
// Write APP1 marker, size of APP1 field, XMP id and XMP packet
|
|
|
|
// Write APP1 marker, size of APP1 field, XMP id and XMP packet
|
|
|
|
tmpBuf[0] = 0xff;
|
|
|
|
tmpBuf[0] = 0xff;
|
|
|
|
tmpBuf[1] = app1_;
|
|
|
|
tmpBuf[1] = app1_;
|
|
|
|
@ -1195,7 +1194,7 @@ namespace Exiv2 {
|
|
|
|
// Set the new IPTC IRB, keeps existing IRBs but removes the
|
|
|
|
// Set the new IPTC IRB, keeps existing IRBs but removes the
|
|
|
|
// IPTC block if there is no new IPTC data to write
|
|
|
|
// IPTC block if there is no new IPTC data to write
|
|
|
|
DataBuf newPsData =
|
|
|
|
DataBuf newPsData =
|
|
|
|
Photoshop::setIptcIrb(psBlob.size() > 0 ? &psBlob[0] : 0, (long)psBlob.size(), iptcData_);
|
|
|
|
Photoshop::setIptcIrb(!psBlob.empty() ? &psBlob[0] : 0, (long)psBlob.size(), iptcData_);
|
|
|
|
const long maxChunkSize = 0xffff - 16;
|
|
|
|
const long maxChunkSize = 0xffff - 16;
|
|
|
|
const byte* chunkStart = newPsData.pData_;
|
|
|
|
const byte* chunkStart = newPsData.pData_;
|
|
|
|
const byte* chunkEnd = chunkStart + newPsData.size_;
|
|
|
|
const byte* chunkEnd = chunkStart + newPsData.size_;
|
|
|
|
|
Rosen Penev
4 years ago
committed by
Luis Díaz Más