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

Minor cleanup (memset -> std::memset, memcpy -> std::memcpy).

Browse Source
This commit is contained in:
Andreas Huggel
2007-09-24 14:30:10 +00:00
parent 91c4dafbf9
commit 52ddfc5938
19 changed files with 87 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/minoltamn.cpp
+5 -4
View File
@@ -44,6 +44,7 @@ EXIV2_RCSID("@(#) $Id$")
#include <sstream>
#include <iomanip>
#include <cassert>
#include <cstring>
// *****************************************************************************
// class member definitions
@@ -1434,7 +1435,7 @@ namespace Exiv2 {
long MinoltaMakerNote::assemble(Entry& e, IfdId ifdId, uint16_t tag, ByteOrder /*byteOrder*/) const
{
DataBuf buf(1024);
memset(buf.pData_, 0x0, 1024);
std::memset(buf.pData_, 0x0, 1024);
uint16_t len = 0;
Entries::const_iterator end = entries_.end();
for (Entries::const_iterator i = entries_.begin(); i != end; ++i) {
@@ -1442,7 +1443,7 @@ namespace Exiv2 {
uint16_t pos = i->tag() * 2;
uint16_t size = pos + static_cast<uint16_t>(i->size());
assert(size <= 1024);
memcpy(buf.pData_ + pos, i->data(), i->size());
std::memcpy(buf.pData_ + pos, i->data(), i->size());
if (len < size) len = size;
}
}
@@ -1459,7 +1460,7 @@ namespace Exiv2 {
long MinoltaMakerNote::assembleStd(Entry& e, IfdId ifdId, uint32_t tag, ByteOrder /*byteOrder*/) const
{
DataBuf buf(1024);
memset(buf.pData_, 0x0, 1024);
std::memset(buf.pData_, 0x0, 1024);
uint32_t len = 0;
Entries::const_iterator end = entries_.end();
for (Entries::const_iterator i = entries_.begin(); i != end; ++i) {
@@ -1467,7 +1468,7 @@ namespace Exiv2 {
uint32_t pos = i->tag() * 4;
uint32_t size = pos + static_cast<uint32_t>(i->size());
assert(size <= 1024);
memcpy(buf.pData_ + pos, i->data(), i->size());
std::memcpy(buf.pData_ + pos, i->data(), i->size());
if (len < size) len = size;
}
}