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

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


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

The following commit has been merged in the master branch:
commit 918059aa241cc9b034606f7733e413c07add285b
Author: tbeu <mail at tbeu.de>
Date:   Thu Aug 18 19:51:39 2016 +0000

    Fix initialization of TiffBinaryElement members in ctor
    
    As reported by Cppcheck
---
 src/tiffcomposite.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index e7a2ea6..12b1c86 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -172,8 +172,12 @@ namespace Exiv2 {
     }
 
     TiffBinaryElement::TiffBinaryElement(uint16_t tag, IfdId group)
-        : TiffEntryBase(tag, group)
+        : TiffEntryBase(tag, group),
+        elByteOrder_(invalidByteOrder)
     {
+        elDef_.idx_ = 0;
+        elDef_.tiffType_ = ttUndefined;
+        elDef_.count_ = 0;
     }
 
     TiffComponent::~TiffComponent()
@@ -1843,10 +1847,10 @@ namespace Exiv2 {
         }
         // 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;
-			}
+        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