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

The following commit has been merged in the master branch:
commit 1977217534c237cd3e557d3175e6745a19e8729a
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 25 11:50:16 2016 +0000

    #1034. Corrections to r4249 to fix erroneous test suite messages.
---
 src/makernote.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index ddb061d..0f45e97 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -109,7 +109,7 @@ namespace Exiv2 {
 
     	std::string readExiv2Config(const std::string& section,const std::string& value,const std::string& def)
     	{
-   			std::string result;
+   			std::string result = def;
 	    	Exiv2::INIReader reader(Exiv2::Internal::getExiv2ConfigPath());
 
 			if (reader.ParseError() == 0) {

-- 
exiv2 packaging