[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=9f57915

The following commit has been merged in the master branch:
commit 9f57915a10929b84847b772695ee9548ba6b2683
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Nov 22 14:46:09 2010 +0000

    Added AF-point easy-access function. (Suggested by july)
---
 samples/easyaccess-test.cpp |   3 ++-
 src/easyaccess.cpp          |  31 +++++++++++++++++++++++++++++--
 src/easyaccess.hpp          |   2 ++
 test/bugfixes-test.sh       |   7 +++++++
 test/data/bugfixes-test.out | Bin 80778 -> 82214 bytes
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp
index 20dcd53..065f44a 100644
--- a/samples/easyaccess-test.cpp
+++ b/samples/easyaccess-test.cpp
@@ -37,7 +37,8 @@ static const EasyAccess easyAccess[] = {
     { "FNumber",              Exiv2::fNumber          },
     { "Subject distance",     Exiv2::subjectDistance  },
     { "Camera serial number", Exiv2::serialNumber     },
-    { "Focal length",         Exiv2::focalLength      }
+    { "Focal length",         Exiv2::focalLength      },
+    { "AF point",             Exiv2::afPoint          }
 };
 
 int main(int argc, char **argv)
diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
index bbd5447..0845846 100644
--- a/src/easyaccess.cpp
+++ b/src/easyaccess.cpp
@@ -76,7 +76,8 @@ namespace Exiv2 {
             "Exif.Sony1Cs.Rotation",
             "Exif.Sony2Cs.Rotation",
             "Exif.Sony1Cs2.Rotation",
-            "Exif.Sony2Cs2.Rotation"
+            "Exif.Sony2Cs2.Rotation",
+            "Exif.Sony1MltCsA100.Rotation"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
@@ -101,6 +102,7 @@ namespace Exiv2 {
             "Exif.Sony2Cs.ISOSetting",
             "Exif.Sony1Cs2.ISOSetting",
             "Exif.Sony2Cs2.ISOSetting",
+            "Exif.Sony1MltCsA100.ISOSetting",
             "Exif.Pentax.ISO",
             "Exif.Olympus.ISOSpeed",
             "Exif.Samsung2.ISO"
@@ -401,7 +403,7 @@ namespace Exiv2 {
             "Exif.Nikon3.SerialNumber",
             "Exif.Nikon3.SerialNO",
             "Exif.Fujifilm.SerialNumber",
-            "Exif.Olympus.SerialNumber",
+            "Exif.Olympus.SerialNumber2",
             "Exif.Sigma.SerialNumber"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
@@ -421,4 +423,29 @@ namespace Exiv2 {
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
 
+    ExifData::const_iterator afPoint(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.CanonPi.AFPointsUsed",
+            "Exif.CanonPi.AFPointsUsed20D",
+            "Exif.CanonSi.AFPointUsed",
+            "Exif.CanonCs.AFPoint",
+            "Exif.MinoltaCs7D.AFPoints",
+            "Exif.Nikon1.AFFocusPos",
+            "Exif.NikonAf.AFPoint",
+            "Exif.NikonAf.AFPointsInFocus",
+            "Exif.NikonAf2.AFPointsUsed",
+            "Exif.NikonAf2.PrimaryAFPoint",
+            "Exif.OlympusFi.AFPoint",
+            "Exif.Pentax.AFPoint",
+            "Exif.Pentax.AFPointInFocus",
+            "Exif.Sony1Cs.LocalAFAreaPoint",
+            "Exif.Sony2Cs.LocalAFAreaPoint",
+            "Exif.Sony1Cs2.LocalAFAreaPoint",
+            "Exif.Sony2Cs2.LocalAFAreaPoint",
+            "Exif.Sony1MltCsA100.LocalAFAreaPoint"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
 }                                       // namespace Exiv2
diff --git a/src/easyaccess.hpp b/src/easyaccess.hpp
index 12aea64..f61016f 100644
--- a/src/easyaccess.hpp
+++ b/src/easyaccess.hpp
@@ -80,6 +80,8 @@ namespace Exiv2 {
     EXIV2API ExifData::const_iterator serialNumber(const ExifData& ed);
     //! Return the focal length setting
     EXIV2API ExifData::const_iterator focalLength(const ExifData& ed);
+    //! Return the AF point
+    EXIV2API ExifData::const_iterator afPoint(const ExifData& ed);
 
 } // namespace Exiv2
 
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 788c0db..4ccd053 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -173,6 +173,13 @@ $exiv2 -v -PEkyct $filename
 $exiv2 -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename
 $exiv2 -v -PEkyct $filename
 
+# Test easy-access keys (using a dummy bug number)
+num=726
+filename=exiv2-bug$num.jpg
+cp -f ../data/exiv2-empty.jpg $filename
+$exiv2 -v -M"set Exif.Image.Make Samsung" $filename
+$binpath/easyaccess-test $filename
+
 ) > $results 2>&1
 
 # ----------------------------------------------------------------------
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 6a3afc4..b218ddd 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging