[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=2cd2ad6

The following commit has been merged in the master branch:
commit 2cd2ad64440319e1c03f5ec6911e897a0537232b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Nov 18 15:37:21 2005 +0000

    Minor cleanup
---
 src/image.hpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/image.hpp b/src/image.hpp
index e1d12db..d2cfbb0 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -256,15 +256,12 @@ namespace Exiv2 {
     /*!
       @brief Returns an Image instance of the specified type.
 
-      The factory is implemented as a singleton, which can be accessed
-      through static member functions.
+      The factory is implemented as a static class.
     */
     class ImageFactory {
     public:
         //! @name Manipulators
         //@{
-        //! Destructor.
-        static void cleanup();
         /*!
           @brief Register image type together with its function pointers.
 
@@ -388,7 +385,7 @@ namespace Exiv2 {
     private:
         //! @name Creators
         //@{
-        //! Prevent construction other than through instance().
+        //! Prevent construction: not implemented.
         ImageFactory();
         //! Prevent copy construction: not implemented.
         ImageFactory(const ImageFactory& rhs);

-- 
exiv2 packaging