[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=20778cb

The following commit has been merged in the master branch:
commit 20778cbd7d53f71324cf063608712ecb2430d071
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Dec 7 04:10:52 2010 +0000

    msvc64.  Added build type (64 or 32) to exiv2 -V output.  A couple of changes to compile with DevStudio x64
---
 src/basicio.cpp  | 2 +-
 src/exiv2.cpp    | 8 +++++---
 src/jpgimage.cpp | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index 44c2a70..e1c803f 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -382,7 +382,7 @@ namespace Exiv2 {
                 throw Error(2, path(), "MSG2", "DuplicateHandle");
             }
         }
-        p_->hMap_ = CreateFileMapping(p_->hFile_, 0, flProtect, 0, p_->mappedLength_, 0);
+        p_->hMap_ = CreateFileMapping(p_->hFile_, 0, flProtect, 0, (DWORD) p_->mappedLength_, 0);
         if (p_->hMap_ == 0 ) {
 #ifdef EXV_UNICODE_PATH
             if (p_->wpMode_ == Impl::wpUnicode) {
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 6770c14..ae45599 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -205,7 +205,9 @@ void Params::cleanup()
 
 void Params::version(std::ostream& os) const
 {
-    os << EXV_PACKAGE_STRING << "
"
+    bool  b64    = sizeof(void*)==8;
+    char* sBuild = b64 ? " (64 bit build)" : " (32 bit build)" ;
+    os << EXV_PACKAGE_STRING << sBuild << "
"
        << _("Copyright (C) 2004-2010 Andreas Huggel.
")
        << "
"
        << _("This program is free software; you can redistribute it and/or
"
@@ -904,7 +906,7 @@ namespace {
             case 'p':
             {
                 if (strcmp(action.c_str(), "extract") == 0) {
-                    i += parsePreviewNumbers(Params::instance().previewNumbers_, optarg, i + 1);
+                    i += (size_t) parsePreviewNumbers(Params::instance().previewNumbers_, optarg, (int) i + 1);
                     target |= Params::ctPreview;
                     break;
                 }
@@ -957,7 +959,7 @@ namespace {
         }
         std::cout << std::endl;
 #endif
-        return k - j;
+        return (int) (k - j);
     } // parsePreviewNumbers
 
     bool parseCmdFiles(ModifyCmds& modifyCmds,
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 614aa94..0ca21eb 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -392,7 +392,7 @@ namespace Exiv2 {
                 // Append to psBlob
                 append(psBlob, psData.pData_, psData.size_);
                 // Check whether psBlob is complete
-                if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0], psBlob.size())) {
+                if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0], (long) psBlob.size())) {
                     --search;
                     foundCompletePsData = true;
                 }
@@ -582,7 +582,7 @@ namespace Exiv2 {
                 // Append to psBlob
                 append(psBlob, psData.pData_, psData.size_);
                 // Check whether psBlob is complete
-                if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0], psBlob.size())) {
+                if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0],(long) psBlob.size())) {
                     foundCompletePsData = true;
                 }
             }
@@ -626,7 +626,7 @@ namespace Exiv2 {
         }
 
         if (!foundCompletePsData && skipApp13Ps3.size() > 0) throw Error(22);
-        search += skipApp13Ps3.size();
+        search += (int) skipApp13Ps3.size();
 
         if (comPos == 0) {
             if (marker == eoi_) comPos = count;
@@ -722,7 +722,7 @@ namespace Exiv2 {
                     // Set the new IPTC IRB, keeps existing IRBs but removes the
                     // IPTC block if there is no new IPTC data to write
                     DataBuf newPsData = Photoshop::setIptcIrb(psBlob.size() > 0 ? &psBlob[0] : 0,
-                                                              psBlob.size(),
+                                                              (long) psBlob.size(),
                                                               iptcData_);
                     const long maxChunkSize = 0xffff - 16;
                     const byte* chunkStart = newPsData.pData_;

-- 
exiv2 packaging