d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade package: exiv2

This commit is contained in:
Volker Grabsch 2010-12-02 20:11:29 +01:00
parent 9c11e9e39b
commit fea1523d5a
2 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/exiv2-1-fixes.patch
View File

@ -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);

4
src/exiv2.mk
View File

@ -4,8 +4,8 @@
# Exiv2
PKG := exiv2
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.20
$(PKG)_CHECKSUM := 3ebab0acd114a463fe11881bd95f1c3e258c7c0c
$(PKG)_VERSION := 0.21
$(PKG)_CHECKSUM := 0961422a647e052a8db6e56e8818ab3217c37b01
$(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION)
$(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://www.exiv2.org/