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

The following commit has been merged in the master branch:
commit e50500a59c1843d925d4feddb741046c5833a095
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Mar 20 04:44:56 2004 +0000

    Made print functions static to facilitate using them from clients
---
 src/fujimn.cpp | 40 ++++++++++++++++++++--------------------
 src/fujimn.hpp | 18 +++++++++---------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 6108680..8bdd04f 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      fujimn.cpp
-  Version:   $Name:  $ $Revision: 1.2 $
+  Version:   $Name:  $ $Revision: 1.3 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
              07-Mar-04, ahu: isolated as a separate component
@@ -31,7 +31,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.2 $ $RCSfile: fujimn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.3 $ $RCSfile: fujimn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -90,8 +90,8 @@ namespace Exif {
     }
 
     std::ostream& FujiMakerNote::printTag(std::ostream& os, 
-                                           uint16 tag, 
-                                           const Value& value) const
+                                          uint16 tag, 
+                                          const Value& value) const
     {
         switch (tag) {
         case 0x1020: // fallthrough
@@ -115,8 +115,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::printOffOn(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::printOffOn(std::ostream& os,
+                                            const Value& value)
     {
         switch (value.toLong()) {
         case 0: os << "Off"; break;
@@ -126,8 +126,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::print0x1001(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::print0x1001(std::ostream& os, 
+                                             const Value& value)
     {
         switch (value.toLong()) {
         case 1: // fallthrough
@@ -140,8 +140,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::print0x1002(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::print0x1002(std::ostream& os,
+                                             const Value& value)
     {
         switch (value.toLong()) {
         case    0: os << "Auto"; break;
@@ -157,8 +157,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::print0x1003(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::print0x1003(std::ostream& os,
+                                             const Value& value)
     {
         switch (value.toLong()) {
         case   0: os << "Standard"; break;
@@ -169,8 +169,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::print0x1004(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::print0x1004(std::ostream& os, 
+                                             const Value& value)
     {
         switch (value.toLong()) {
         case   0: os << "Standard"; break;
@@ -181,8 +181,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::print0x1010(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::print0x1010(std::ostream& os, 
+                                             const Value& value)
     {
         switch (value.toLong()) {
         case 0: os << "Auto"; break;
@@ -194,8 +194,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::print0x1021(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::print0x1021(std::ostream& os,
+                                             const Value& value)
     {
         switch (value.toLong()) {
         case 0: os << "Auto"; break;
@@ -205,8 +205,8 @@ namespace Exif {
         return os;
     }
 
-    std::ostream& FujiMakerNote::print0x1031(
-        std::ostream& os, const Value& value) const
+    std::ostream& FujiMakerNote::print0x1031(std::ostream& os,
+                                             const Value& value)
     {
         switch (value.toLong()) {
         case   0: os << "Auto"; break;
diff --git a/src/fujimn.hpp b/src/fujimn.hpp
index a22e691..e856b1c 100644
--- a/src/fujimn.hpp
+++ b/src/fujimn.hpp
@@ -24,7 +24,7 @@
            in "Appendix 4: Makernote of Fujifilm" of the document 
            "Exif file format" by TsuruZoh Tachibanaya
            <http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html>
-  @version $Name:  $ $Revision: 1.1 $
+  @version $Name:  $ $Revision: 1.2 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    11-Feb-04, ahu: created
@@ -95,21 +95,21 @@ namespace Exif {
         //! @name Print functions for Fujifilm %MakerNote tags 
         //@{
         //! Print Off or On status
-        std::ostream& printOffOn(std::ostream& os, const Value& value) const;
+        static std::ostream& printOffOn(std::ostream& os, const Value& value);
         //! Print sharpness
-        std::ostream& print0x1001(std::ostream& os, const Value& value) const;
+        static std::ostream& print0x1001(std::ostream& os, const Value& value);
         //! Print white balance
-        std::ostream& print0x1002(std::ostream& os, const Value& value) const;
+        static std::ostream& print0x1002(std::ostream& os, const Value& value);
         //! Print color
-        std::ostream& print0x1003(std::ostream& os, const Value& value) const;
+        static std::ostream& print0x1003(std::ostream& os, const Value& value);
         //! Print tone
-        std::ostream& print0x1004(std::ostream& os, const Value& value) const;
+        static std::ostream& print0x1004(std::ostream& os, const Value& value);
         //! Print flash mode
-        std::ostream& print0x1010(std::ostream& os, const Value& value) const;
+        static std::ostream& print0x1010(std::ostream& os, const Value& value);
         //! Print focus mode
-        std::ostream& print0x1021(std::ostream& os, const Value& value) const;
+        static std::ostream& print0x1021(std::ostream& os, const Value& value);
         //! Print picture mode
-        std::ostream& print0x1031(std::ostream& os, const Value& value) const;
+        static std::ostream& print0x1031(std::ostream& os, const Value& value);
         //@}
 
     private:

-- 
exiv2 packaging