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

The following commit has been merged in the master branch:
commit e32800a9df623271718d6f02d78a82c64a00e1a2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Apr 9 10:44:18 2006 +0000

    Added TIFF image and parser to exiv2lib, fixed MSVC 7.1 compilation errors
---
 msvc/exiv2lib/exiv2lib.vcproj | 36 ++++++++++++++++++++++++++++++++++++
 src/tiffimage.cpp             |  2 +-
 src/tiffparser.cpp            |  9 ++++++---
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 9cfc6e8..357d359 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -353,6 +353,36 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src	iffimage.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	iffparser.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	ypes.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -457,6 +487,12 @@
 				RelativePath="..\..\src	ags.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src	iffimage.hpp">
+			</File>
+			<File
+				RelativePath="..\..\src	iffparser.hpp">
+			</File>
+			<File
 				RelativePath="..\..\src	ypes.hpp">
 			</File>
 			<File
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index ad7c35a..64a6cae 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -210,7 +210,7 @@ namespace Exiv2 {
 
     bool isTiffType(BasicIo& iIo, bool advance)
     {
-        const uint32_t len = 8;
+        const int32_t len = 8;
         byte buf[len];
         iIo.read(buf, len);
         if (iIo.error() || iIo.eof()) {
diff --git a/src/tiffparser.cpp b/src/tiffparser.cpp
index e959d63..02e1a6a 100644
--- a/src/tiffparser.cpp
+++ b/src/tiffparser.cpp
@@ -268,8 +268,10 @@ namespace Exiv2 {
                                 const std::string& prefix) const
     {
         os << prefix << groupName() << " directory with " 
-           << std::dec << components_.size()
-           << (components_.size() == 1 ? " entry:
" : " entries:
");
+        // cast to make MSVC happy
+           << std::dec << static_cast<unsigned int>(components_.size());
+        if (components_.size() == 1) os << " entry:
";
+        else os << " entries:
";
         Components::const_iterator b = components_.begin();
         Components::const_iterator e = components_.end();
         for (Components::const_iterator i = b; i != e; ++i) {
@@ -516,7 +518,8 @@ namespace Exiv2 {
                           << std::setfill('0') << std::hex << object->offset()
                           << ", size = " << std::dec << object->size()
                           << ", exceeds buffer size by "
-                          << object->pData() + object->size() - pLast_
+                // cast to make MSVC happy
+                          << static_cast<uint32_t>(object->pData() + object->size() - pLast_)
                           << " Bytes; adjusting the size
";
 #endif
                 object->size_ = size_ - object->offset();

-- 
exiv2 packaging