[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=0cc97c7

The following commit has been merged in the master branch:
commit 0cc97c7f2390abc0bbac145601cdce169e90277d
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Jun 13 05:49:40 2016 +0000

    #1189 Use in-memory file to dump Nikon MakerNote tag 0x927c
---
 src/tiffimage.cpp           |   7 ++++++-
 test/data/bugfixes-test.out | Bin 1901123 -> 1911273 bytes
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 1308839..b98693b 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -593,7 +593,12 @@ namespace Exiv2 {
                         io.read(bytes,jump    )     ;  // read
                         bytes[jump]=0               ;
                         if ( ::strcmp("Nikon",chars) == 0 ) {
-                            printTiffStructure(io,out,option,depth,(size_t)(offset+jump));
+                        	// tag is an embedded tiff
+                            byte* bytes=new byte[count-jump] ;  // allocate memory
+                            io.read(bytes,count-jump)        ;  // read
+                            MemIo memIo(bytes,count-jump)    ;  // create a file
+                            printTiffStructure(memIo,out,option,depth);
+                            delete[] bytes                   ;  // free
                         }
                         io.seek(restore,BasicIo::beg); // restore
                     }
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 40f6f27..823584c 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging