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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:47:05 UTC 2017


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

The following commit has been merged in the master branch:
commit 86028dd46ee515e389b2762de430b89bd069d7db
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 27 18:47:54 2016 +0000

    #1233 Fixed issue on MacOS-X 10.4 (32 big big-endian PPC, 2003 OS) with realpath() and added additional images for future testing.
---
 FurnaceCreekInn1.jpg           | Bin 0 -> 35093 bytes
 samples/geotag.cpp             |   3 ++-
 test/data/FurnaceCreekInn2.jpg | Bin 0 -> 49660 bytes
 test/data/FurnaceCreekInn3.jpg | Bin 0 -> 44071 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/FurnaceCreekInn1.jpg b/FurnaceCreekInn1.jpg
new file mode 100644
index 0000000..7bafad7
Binary files /dev/null and b/FurnaceCreekInn1.jpg differ
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index e5ed73c..dd471f3 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -807,12 +807,13 @@ int main(int argc,const char* argv[])
                 if ( options.verbose ) printf("%s %s ",arg,types[type]) ;
                 if ( type == typeImage ) {
                     time_t t    = readImageTime(std::string(arg)) ;
+                    char   buffer[1024];
                     char*  path = realpath(arg,NULL);
                     if  ( t && path ) {
                         if ( options.verbose) printf("%s %ld %s",path,(long int)t,asctime(localtime(&t)));
                         gFiles.push_back(path);
                     }
-                    if ( path ) :: free((void*) path);
+                    if ( path && path != buffer ) :: free((void*) path);
                 }
                 if ( type == typeUnknown ) {
                     fprintf(stderr,"error: illegal syntax %s
",arg);
diff --git a/test/data/FurnaceCreekInn2.jpg b/test/data/FurnaceCreekInn2.jpg
new file mode 100644
index 0000000..4d6f377
Binary files /dev/null and b/test/data/FurnaceCreekInn2.jpg differ
diff --git a/test/data/FurnaceCreekInn3.jpg b/test/data/FurnaceCreekInn3.jpg
new file mode 100644
index 0000000..ca2873c
Binary files /dev/null and b/test/data/FurnaceCreekInn3.jpg differ

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list