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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:43:34 UTC 2017


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

The following commit has been merged in the master branch:
commit e29c2047b6c91987be81ac9b79a555317faf665a
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Jan 6 19:36:24 2013 +0000

    Fix: http://dev.exiv2.org/boards/3/topics/1337 extended to handle Exif.Pentax.Temperature. Thanks Norbert finding this.
---
 src/tiffcomposite.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index c26a8b3..9dceb57 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -1846,10 +1846,12 @@ namespace Exiv2 {
         if (tag == 0x9286 && group == exifId && ti == undefined) {
             ti = comment;
         }
-        // http://dev.exiv2.org/boards/3/topics/1337
-        // Exif.NikonAFT.AFFineTuneAdj should be signedByte
-        if ( tag == 0x0002 && group == nikonAFTId && ti == unsignedByte ) {
-            ti = signedByte;
+        // http://dev.exiv2.org/boards/3/topics/1337 change unsignedByte to signedByte
+        // Exif.NikonAFT.AFFineTuneAdj || Exif.Pentax.Temperature
+		if ( ti == Exiv2::unsignedByte ) {
+		    if ( (tag == 0x0002 && group == nikonAFTId ) || (tag == 0x0047 && group == pentaxId) ) {
+				ti = Exiv2::signedByte;
+			}
         }
         return ti;
     }

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list