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

The following commit has been merged in the master branch:
commit e90dcdc2190bc5e9adf75d6b145548c77743cfe7
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Apr 26 09:50:59 2015 +0000

    #922.  Documentation update.  Exiv2::Image::printStructure() is not thread safe.  No reason to use this in a multi-threaded application.
---
 include/exiv2/image.hpp     |  1 +
 include/exiv2/jpgimage.hpp  |  9 ++++++++-
 include/exiv2/pngimage.hpp  |  9 ++++++++-
 include/exiv2/tiffimage.hpp | 10 +++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp
index 9659694..31f41d6 100644
--- a/include/exiv2/image.hpp
+++ b/include/exiv2/image.hpp
@@ -111,6 +111,7 @@ namespace Exiv2 {
           @brief Print out the structure of image file.
           @throw Error if reading of the file fails or the image data is
                 not valid (does not look like data of the specific image type).
+          @caution This function is not thread safe and intended for exiv2 -pS for debugging.
          */
         virtual void printStructure(std::ostream& out,printStructureOption_e option=kpsNone);
         /*!
diff --git a/include/exiv2/jpgimage.hpp b/include/exiv2/jpgimage.hpp
index c0a6159..186b57a 100644
--- a/include/exiv2/jpgimage.hpp
+++ b/include/exiv2/jpgimage.hpp
@@ -150,9 +150,16 @@ namespace Exiv2 {
     public:
         //! @name Manipulators
         //@{
-        void printStructure(std::ostream& out,printStructureOption_e option);
         void readMetadata();
         void writeMetadata();
+
+        /*!
+          @brief Print out the structure of image file.
+          @throw Error if reading of the file fails or the image data is
+                not valid (does not look like data of the specific image type).
+          @caution This function is not thread safe and intended for exiv2 -pS for debugging.
+         */
+        void printStructure(std::ostream& out,Exiv2::printStructureOption_e option);
         //@}
 
     protected:
diff --git a/include/exiv2/pngimage.hpp b/include/exiv2/pngimage.hpp
index fc0339b..c484e19 100644
--- a/include/exiv2/pngimage.hpp
+++ b/include/exiv2/pngimage.hpp
@@ -84,9 +84,16 @@ namespace Exiv2
 
         //! @name Manipulators
         //@{
-        void printStructure(std::ostream& out,printStructureOption_e option);
         void readMetadata();
         void writeMetadata();
+
+        /*!
+          @brief Print out the structure of image file.
+          @throw Error if reading of the file fails or the image data is
+                not valid (does not look like data of the specific image type).
+          @caution This function is not thread safe and intended for exiv2 -pS for debugging.
+         */
+        void printStructure(std::ostream& out,Exiv2::printStructureOption_e option);
         //@}
 
         //! @name Accessors
diff --git a/include/exiv2/tiffimage.hpp b/include/exiv2/tiffimage.hpp
index 369a027..52e53c6 100644
--- a/include/exiv2/tiffimage.hpp
+++ b/include/exiv2/tiffimage.hpp
@@ -84,9 +84,17 @@ namespace Exiv2 {
 
         //! @name Manipulators
         //@{
-        void printStructure(std::ostream& out,Exiv2::printStructureOption_e option);
         void readMetadata();
         void writeMetadata();
+
+        /*!
+          @brief Print out the structure of image file.
+          @throw Error if reading of the file fails or the image data is
+                not valid (does not look like data of the specific image type).
+          @caution This function is not thread safe and intended for exiv2 -pS for debugging.
+         */
+        void printStructure(std::ostream& out,Exiv2::printStructureOption_e option);
+
         /*!
           @brief Not supported. TIFF format does not contain a comment.
               Calling this function will throw an Error(32).

-- 
exiv2 packaging