[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=72013d4

The following commit has been merged in the master branch:
commit 72013d4147927c558b186f13f962e78950d2eb0e
Author: vog <vog at notjusthosting.com>
Date:   Fri Jan 13 15:32:37 2012 +0000

    #800: Added and unified support for multiple IRB types (8BIM, AgHg, DCSR, PHUT) in JPEG and PSD images
---
 src/jpgimage.cpp                                   |  18 +++++++++++---
 src/jpgimage.hpp                                   |  12 ++++++++-
 src/psdimage.cpp                                   |  27 +++++++++------------
 test/bugfixes-test.sh                              |  11 +++++++++
 test/data/bugfixes-test.out                        | Bin 83613 -> 100961 bytes
 .../{exiv2-bug426.jpg => exiv2-bug800-8BIM.jpg}    | Bin
 .../{exiv2-photoshop.psd => exiv2-bug800-8BIM.psd} | Bin
 .../{exiv2-bug426.jpg => exiv2-bug800-AgHg.jpg}    | Bin 6441 -> 6441 bytes
 .../{exiv2-photoshop.psd => exiv2-bug800-AgHg.psd} | Bin 64164 -> 64164 bytes
 .../{exiv2-bug426.jpg => exiv2-bug800-DCSR.jpg}    | Bin 6441 -> 6441 bytes
 .../{exiv2-photoshop.psd => exiv2-bug800-DCSR.psd} | Bin 64164 -> 64164 bytes
 .../{exiv2-bug426.jpg => exiv2-bug800-PHUT.jpg}    | Bin 6441 -> 6441 bytes
 .../{exiv2-photoshop.psd => exiv2-bug800-PHUT.psd} | Bin 64164 -> 64164 bytes
 13 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 123df50..7bc292a 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -86,10 +86,21 @@ namespace Exiv2 {
     const char     JpegBase::xmpId_[]  = "http://ns.adobe.com/xap/1.0/

-- 
exiv2 packaging