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

The following commit has been merged in the master branch:
commit f3a62630b2e89b7ec234698ec5ab15cba5305206
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Sep 8 15:41:12 2005 +0000

    Fixed bug #437, added "Raw" image quality
---
 src/canonmn.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index d723a21..3ff4871 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -452,6 +452,7 @@ namespace Exiv2 {
                                               const Value& value)
     {
         std::string n = value.toString();
+        if (n.length() < 4) return os << "(" << n << ")";
         return os << n.substr(0, n.length() - 4) << "-" 
                   << n.substr(n.length() - 4);
     }
@@ -503,6 +504,7 @@ namespace Exiv2 {
         switch (l) {
         case 2: os << "Normal"; break;
         case 3: os << "Fine"; break;
+        case 4: os << "Raw"; break;
         case 5: os << "Superfine"; break;
         default: os << "(" << l << ")"; break;
         }
@@ -770,6 +772,7 @@ namespace Exiv2 {
         if (value.count() < 3) return os << value;
 
         float fu = value.toFloat(2);
+        if (fu == 0.0) return os << value;
         float len1 = value.toLong(0) / fu;
         float len2 = value.toLong(1) / fu;
         std::ostringstream oss;

-- 
exiv2 packaging