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

The following commit has been merged in the master branch:
commit b8e809195c1be8cef6dbe20b95d72598eb594eac
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Apr 21 08:11:47 2005 +0000

    Fixed MSVC compilation
---
 msvc/exiv2lib/exiv2lib.vcproj | 18 ++++++++++++++++++
 src/canonmn.cpp               |  8 ++++----
 src/nikonmn.cpp               |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index c254056..b40b704 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -290,6 +290,21 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\sonymn.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\src	ags.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -394,6 +409,9 @@
 				RelativePath="..\..\src\sigmamn.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src\sonymn.hpp">
+			</File>
+			<File
 				RelativePath="..\..\src	ags.hpp">
 			</File>
 			<File
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 7d2ee9c..32b60b9 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -900,16 +900,16 @@ namespace {
             val = -val;
         }
         // remove fraction
-        float frac = val & 0x1f;
+        float frac = static_cast<float>(val & 0x1f);
         val -= long(frac);
         // convert 1/3 (0x0c) and 2/3 (0x14) codes
         if (frac == 0x0c) {
-            frac = 32.0 / 3;
+            frac = 32.0f / 3;
         }
         else if (frac == 0x14) {
-            frac = 64.0 / 3;
+            frac = 64.0f / 3;
         }
-        return sign * (val + frac) / 32.0;
+        return sign * (val + frac) / 32.0f;
     }
 
 }
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 4f8d460..e334659 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -635,7 +635,7 @@ namespace Exiv2 {
     {
         // Decoded by Robert Rottmerhusen <email at rottmerhusen.com>
         if (value.size() != 4) return os << "(" << value << ")";
-        float a = value.toLong(0);
+        float a = value.toFloat(0);
         long  b = value.toLong(1);
         long  c = value.toLong(2);
         if (c == 0) return os << "(" << value << ")";

-- 
exiv2 packaging