[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=2712082

The following commit has been merged in the master branch:
commit 271208255579bca9a4321f65c9b1b926e44c73a1
Author: Robin Mills <robin at clanmills.com>
Date:   Fri May 1 09:16:31 2015 +0000

    #922  Rollback r3771.  Very troublesome feature.  bugfixed #922 is looping Linux.  PNG Has endian issues on MM/PowerPC
---
 src/image.cpp               |   6 +++---
 test/bugfixes-test.sh       |  11 +++--------
 test/data/bugfixes-test.out | Bin 1838738 -> 1827317 bytes
 test/data/exiv2-bug922.png  | Bin 131388 -> 0 bytes
 test/data/exiv2-bug922.tif  | Bin 7780 -> 0 bytes
 test/data/exiv2-bug922a.jpg | Bin 7169623 -> 0 bytes
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index 2a6afdb..b2f1dee 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -360,14 +360,14 @@ namespace Exiv2 {
     {
         std::string result;
 
-        int     need   = (int) std::strlen(format)*4;          // initial guess
+        int     need   = (int) std::strlen(format)*2;          // initial guess
         char*   buffer = NULL;
         int     again  =    4;
         int     rc     =   -1;
 
         while (rc < 0 && again--) {
             if ( buffer ) delete[] buffer;
-            need  *= 2 ;
+            need   *= 2 ;
             buffer = new char[need];
             if ( buffer ) {
                 va_list  args;                                 // variable arg list
@@ -377,7 +377,7 @@ namespace Exiv2 {
             }
         }
 
-        if ( buffer && rc > 0 ) result = std::string(buffer);  // save the result
+        if ( rc > 0 ) result = std::string(buffer) ;
         if ( buffer ) delete[] buffer;                         // free buffer
         return result;
     }
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index f79407d..edfd9b7 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -268,16 +268,11 @@ source ./functions.source
 	filename=exiv2-bug$num.jpg
 	printf "$num " >&3
 	echo '------>' Bug $num '<-------' >&2
-	copyTestFile      $filename
-	runTest exiv2 -pX $filename ; echo '' # add a lf after the XMP/xml
+	copyTestFile  $filename
+	runTest exiv2 -pX $filename
 	filename=iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
-	copyTestFile      $filename
+	copyTestFile  $filename
 	runTest exiv2 -pX $filename
-	for filename in exiv2-bug$num.png exiv2-bug$num.tif exiv2-bug${num}a.jpg; do
-		copyTestFile $filename ;
-		runTest exiv2 -pX $filename ; echo ''
-		runTest exiv2 -pS $filename
-	done
 
 	num=937
 	filename=exiv2-bug$num.jpg
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 2908875..6c2cd34 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug922.png b/test/data/exiv2-bug922.png
deleted file mode 100644
index c068d8a..0000000
Binary files a/test/data/exiv2-bug922.png and /dev/null differ
diff --git a/test/data/exiv2-bug922.tif b/test/data/exiv2-bug922.tif
deleted file mode 100755
index b006201..0000000
Binary files a/test/data/exiv2-bug922.tif and /dev/null differ
diff --git a/test/data/exiv2-bug922a.jpg b/test/data/exiv2-bug922a.jpg
deleted file mode 100644
index 5a40a2e..0000000
Binary files a/test/data/exiv2-bug922a.jpg and /dev/null differ

-- 
exiv2 packaging