[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=655b047

The following commit has been merged in the master branch:
commit 655b04751f6f897700f974950bc410d6502deb6a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun May 14 14:25:45 2006 +0000

    Updated MSVC project file, removed unnecessary floor function calls (fixes MSVC compilation problem), added missing #include "cassert"
---
 msvc/exiv2lib/exiv2lib.vcproj |  6 ++++++
 src/minoltamn.cpp             | 15 +++++++--------
 src/tiffcomposite.hpp         |  1 +
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index d12dc4a..d1066af 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -278,6 +278,9 @@
 				RelativePath="..\..\src\minoltamn.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\mrwimage.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src
ikonmn.cpp">
 			</File>
 			<File
@@ -517,6 +520,9 @@
 				RelativePath="..\..\src\minoltamn.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src\mrwimage.hpp">
+			</File>
+			<File
 				RelativePath="..\..\src
ikonmn.hpp">
 			</File>
 			<File
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index f3b0422..c2483fc 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -44,7 +44,6 @@ EXIV2_RCSID("@(#) $Id$");
 #include <sstream>
 #include <iomanip>
 #include <cassert>
-#include <cmath>
 
 // *****************************************************************************
 // class member definitions
@@ -441,21 +440,21 @@ namespace Exiv2 {
     std::ostream& MinoltaMakerNote::printMinoltaDateStd(std::ostream& os, const Value& value)
     {
         // From the PHP JPEG Metadata Toolkit
-        os << floor(value.toLong()/65536) << ":" << std::right << std::setw(2) << std::setfill('0')
-           << floor((value.toLong()-floor(value.toLong()/65536)*65536)/256) << ":" 
-           << std::right << std::setw(2) << std::setfill('0') << value.toLong()%256;  
+        os << value.toLong() / 65536 << ":" << std::right << std::setw(2) << std::setfill('0')
+           << (value.toLong() - value.toLong() / 65536 * 65536) / 256 << ":" 
+           << std::right << std::setw(2) << std::setfill('0') << value.toLong() % 256;  
         return os;
     }
 
     std::ostream& MinoltaMakerNote::printMinoltaTimeStd(std::ostream& os, const Value& value)
     {
         // From the PHP JPEG Metadata Toolkit
-        os << std::right << std::setw(2) << std::setfill('0') << floor(value.toLong()/65536) 
+        os << std::right << std::setw(2) << std::setfill('0') << value.toLong() / 65536 
            << ":" << std::right << std::setw(2) << std::setfill('0')
-           << floor((value.toLong()-floor(value.toLong()/65536)*65536)/256) << ":" 
-           << std::right << std::setw(2) << std::setfill('0') << value.toLong()%256;  
+           << (value.toLong() - value.toLong() / 65536 * 65536) / 256 << ":" 
+           << std::right << std::setw(2) << std::setfill('0') << value.toLong() % 256;
         return os;
-    }    
+    }
     
     std::ostream& MinoltaMakerNote::printMinoltaFlashExposureCompStd(std::ostream& os, const Value& value)
     {
diff --git a/src/tiffcomposite.hpp b/src/tiffcomposite.hpp
index f319185..d8364bb 100644
--- a/src/tiffcomposite.hpp
+++ b/src/tiffcomposite.hpp
@@ -38,6 +38,7 @@
 #include <iosfwd>
 #include <vector>
 #include <string>
+#include <cassert>
 
 // *****************************************************************************
 // namespace extensions

-- 
exiv2 packaging