[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:05 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c2ee400
The following commit has been merged in the master branch:
commit c2ee4008756d99bbb0b3e091d04ae732cf08ecb8
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Jan 6 16:37:43 2010 +0000
#672: Fixed issue with C-string pointer of a temporary.
---
src/basicio.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 44e10ff..bec9c75 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -442,16 +442,20 @@ namespace Exiv2 {
bool statOk = true;
mode_t origStMode = 0;
- char* pf = 0;
+ std::string spf;
+ const char* pf = 0;
#ifdef EXV_UNICODE_PATH
- wchar_t* wpf = 0;
+ std::wstring wspf;
+ const wchar_t* wpf = 0;
if (p_->wpMode_ == Impl::wpUnicode) {
- wpf = const_cast<wchar_t*>(wpath().c_str());
+ wspf = wpath();
+ wpf = wspf.c_str();
}
else
#endif
{
- pf = const_cast<char*>(path().c_str());
+ spf = path();
+ pf = spf.c_str();
}
// Get the permissions of the file, or linked-to file, on platforms which have lstat
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list