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

The following commit has been merged in the master branch:
commit f1362f92503b49003c5d2722b98807de71ae8e94
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Apr 27 20:34:13 2015 +0000

    #922.  Don't remove blank lines from XMP.  This is not Exiv2's business.  -pX extracts XMP packet without modification.
---
 src/jpgimage.cpp            |  24 ------------------------
 test/data/bugfixes-test.out | Bin 1825269 -> 1827317 bytes
 2 files changed, 24 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 7c7fb80..8349c4f 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -619,31 +619,7 @@ namespace Exiv2 {
                             }
                             xmp[size]=0;
 
-#if 1
                             out << xmp + start; // this is all we need to output without the blank line dance.
-#else
-                            // #922:  Remove blank lines.
-                            // cut the xmp into (non blank) lines
-                            std::vector<std::string> lines ;
-                            std::string s((char*)xmp+start);
-                            char nl      = '
';
-
-                            while( s.length() )
-                            {
-                                std::size_t end = s.find(nl);
-                                if ( end != std::string::npos )
-                                {
-                                    std::string line = s.substr(0,end);
-                                    if ( !isBlank(line) )
-                                        lines.push_back(line+nl);
-                                    s = s.substr(end+1,std::string::npos);
-                                } else {
-                                    lines.push_back(s);
-                                    s="";
-                                }
-                            }
-                            for ( size_t l = 0 ; l < lines.size() ; l++  ) out << lines[l];
-#endif
                             delete [] xmp;
                             bufRead = size;
                         }
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index db7c085..6c2cd34 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging