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

#738: Applied patch from Michael Ulbrich.

Browse Source
This commit is contained in:
Andreas Huggel 2010-10-25 13:24:51 +00:00
parent c9bf9bb52a
commit c8b0d7278b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/psdimage.cpp
View File

@ -419,24 +419,24 @@ namespace Exiv2 {
uint32_t curOffset = io_->tell();
// Write IPTC_NAA resource block
if ( resourceId == kPhotoshopResourceID_IPTC_NAA
|| (resourceId > kPhotoshopResourceID_IPTC_NAA && iptcDone == false)) {
if ((resourceId == kPhotoshopResourceID_IPTC_NAA ||
resourceId > kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) {
newResLength += writeIptcData(iptcData_, outIo);
resourceSize = (resourceSize + 1) & ~1; // adjust for padding
iptcDone = true;
}
// Write ExifInfo resource block
else if ( resourceId == kPhotoshopResourceID_ExifInfo
|| (resourceId > kPhotoshopResourceID_ExifInfo && exifDone == false)) {
else if ((resourceId == kPhotoshopResourceID_ExifInfo ||
resourceId > kPhotoshopResourceID_ExifInfo) && exifDone == false) {
newResLength += writeExifData(exifData_, outIo);
resourceSize = (resourceSize + 1) & ~1; // adjust for padding
exifDone = true;
}
// Write XMPpacket resource block
else if ( resourceId == kPhotoshopResourceID_XMPPacket
|| (resourceId > kPhotoshopResourceID_XMPPacket && xmpDone == false)) {
else if ((resourceId == kPhotoshopResourceID_XMPPacket ||
resourceId > kPhotoshopResourceID_XMPPacket) && xmpDone == false) {
newResLength += writeXmpData(xmpData_, outIo);
resourceSize = (resourceSize + 1) & ~1; // adjust for padding
xmpDone = true;
@ -456,7 +456,7 @@ namespace Exiv2 {
us2Data(buf, resourceId, bigEndian);
if (outIo.write(buf, 2) != 2) throw Error(21);
// Write resource name as Pascal string
buf[0] = resourceNameLength & 0x000f;
buf[0] = resourceNameLength & 0x00ff;
if (outIo.write(buf, 1) != 1) throw Error(21);
buf[0] = resourceNameFirstChar;
if (outIo.write(buf, 1) != 1) throw Error(21);