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

The following commit has been merged in the master branch:
commit d57597cfd8561371a1cb04f005e06c749905c7c4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 14 08:01:47 2010 +0000

    #719: Removed Fuji makernote class and pretty-print functions from the published interface.
---
 src/CMakeLists.txt                 |  2 +-
 src/fujimn.cpp                     |  5 +++--
 src/{fujimn.hpp => fujimn_int.hpp} | 13 +++++++------
 src/tags.cpp                       |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 81604a8..22b596c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,6 +31,7 @@
 # Private headers which are only needed for the library itself
 SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
                           crwimage_int.hpp
+                          fujimn_int.hpp
                           makernote_int.hpp
                           minoltamn_int.hpp
                           nikonmn_int.hpp
@@ -60,7 +61,6 @@ SET( LIBEXIV2_HDR         basicio.hpp
                           error.hpp
                           exif.hpp
                           exiv2.hpp
-                          fujimn.hpp
                           futils.hpp
                           gifimage.hpp
                           image.hpp
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 0b3ea26..ab96bfe 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -34,7 +34,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "fujimn.hpp"
+#include "fujimn_int.hpp"
 #include "value.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -48,6 +48,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     //! OffOn, multiple tags
     extern const TagDetails fujiOffOn[] = {
@@ -283,4 +284,4 @@ namespace Exiv2 {
         return tagInfo_;
     }
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
diff --git a/src/fujimn.hpp b/src/fujimn_int.hpp
similarity index 89%
rename from src/fujimn.hpp
rename to src/fujimn_int.hpp
index f0742a2..c83c849 100644
--- a/src/fujimn.hpp
+++ b/src/fujimn_int.hpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*!
-  @file    fujimn.hpp
+  @file    fujimn_int.hpp
   @brief   Fujifilm MakerNote implemented according to the specification
            in Appendix 4: Makernote of Fujifilm of the document
            <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">
@@ -32,8 +32,8 @@
            <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
   @date    11-Feb-04, ahu: created
  */
-#ifndef FUJIMN_HPP_
-#define FUJIMN_HPP_
+#ifndef FUJIMN_INT_HPP_
+#define FUJIMN_INT_HPP_
 
 // *****************************************************************************
 // included header files
@@ -43,12 +43,13 @@
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
+    namespace Internal {
 
 // *****************************************************************************
 // class definitions
 
     //! MakerNote for Fujifilm cameras
-    class EXIV2API FujiMakerNote {
+    class FujiMakerNote {
     public:
         //! Return read-only list of built-in Fujifilm tags
         static const TagInfo* tagList();
@@ -59,6 +60,6 @@ namespace Exiv2 {
 
     }; // class FujiMakerNote
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
 
-#endif                                  // #ifndef FUJIMN_HPP_
+#endif                                  // #ifndef FUJIMN_INT_HPP_
diff --git a/src/tags.cpp b/src/tags.cpp
index 362a4a2..7102e0c 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -38,7 +38,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "futils.hpp"
 #include "value.hpp"
 #include "canonmn.hpp"
-#include "fujimn.hpp"
+#include "fujimn_int.hpp"
 #include "minoltamn_int.hpp"
 #include "nikonmn_int.hpp"
 #include "olympusmn.hpp"

-- 
exiv2 packaging