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

The following commit has been merged in the master branch:
commit e65d7bbfe2ca53c268133f4db297108919a5df50
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Oct 11 01:17:20 2008 +0000

    Tweaks.
---
 src/preview.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/preview.cpp b/src/preview.cpp
index c1d84ea..89978b4 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -450,14 +450,14 @@ namespace Exiv2 {
         const byte *base = io.mmap();
 
         try {
-            Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(base + offset_, size_);
+            Image::AutoPtr image = ImageFactory::open(base + offset_, size_);
             if (image.get() == 0) return false;
             image->readMetadata();
 
             width_ = image->pixelWidth();
             height_ = image->pixelHeight();
         }
-        catch (const Exiv2::AnyError& error) {
+        catch (const AnyError& error) {
             return false;
         }
 
@@ -519,21 +519,20 @@ namespace Exiv2 {
         buf.pData_[0] = 0xff; // fix Minolta thumbnails with invalid jpeg header
 
         try {
-            Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(buf.pData_, buf.size_);
+            Image::AutoPtr image = ImageFactory::open(buf.pData_, buf.size_);
             if (image.get() == 0) return false;
             image->readMetadata();
 
             width_ = image->pixelWidth();
             height_ = image->pixelHeight();
         }
-        catch (const Exiv2::AnyError& error) {
+        catch (const AnyError& error) {
             return false;
         }
 
         return true;
     }
 
-
     LoaderTiff::LoaderTiff(PreviewId id, const Image &image, int parIdx)
         : Loader(id, image),
           group_(param_[parIdx].group_)

-- 
exiv2 packaging