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

The following commit has been merged in the master branch:
commit bf31f186e0c7c58c96e2c18b5f35448728c27e0b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Oct 16 06:42:55 2004 +0000

    Minor changes
---
 src/image.cpp   | 13 +++++++------
 src/nikonmn.cpp |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index 979f580..88d6621 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      image.cpp
-  Version:   $Name:  $ $Revision: 1.27 $
+  Version:   $Name:  $ $Revision: 1.28 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
              Brad Schick (brad) <schick at robotbattle.com>
   History:   26-Jan-04, ahu: created
@@ -29,7 +29,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.27 $ $RCSfile: image.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.28 $ $RCSfile: image.cpp,v $");
 
 // *****************************************************************************
 // included header files
@@ -68,8 +68,9 @@ namespace Exiv2 {
     // Local functions. These could be static private functions on Image
     // subclasses but then ImageFactory needs to be made a friend. 
     /*!
-      @brief Create a new ExvImage instance and return a pointer to it. Caller
-             is responsible to delete the object when it is no longer needed.
+      @brief Create a new ExvImage instance and return an auto-pointer to it. 
+             Caller owns the object and the auto-pointer ensures that it will
+             be deleted.
      */
     Image::AutoPtr newExvInstance(const std::string& path, FILE* fp);
     //! Check if the file ifp is an EXV file.
@@ -716,7 +717,7 @@ namespace Exiv2 {
         Image::AutoPtr image;
         if (fp == 0) {
             image = Image::AutoPtr(new JpegImage(path, true));
-            if (!image->good()) delete image.release();
+            if (!image->good()) image.reset();
         }
         else {
             image = Image::AutoPtr(new JpegImage(path, fp));
@@ -769,7 +770,7 @@ namespace Exiv2 {
         Image::AutoPtr image;
         if (fp == 0) {
             image = Image::AutoPtr(new ExvImage(path, true));
-            if (!image->good()) delete image.release();
+            if (!image->good()) image.reset();
         }
         else {
             image = Image::AutoPtr(new ExvImage(path, fp));
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 8b62792..9207a73 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      nikonmn.cpp
-  Version:   $Name:  $ $Revision: 1.10 $
+  Version:   $Name:  $ $Revision: 1.11 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   17-May-04, ahu: created
              25-May-04, ahu: combined all Nikon formats in one component
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.10 $ $RCSfile: nikonmn.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.11 $ $RCSfile: nikonmn.cpp,v $");
 
 // *****************************************************************************
 // included header files
@@ -244,7 +244,7 @@ namespace Exiv2 {
 
     Nikon2MakerNote* Nikon2MakerNote::clone_(bool alloc) const 
     {
-        AutoPtr makerNote = AutoPtr(new Nikon2MakerNote(alloc)); 
+        AutoPtr makerNote(new Nikon2MakerNote(alloc)); 
         assert(makerNote.get() != 0);
         makerNote->readHeader(header_.pData_, header_.size_, byteOrder_);
         return makerNote.release();
@@ -445,7 +445,7 @@ namespace Exiv2 {
 
     Nikon3MakerNote* Nikon3MakerNote::clone_(bool alloc) const 
     {
-        AutoPtr makerNote = AutoPtr(new Nikon3MakerNote(alloc)); 
+        AutoPtr makerNote(new Nikon3MakerNote(alloc)); 
         assert(makerNote.get() != 0);
         makerNote->readHeader(header_.pData_, header_.size_, byteOrder_);
         return makerNote.release();

-- 
exiv2 packaging