[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=d41e19a

The following commit has been merged in the master branch:
commit d41e19a20c832b2442bbfea36aeda3808edef6d7
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Dec 9 16:05:54 2009 +0000

    Updated references to Nikon lens data tag.
---
 README                  | 2 +-
 config/config.h.cmake   | 2 +-
 config/config.h.in      | 2 +-
 config/configure.ac     | 4 ++--
 msvc/include/exv_msvc.h | 2 +-
 src/easyaccess.cpp      | 4 +++-
 src/nikonmn.cpp         | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 7630480..db93c7b 100644
--- a/README
+++ b/README
@@ -162,7 +162,7 @@ Commercial version
 
 If you have a commercial license, you must disable NLS support, 
 conversion of UCS2 characters in XP tags and the conversion of
-Exif.Nikon3.LensData values to lens names to build a commercial 
+Nikon lens data to readable lens names to build a commercial 
 version of the Exiv2 library.
 
 To do this on Windows, compile the library with the preprocessor
diff --git a/config/config.h.cmake b/config/config.h.cmake
index 00677ad..2b1e61e 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -19,7 +19,7 @@
 
 #ifndef EXV_COMMERCIAL_VERSION
 
-/* Define to 1 to enable translation of Exif.Nikon3.LensData. */
+/* Define to 1 to enable translation of Nikon lens names. */
 #cmakedefine EXV_HAVE_LENSDATA 1
 
 /* Define to 1 if translation of program messages to the user's
diff --git a/config/config.h.in b/config/config.h.in
index 9c3d51f..635f4b3 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -18,7 +18,7 @@
 
 #ifndef EXV_COMMERCIAL_VERSION
 
-/* Define to 1 to enable translation of Exif.Nikon3.LensData. */
+/* Define to 1 to enable translation of Nikon lens names. */
 #undef HAVE_LENSDATA
 
 /* Define to 1 if translation of program messages to the user's
diff --git a/config/configure.ac b/config/configure.ac
index 78744f0..8249596 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -121,9 +121,9 @@ if test "$GXX_VISIBILITY" = "yes"; then
     fi
 fi
 
-AC_MSG_CHECKING([whether to use the lens database for Exif.Nikon3.LensData])
+AC_MSG_CHECKING([whether to use the lens database for Nikon lens names])
 AC_ARG_ENABLE(lensdata,
-    [  --disable-lensdata      do not use the lens database for Exif.Nikon3.LensData ],
+    [  --disable-lensdata      do not use the lens database for Nikon lens names ],
     USE_LENSDATA=$enableval, USE_LENSDATA=yes)
 AC_MSG_RESULT($USE_LENSDATA)
 if test "$USE_LENSDATA" = "yes"; then
diff --git a/msvc/include/exv_msvc.h b/msvc/include/exv_msvc.h
index 717acb8..82dd414 100644
--- a/msvc/include/exv_msvc.h
+++ b/msvc/include/exv_msvc.h
@@ -36,7 +36,7 @@ typedef int pid_t;
 
 #ifndef EXV_COMMERCIAL_VERSION
 
-/* Define to 1 to enable translation of Exif.Nikon3.LensData. */
+/* Define to 1 to enable translation of Nikon lens names. */
 # define EXV_HAVE_LENSDATA 1
 
 /* Define to 1 if translation of program messages to the user's
diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
index fe960d4..589e099 100644
--- a/src/easyaccess.cpp
+++ b/src/easyaccess.cpp
@@ -211,7 +211,9 @@ namespace Exiv2 {
     {
         static const char* keys[] = {
             "Exif.CanonCs.LensType",
-            "Exif.Nikon3.LensData",
+            "Exif.NikonLd1.LensIDNumber",
+            "Exif.NikonLd2.LensIDNumber",
+            "Exif.NikonLd3.LensIDNumber",
             "Exif.Minolta.LensID",
             "Exif.Pentax.LensType"
         };
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index bfedafa..e407807 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2004-2009 Andreas Huggel <ahuggel at gmx.net>
  *
- * Lens database to decode Exif.Nikon3.LensData
+ * Lens database for the conversion of Nikon lens data to readable lens names 
  * Copyright (C) 2005-2008 Robert Rottmerhusen <lens_id at rottmerhusen.com>
  *
  * This program is part of the Exiv2 distribution.

-- 
exiv2 packaging