[Python-modules-commits] r11003 - in packages/pyexiv2/trunk/debian (3 files)

[nijel at users.alioth.debian.org]

    Date: Tuesday, January 5, 2010 @ 12:31:30
  Author: nijel
Revision: 11003

Patch from upstream to compile with exiv2 0.19.

Added:
  packages/pyexiv2/trunk/debian/patches/exiv2-0.19.patch
Modified:
  packages/pyexiv2/trunk/debian/changelog
  packages/pyexiv2/trunk/debian/patches/series

Modified: packages/pyexiv2/trunk/debian/changelog
===================================================================
--- packages/pyexiv2/trunk/debian/changelog	2010-01-05 12:21:21 UTC (rev 11002)
+++ packages/pyexiv2/trunk/debian/changelog	2010-01-05 12:31:30 UTC (rev 11003)
@@ -2,9 +2,9 @@
 
   * NOT RELEASED YET
   * Convert to 3.0 (quilt) source format.
-  * Rebuilt against new libexiv.
+  * Patch from upstream to compile with exiv2 0.19.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 05 Jan 2010 13:20:58 +0100
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 05 Jan 2010 13:31:04 +0100
 
 pyexiv2 (0.1.3-4) unstable; urgency=low
 

Added: packages/pyexiv2/trunk/debian/patches/exiv2-0.19.patch
===================================================================
--- packages/pyexiv2/trunk/debian/patches/exiv2-0.19.patch	                        (rev 0)
+++ packages/pyexiv2/trunk/debian/patches/exiv2-0.19.patch	2010-01-05 12:31:30 UTC (rev 11003)
@@ -0,0 +1,77 @@
+Subject: Fix compilation against libexiv2 0.19. 
+Origin: http://bazaar.launchpad.net/~osomon/pyexiv2/0.1.x/revision/101
+=== modified file 'src/libpyexiv2.cpp'
+--- src/libpyexiv2.cpp	2009-03-14 21:43:49 +0000
++++ src/libpyexiv2.cpp	2010-01-05 08:04:49 +0000
+@@ -33,6 +33,33 @@
+ #define THUMB_ACCESS 104
+ #define NO_THUMBNAIL 105
+ 
++
++// Copied from libexiv2's src/iptc.cpp.
++// Was previously called Exiv2::FindMetadatumById::FindMetadatumById but it was
++// renamed and moved in revision 1727. See http://dev.exiv2.org/issues/show/581.
++//! Unary predicate that matches an Iptcdatum with given record and dataset
++class FindIptcdatum {
++public:
++    //! Constructor, initializes the object with the record and dataset id
++    FindIptcdatum(uint16_t dataset, uint16_t record)
++        : dataset_(dataset), record_(record) {}
++    /*!
++      @brief Returns true if the record and dataset id of the argument
++            Iptcdatum is equal to that of the object.
++    */
++    bool operator()(const Exiv2::Iptcdatum& iptcdatum) const
++    {
++        return dataset_ == iptcdatum.tag() && record_ == iptcdatum.record();
++    }
++
++private:
++    // DATA
++    uint16_t dataset_;
++    uint16_t record_;
++
++}; // class FindIptcdatum
++
++
+ namespace LibPyExiv2
+ {
+ 
+@@ -228,7 +255,7 @@
+ 			while ((indexCounter > 0) && (dataIterator != _iptcData.end()))
+ 			{
+ 				dataIterator = std::find_if(++dataIterator, _iptcData.end(),
+-					Exiv2::FindMetadatumById::FindMetadatumById(iptcKey.tag(), iptcKey.record()));
++					FindIptcdatum(iptcKey.tag(), iptcKey.record()));
+ 				--indexCounter;
+ 			}
+ 			if (dataIterator != _iptcData.end())
+@@ -266,7 +293,7 @@
+ 			while ((indexCounter > 0) && (dataIterator != _iptcData.end()))
+ 			{
+ 				dataIterator = std::find_if(++dataIterator, _iptcData.end(),
+-					Exiv2::FindMetadatumById::FindMetadatumById(iptcKey.tag(), iptcKey.record()));
++					FindIptcdatum(iptcKey.tag(), iptcKey.record()));
+ 				--indexCounter;
+ 			}
+ 			if (dataIterator != _iptcData.end())
+
+=== modified file 'unittest/Bug183618_TestCase.py'
+--- unittest/Bug183618_TestCase.py	2008-02-09 01:13:28 +0000
++++ unittest/Bug183618_TestCase.py	2010-01-05 08:06:59 +0000
+@@ -71,12 +71,12 @@
+ 
+         # Exhaustive tests on the values of EXIF GPS metadata
+         gpsTags = [('Exif.Image.GPSTag', long, 1313L),
+-                   ('Exif.GPSInfo.GPSVersionID', str, '2 0 0 0 '),
++                   ('Exif.GPSInfo.GPSVersionID', str, '2 0 0 0'),
+                    ('Exif.GPSInfo.GPSLatitudeRef', str, 'N'),
+                    ('Exif.GPSInfo.GPSLatitude', tuple, (pyexiv2.Rational(47, 1), pyexiv2.Rational(3817443, 1000000), pyexiv2.Rational(0, 1))),
+                    ('Exif.GPSInfo.GPSLongitudeRef', str, 'E'),
+                    ('Exif.GPSInfo.GPSLongitude', tuple, (pyexiv2.Rational(8, 1), pyexiv2.Rational(41359940, 1000000), pyexiv2.Rational(0, 1))),
+-                   ('Exif.GPSInfo.GPSAltitudeRef', str, '0 '),
++                   ('Exif.GPSInfo.GPSAltitudeRef', str, '0'),
+                    ('Exif.GPSInfo.GPSAltitude', pyexiv2.Rational, pyexiv2.Rational(1908629, 1250)),
+                    ('Exif.GPSInfo.GPSMapDatum', str, 'WGS-84')]
+         self.assertEqual([tag for tag in image.exifKeys() if tag.find('GPS') != -1], [tag[0] for tag in gpsTags])
+

Modified: packages/pyexiv2/trunk/debian/patches/series
===================================================================
--- packages/pyexiv2/trunk/debian/patches/series	2010-01-05 12:21:21 UTC (rev 11002)
+++ packages/pyexiv2/trunk/debian/patches/series	2010-01-05 12:31:30 UTC (rev 11003)
@@ -1 +1,2 @@
 boost-lib-name.patch
+exiv2-0.19.patch