[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=10681d6

The following commit has been merged in the master branch:
commit 10681d6c3e11f5aa7352d014609aaf2e0ef731ec
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Feb 6 15:00:23 2007 +0000

    Spring-cleaning of the Image class hierarchy: Image now has containers and provides default implementations for most methods.
---
 src/cr2image.cpp  |  65 +---------------------
 src/cr2image.hpp  |  79 ++++----------------------
 src/crwimage.cpp  |  67 ++--------------------
 src/crwimage.hpp  |  82 +++++----------------------
 src/image.cpp     |  80 +++++++++++++++++++++++++-
 src/image.hpp     | 164 ++++++++++++++++++++++++++++++++----------------------
 src/jpgimage.cpp  |  75 ++-----------------------
 src/jpgimage.hpp  | 126 +++++++++++++++++------------------------
 src/mrwimage.cpp  |  65 +---------------------
 src/mrwimage.hpp  |  77 ++++---------------------
 src/pngimage.cpp  |  71 ++---------------------
 src/pngimage.hpp  |  80 ++++----------------------
 src/rafimage.cpp  |  65 +---------------------
 src/rafimage.hpp  |  77 ++++---------------------
 src/tiffimage.cpp |  73 ++----------------------
 src/tiffimage.hpp |  73 +++---------------------
 16 files changed, 319 insertions(+), 1000 deletions(-)

diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 6a98110..9360787 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -87,64 +87,11 @@ namespace Exiv2 {
         return decoderFct;
     }
 
-    Cr2Image::Cr2Image(BasicIo::AutoPtr io, bool create)
-        : Image(mdExif | mdIptc), io_(io)
+    Cr2Image::Cr2Image(BasicIo::AutoPtr io, bool /*create*/)
+        : Image(ImageType::cr2, mdExif | mdIptc, io)
     {
-        if (create) {
-            IoCloser closer(*io_);
-            io_->open();
-        }
     } // Cr2Image::Cr2Image
 
-    bool Cr2Image::good() const
-    {
-        if (io_->open() != 0) return false;
-        IoCloser closer(*io_);
-        return isThisType(*io_, false);
-    }
-
-    AccessMode Cr2Image::checkMode(MetadataId metadataId) const
-    {
-        return ImageFactory::checkMode(ImageType::cr2, metadataId);
-    }
-
-    void Cr2Image::clearMetadata()
-    {
-        clearExifData();
-        clearIptcData();
-    }
-
-    void Cr2Image::setMetadata(const Image& image)
-    {
-        setExifData(image.exifData());
-        setIptcData(image.iptcData());
-    }
-
-    void Cr2Image::clearExifData()
-    {
-        exifData_.clear();
-    }
-
-    void Cr2Image::setExifData(const ExifData& exifData)
-    {
-        exifData_ = exifData;
-    }
-
-    void Cr2Image::clearIptcData()
-    {
-        iptcData_.clear();
-    }
-
-    void Cr2Image::setIptcData(const IptcData& iptcData)
-    {
-        iptcData_ = iptcData;
-    }
-
-    void Cr2Image::clearComment()
-    {
-        // not supported, do nothing
-    }
-
     void Cr2Image::setComment(const std::string& /*comment*/)
     {
         // not supported
@@ -161,7 +108,7 @@ namespace Exiv2 {
         }
         IoCloser closer(*io_);
         // Ensure that this is the correct image type
-        if (!isThisType(*io_, false)) {
+        if (!isCr2Type(*io_, false)) {
             if (io_->error() || io_->eof()) throw Error(14);
             throw Error(3, "CR2");
         }
@@ -179,11 +126,6 @@ namespace Exiv2 {
         throw(Error(31, "metadata", "CR2"));
     } // Cr2Image::writeMetadata
 
-    bool Cr2Image::isThisType(BasicIo& iIo, bool advance) const
-    {
-        return isCr2Type(iIo, advance);
-    }
-
     const uint16_t Cr2Header::tag_ = 42;
     const char* Cr2Header::cr2sig_ = "CR

-- 
exiv2 packaging