summaryrefslogtreecommitdiffstats
path: root/src/exiv2-1-fixes.patch
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-12-02 19:11:29 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-12-02 19:11:29 (GMT)
commitfea1523d5a90be2052e9c5791904870326a73ebf (patch)
tree14dbc81adfcd3b31f1bb0a3ecfa544ce06a2e378 /src/exiv2-1-fixes.patch
parent9c11e9e39b4002a48d5216e30219ea5c975af9d0 (diff)
downloadmxe-fea1523d5a90be2052e9c5791904870326a73ebf.zip
mxe-fea1523d5a90be2052e9c5791904870326a73ebf.tar.gz
mxe-fea1523d5a90be2052e9c5791904870326a73ebf.tar.bz2
upgrade package: exiv2
Diffstat (limited to 'src/exiv2-1-fixes.patch')
-rw-r--r--src/exiv2-1-fixes.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/src/exiv2-1-fixes.patch b/src/exiv2-1-fixes.patch
deleted file mode 100644
index 0cd5ffc..0000000
--- a/src/exiv2-1-fixes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://dev.exiv2.org/projects/exiv2/repository/revisions/2370
-
---- trunk/src/psdimage.cpp (revision 2369)
-+++ trunk/src/psdimage.cpp (revision 2370)
-@@ -419,24 +419,24 @@
- 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 @@
- 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);