[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:45:52 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=eb32148

The following commit has been merged in the master branch:
commit eb321481b77aa462943e6e9b40ea4d26abed5e63
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Nov 11 21:11:58 2015 +0000

    #816.  Correction to 4012.  Fix msvc build breaker
---
 src/pentaxmn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index be965d8..4e80743 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -1344,9 +1344,9 @@ sub PrintLensID($$@)
    std::ostream& printLensType(std::ostream& os, const Value& value,
                                                  const ExifData* metadata)
    {
-        size_t index = value.toLong(0)*256+value.toLong(1);
+        unsigned long index = value.toLong(0)*256+value.toLong(1);
    		// std::cout << std::endl << "printLensType value =" << value.toLong() << " index = " << index << std::endl;
-        const LensIdFct* lif = find(lensIdFct, index) ; // value.toLong());
+        const LensIdFct* lif = find(lensIdFct, index);
         if (!lif) {
            return EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)(os, value, metadata);
         }

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list