third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1152 Fix submitted. Also added new static function FileIo::temporaryPath() which I require for tgt - code and fixed typo in tiffvisitor.cpp

Browse Source
This commit is contained in:
Robin Mills 2016-01-11 10:03:48 +00:00
parent b703575389
commit 04f871cc4c
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/exiv2/basicio.hpp
View File

@ -544,6 +544,11 @@ namespace Exiv2 {
virtual void populateFakeData();
//@}
/*!
@brief Returns the path to a temporary data storage location.
*/
static std::string temporaryPath();
private:
// NOT IMPLEMENTED
//! Copy constructor

28
src/basicio.cpp
View File

@ -273,7 +273,7 @@ namespace Exiv2 {
# if defined(EXV_UNICODE_PATH)
# error No xattr API for MacOS X with unicode support
# endif
const ssize_t namebufSize = ::listxattr(src.p_->path_.c_str(), 0, 0, 0);
ssize_t namebufSize = ::listxattr(src.p_->path_.c_str(), 0, 0, 0);
if (namebufSize < 0) {
throw Error(2, src.p_->path_, strError(), "listxattr");
}
@ -282,7 +282,7 @@ namespace Exiv2 {
return;
}
char* namebuf = new char[namebufSize];
if (::listxattr(src.p_->path_.c_str(), namebuf, sizeof(namebuf), 0) != namebufSize) {
if (::listxattr(src.p_->path_.c_str(), namebuf, namebufSize, 0) != namebufSize) {
throw Error(2, src.p_->path_, strError(), "listxattr");
}
for (ssize_t namebufPos = 0; namebufPos < namebufSize;) {
@ -293,7 +293,7 @@ namespace Exiv2 {
throw Error(2, src.p_->path_, strError(), "getxattr");
}
char* value = new char[valueSize];
if (::getxattr(src.p_->path_.c_str(), name, value, sizeof(value), 0, 0) != valueSize) {
if (::getxattr(src.p_->path_.c_str(), name, value, valueSize, 0, 0) != valueSize) {
throw Error(2, src.p_->path_, strError(), "getxattr");
}
// #906. Mountain Lion 'sandbox' terminates the app when we call setxattr
@ -619,6 +619,28 @@ namespace Exiv2 {
return basicIo;
}
std::string FileIo::temporaryPath()
{
static int count = 0 ;
char sCount[12];
sprintf(sCount,"_%d",count++);
#ifdef _MSC_VER
char lpTempPathBuffer[MAX_PATH];
GetTempPath(MAX_PATH,lpTempPathBuffer);
std::string tmp(lpTempPathBuffer);
tmp += "\\";
#else
std::string tmp = "/tmp/";
#endif
pid_t pid = ::getpid();
std::string result = tmp + toString(pid) + sCount ;
if ( Exiv2::fileExists(result) ) std::remove(result.c_str());
return result;
}
long FileIo::write(const byte* data, long wcount)
{
assert(p_->fp_ != 0);

2
src/tiffvisitor.cpp
View File

@ -1541,7 +1541,7 @@ namespace Exiv2 {
// Sadly: we don't know the exact location of the image in the source (it's near offset)
// And neither TiffReader nor TiffEntryBase have access to the BasicIo object being processed
byte* buffer = (byte*) ::malloc(isize);
::memset(buffer,isize,0);
::memset(buffer,0,isize);
v->read(buffer,isize, byteOrder());
::free(buffer);
}