[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=0312a8e

The following commit has been merged in the master branch:
commit 0312a8ee0b7002835f2b86d6a486af983bbb84e4
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 4 12:38:03 2014 +0000

    Issue: 984.  Thanks, Thomas.  I should not have modified your code.  You were correct.  My apologies.
---
 src/basicio.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index fc06e5a..44b50a9 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -722,6 +722,7 @@ namespace Exiv2 {
                     ReplaceFileW_t pfcn_ReplaceFileW = (ReplaceFileW_t)GetProcAddress(hKernel, "ReplaceFileW");
                     if (pfcn_ReplaceFileW) {
                         BOOL ret = pfcn_ReplaceFileW(wpf, fileIo->wpath().c_str(), NULL, REPLACEFILE_IGNORE_MERGE_ERRORS, NULL, NULL);
+                        FreeLibrary(hKernel);
                         if (ret == 0) {
                             if (GetLastError() == ERROR_FILE_NOT_FOUND) {
                                 if (::_wrename(fileIo->wpath().c_str(), wpf) == -1) {
@@ -735,6 +736,7 @@ namespace Exiv2 {
                         }
                     }
                     else {
+                        FreeLibrary(hKernel);
                         if (fileExists(wpf) && ::_wremove(wpf) != 0) {
                             throw WError(2, wpf, strError().c_str(), "::_wremove");
                         }
@@ -743,7 +745,6 @@ namespace Exiv2 {
                         }
                         ::_wremove(fileIo->wpath().c_str());
                     }
-                    FreeLibrary(hKernel);
                 }
 #else
                 if (fileExists(wpf) && ::_wremove(wpf) != 0) {

-- 
exiv2 packaging