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

The following commit has been merged in the master branch:
commit 9bf9e434bd4ff5df5668edf906d296585194dfc4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 14 02:36:34 2010 +0000

    #719: Removed Panasonic makernote class and pretty-print functions from the published interface.
---
 src/CMakeLists.txt                           |  2 +-
 src/panasonicmn.cpp                          |  5 +++--
 src/{panasonicmn.hpp => panasonicmn_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 6300889..d373bdd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
                           makernote_int.hpp
                           nikonmn_int.hpp
                           orfimage_int.hpp
+                          panasonicmn_int.hpp
                           pngchunk_int.hpp
                           rcsid_int.hpp
                           rw2image_int.hpp
@@ -67,7 +68,6 @@ SET( LIBEXIV2_HDR         basicio.hpp
                           mrwimage.hpp
                           olympusmn.hpp
                           orfimage.hpp
-                          panasonicmn.hpp
                           pentaxmn.hpp
                           pgfimage.hpp
                           pngimage.hpp
diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp
index 3b72b34..45b90ea 100644
--- a/src/panasonicmn.cpp
+++ b/src/panasonicmn.cpp
@@ -33,7 +33,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "panasonicmn.hpp"
+#include "panasonicmn_int.hpp"
 #include "value.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -47,6 +47,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     //! Quality, tag 0x0001
     extern const TagDetails panasonicQuality[] = {
@@ -358,4 +359,4 @@ namespace Exiv2 {
         return tagInfoRaw_;
     }
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
diff --git a/src/panasonicmn.hpp b/src/panasonicmn_int.hpp
similarity index 91%
rename from src/panasonicmn.hpp
rename to src/panasonicmn_int.hpp
index 548aa05..7a2408e 100644
--- a/src/panasonicmn.hpp
+++ b/src/panasonicmn_int.hpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*!
-  @file    panasonicmn.hpp
+  @file    panasonicmn_int.hpp
   @brief   Panasonic MakerNote implemented using the following references:
            <a href="http://www.compton.nu/panasonic.html">Panasonic MakerNote Information</a> by Tom Hughes,
            Panasonic.pm of <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey,
@@ -31,8 +31,8 @@
            <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
   @date    11-Jun-05, ahu: created
  */
-#ifndef PANASONICMN_HPP_
-#define PANASONICMN_HPP_
+#ifndef PANASONICMN_INT_HPP_
+#define PANASONICMN_INT_HPP_
 
 // *****************************************************************************
 // included header files
@@ -46,12 +46,13 @@
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
+    namespace Internal {
 
 // *****************************************************************************
 // class definitions
 
     //! MakerNote for Panasonic cameras
-    class EXIV2API PanasonicMakerNote {
+    class PanasonicMakerNote {
     public:
         //! Return read-only list of built-in Panasonic tags
         static const TagInfo* tagList();
@@ -74,6 +75,6 @@ namespace Exiv2 {
 
     }; // class PanasonicMakerNote
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
 
-#endif                                  // #ifndef PANASONICMN_HPP_
+#endif                                  // #ifndef PANASONICMN_INT_HPP_
diff --git a/src/tags.cpp b/src/tags.cpp
index 3f2e7c8..b396051 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -42,7 +42,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "minoltamn.hpp"
 #include "nikonmn_int.hpp"
 #include "olympusmn.hpp"
-#include "panasonicmn.hpp"
+#include "panasonicmn_int.hpp"
 #include "pentaxmn.hpp"
 #include "sigmamn.hpp"
 #include "sonymn.hpp"

-- 
exiv2 packaging