[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=920da80

The following commit has been merged in the master branch:
commit 920da80d7065b1456325dca39da4b52a5807f6bd
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 11 04:28:54 2006 +0000

    Minor AutoPtr related cleanup
---
 src/crwimage.cpp    | 2 +-
 src/fujimn.cpp      | 2 +-
 src/iptc.cpp        | 2 +-
 src/jpgimage.cpp    | 2 +-
 src/olympusmn.cpp   | 2 +-
 src/panasonicmn.cpp | 2 +-
 src/sigmamn.cpp     | 2 +-
 src/sonymn.cpp      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 80d2859..787ad75 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -1348,7 +1348,7 @@ namespace Exiv2 {
 
     Image::AutoPtr newCrwInstance(BasicIo::AutoPtr io, bool create)
     {
-        Image::AutoPtr image = Image::AutoPtr(new CrwImage(io, create));
+        Image::AutoPtr image(new CrwImage(io, create));
         if (!image->good()) {
             image.reset();
         }
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 3cc840c..72fbd3a 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -136,7 +136,7 @@ namespace Exiv2 {
 
     FujiMakerNote* FujiMakerNote::create_(bool alloc) const
     {
-        AutoPtr makerNote = AutoPtr(new FujiMakerNote(alloc));
+        AutoPtr makerNote(new FujiMakerNote(alloc));
         assert(makerNote.get() != 0);
         makerNote->readHeader(header_.pData_, header_.size_, byteOrder_);
         return makerNote.release();
diff --git a/src/iptc.cpp b/src/iptc.cpp
index 41854de..c03c813 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -85,7 +85,7 @@ namespace Exiv2 {
 
     Iptcdatum& Iptcdatum::operator=(const uint16_t& value)
     {
-        UShortValue::AutoPtr v = UShortValue::AutoPtr(new UShortValue);
+        UShortValue::AutoPtr v(new UShortValue);
         v->value_.push_back(value);
         value_ = v;
         return *this;
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index b70ea45..6e3b811 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -590,7 +590,7 @@ namespace Exiv2 {
 
     Image::AutoPtr newJpegInstance(BasicIo::AutoPtr io, bool create)
     {
-        Image::AutoPtr image = Image::AutoPtr(new JpegImage(io, create));
+        Image::AutoPtr image(new JpegImage(io, create));
         if (!image->good()) {
             image.reset();
         }
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index a7094b2..0a99978 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -211,7 +211,7 @@ namespace Exiv2 {
 
     OlympusMakerNote* OlympusMakerNote::create_(bool alloc) const
     {
-        AutoPtr makerNote = AutoPtr(new OlympusMakerNote(alloc));
+        AutoPtr makerNote(new OlympusMakerNote(alloc));
         assert(makerNote.get() != 0);
         makerNote->readHeader(header_.pData_, header_.size_, byteOrder_);
         return makerNote.release();
diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp
index 7d30a6b..d3bea19 100644
--- a/src/panasonicmn.cpp
+++ b/src/panasonicmn.cpp
@@ -227,7 +227,7 @@ namespace Exiv2 {
 
     PanasonicMakerNote* PanasonicMakerNote::create_(bool alloc) const
     {
-        AutoPtr makerNote = AutoPtr(new PanasonicMakerNote(alloc));
+        AutoPtr makerNote(new PanasonicMakerNote(alloc));
         assert(makerNote.get() != 0);
         makerNote->readHeader(header_.pData_, header_.size_, byteOrder_);
         return makerNote.release();
diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp
index 335de3d..2304082 100644
--- a/src/sigmamn.cpp
+++ b/src/sigmamn.cpp
@@ -140,7 +140,7 @@ namespace Exiv2 {
 
     SigmaMakerNote* SigmaMakerNote::create_(bool alloc) const
     {
-        AutoPtr makerNote = AutoPtr(new SigmaMakerNote(alloc));
+        AutoPtr makerNote(new SigmaMakerNote(alloc));
         assert(makerNote.get() != 0);
         makerNote->readHeader(header_.pData_, header_.size_, byteOrder_);
         return makerNote.release();
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index cf2fc95..ca0f15a 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -116,7 +116,7 @@ namespace Exiv2 {
 
     SonyMakerNote* SonyMakerNote::create_(bool alloc) const
     {
-        AutoPtr makerNote = AutoPtr(new SonyMakerNote(alloc));
+        AutoPtr makerNote(new SonyMakerNote(alloc));
         assert(makerNote.get() != 0);
         makerNote->readHeader(header_.pData_, header_.size_, byteOrder_);
         return makerNote.release();

-- 
exiv2 packaging