[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=66fd2d3

The following commit has been merged in the master branch:
commit 66fd2d3272f87a270b5ea7972d64b0d3e6bb7098
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Jun 9 09:08:52 2016 +0000

    Correction to r4316 to deal with msvc build breaker.
---
 src/tiffimage.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 983744a..a93e142 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -585,13 +585,13 @@ namespace Exiv2 {
                         IptcData::printStructure(out,bytes,count,depth);
                         delete[] bytes;                // free
                     }  else if ( option == kpsRecursive && tag == 0x927c /* MakerNote */ && count > 10) {
-                        size_t   jump=10;
+                        size_t   jump= 10           ;
+                        byte     bytes[20]          ;
+                        const char* chars = (const char*) &bytes[0] ;
                         size_t   restore = io.tell();  // save
                         io.seek(offset,BasicIo::beg);  // position
-                        byte     bytes[jump+1]      ;
-                        const char* chars = (const char*) &bytes ;
                         io.read(bytes,jump    )     ;  // read
-                        bytes[jump]=0;
+                        bytes[jump]=0               ;
                         if ( ::strcmp("Nikon",chars) == 0 ) {
                             printTiffStructure(io,out,option,depth,offset+jump);
                         }

-- 
exiv2 packaging