[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=7282fb8

The following commit has been merged in the master branch:
commit 7282fb81089231744899ed3c3f4ce77ddcf91605
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Jun 1 12:28:36 2006 +0000

    Included exiv2_version.h from types.hpp, added sample usage
---
 src/exiv2_version.h | 21 ++++++++++++++++++++-
 src/types.hpp       |  2 ++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/exiv2_version.h b/src/exiv2_version.h
index 82dacbc..7312af2 100644
--- a/src/exiv2_version.h
+++ b/src/exiv2_version.h
@@ -22,7 +22,7 @@
   @file    exiv2_version.h
   @brief   Define to check the %Exiv2 version. The %Exiv2 library itself does not 
            use the defines in this file, they are meant for use by applications.
-           References: Similar versioning schemes are used in KDE, GTK and other
+           References: Similar versioning defines are used in KDE, GTK and other
            libraries. See http://apr.apache.org/versioning.html for accompanying
            guidelines.
   @version $Rev$
@@ -72,6 +72,25 @@
   is not subject to the guidelines described in the document above. Before a 1.0
   release (version 0.x.y), the API can and will be changing freely, without
   regard to the restrictions detailed in the above document.
+
+  @code
+  // Don't include the exiv2_version.h file, it is included by types.hpp
+  // Exiv2 versions before 0.10 didn't have this file and the macros
+
+  #ifndef EXIV2_CHECK_VERSION
+  # define EXIV2_CHECK_VERSION(a,b,c) (false)
+  #endif
+
+  // ...
+
+  // Check the Exiv2 version available at runtime
+  if (EXIV2_CHECK_VERSION(0,10,0)) {
+      // Available Exiv2 version is equal to or greater than requested
+  }
+  else {
+      // Installed Exiv2 version is less than requested
+  }
+  @endcode
  */
 #define EXIV2_CHECK_VERSION(major,minor,patch) \
     ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
diff --git a/src/types.hpp b/src/types.hpp
index b170c79..4f6f981 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -39,6 +39,8 @@
 # include "exv_conf.h"
 #endif
 
+#include "exiv2_version.h"
+
 // + standard includes
 #include <string>
 #include <iosfwd>

-- 
exiv2 packaging