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

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

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22b596c..48f7e13 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,6 +35,7 @@ SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
                           makernote_int.hpp
                           minoltamn_int.hpp
                           nikonmn_int.hpp
+                          olympusmn_int.hpp
                           orfimage_int.hpp
                           panasonicmn_int.hpp
                           pentaxmn_int.hpp
@@ -69,7 +70,6 @@ SET( LIBEXIV2_HDR         basicio.hpp
                           jpgimage.hpp
                           metadatum.hpp
                           mrwimage.hpp
-                          olympusmn.hpp
                           orfimage.hpp
                           pgfimage.hpp
                           pngimage.hpp
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 52dd528..e2f28a6 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -36,7 +36,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "olympusmn.hpp"
+#include "olympusmn_int.hpp"
 #include "value.hpp"
 #include "image.hpp"
 #include "tags.hpp"
@@ -52,7 +52,7 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
-
+    namespace Internal {
 
     //! OffOn, multiple tags
     extern const TagDetails olympusOffOn[] = {
@@ -1566,4 +1566,5 @@ value, const ExifData* metadata)
         }
         return os << v;
     } // OlympusMakerNote::print0x0308
-}                                       // namespace Exiv2
+
+}}                                      // namespace Internal, Exiv2
diff --git a/src/olympusmn.hpp b/src/olympusmn_int.hpp
similarity index 95%
rename from src/olympusmn.hpp
rename to src/olympusmn_int.hpp
index a3276aa..b692577 100644
--- a/src/olympusmn.hpp
+++ b/src/olympusmn_int.hpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*!
-  @file    olympusmn.hpp
+  @file    olympusmn_int.hpp
   @brief   Olympus makernote tags.<br>References:<br>
            [1] <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html#APP1">Exif file format, Appendix 1: MakerNote of Olympus Digicams</a> by TsuruZoh Tachibanaya<br>
            [2] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey<br>
@@ -36,8 +36,8 @@
            <a href="mailto:G.Mansfield at computer dot org">G.Mansfield at computer dot org</a>
   @date    10-Mar-05, wuz: created
  */
-#ifndef OLYMPUSMN_HPP_
-#define OLYMPUSMN_HPP_
+#ifndef OLYMPUSMN_INT_HPP_
+#define OLYMPUSMN_INT_HPP_
 
 // *****************************************************************************
 // included header files
@@ -52,12 +52,13 @@
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
+    namespace Internal {
 
 // *****************************************************************************
 // class definitions
 
     //! MakerNote for Olympus cameras
-    class EXIV2API OlympusMakerNote {
+    class OlympusMakerNote {
     public:
         //! Return read-only list of built-in Olympus tags
         static const TagInfo* tagList();
@@ -104,7 +105,6 @@ namespace Exiv2 {
         static std::ostream& print0x1209(std::ostream& os, const Value& value, const ExifData*);
         //! Print Olympus focus info AF Point
         static std::ostream& print0x0308(std::ostream& os, const Value& value, const ExifData*);
-
         //! Print Olympus generic
         static std::ostream& printGeneric(std::ostream& os, const Value& value, const ExifData*);
         //@}
@@ -123,6 +123,6 @@ namespace Exiv2 {
 
     }; // class OlympusMakerNote
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
 
-#endif                                  // #ifndef OLYMPUSMN_HPP_
+#endif                                  // #ifndef OLYMPUSMN_INT_HPP_
diff --git a/src/tags.cpp b/src/tags.cpp
index 7102e0c..46e4b18 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -41,7 +41,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "fujimn_int.hpp"
 #include "minoltamn_int.hpp"
 #include "nikonmn_int.hpp"
-#include "olympusmn.hpp"
+#include "olympusmn_int.hpp"
 #include "panasonicmn_int.hpp"
 #include "pentaxmn_int.hpp"
 #include "sigmamn_int.hpp"

-- 
exiv2 packaging