Bug #555 ยป gcc4.3.diff
| exiv2-0.17.new/src/basicio.cpp 2008-06-10 20:47:20.000000000 +1000 | ||
|---|---|---|
| 428 | 428 |
// Minimum size for 1st block is 32kB |
| 429 | 429 |
long size = std::max(32768 * (1 + need / 32768), size_); |
| 430 | 430 |
byte* data = (byte*)std::malloc(size); |
| 431 |
std::memcpy(data, data_, size_);
|
|
| 431 |
memcpy(data, data_, size_); |
|
| 432 | 432 |
data_ = data; |
| 433 | 433 |
sizeAlloced_ = size; |
| 434 | 434 |
isMalloced_ = true; |
| exiv2-0.17.new/xmpsdk/src/XMPCore_Impl.hpp 2008-06-10 20:49:53.000000000 +1000 | ||
|---|---|---|
| 90 | 90 |
#define kHexDigits "0123456789ABCDEF" |
| 91 | 91 | |
| 92 | 92 |
#define XMP_LitMatch(s,l) (std::strcmp((s),(l)) == 0) |
| 93 |
#define XMP_LitNMatch(s,l,n) (std::strncmp((s),(l),(n)) == 0)
|
|
| 93 |
#define XMP_LitNMatch(s,l,n) (strncmp((s),(l),(n)) == 0) |
|
| 94 | 94 |
// *** Use the above macros! |
| 95 | 95 | |
| 96 | 96 |
#define kTab ((char)0x09) |
| ... | ... | |
| 370 | 370 |
IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix ) |
| 371 | 371 |
{
|
| 372 | 372 |
bool isPrefix = false; |
| 373 |
XMP_StringLen prefixLen = std::strlen(prefix);
|
|
| 373 |
XMP_StringLen prefixLen = strlen(prefix); |
|
| 374 | 374 |
if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) {
|
| 375 | 375 |
char separator = fullPath[prefixLen]; |
| 376 | 376 |
if ( (separator == 0) || (separator == '/') || |
| exiv2-0.17.new/xmpsdk/src/XMPMeta.cpp 2008-06-10 20:47:20.000000000 +1000 | ||
|---|---|---|
| 20 | 20 |
#include "UnicodeInlines.incl_cpp" |
| 21 | 21 |
#include "UnicodeConversions.hpp" |
| 22 | 22 | |
| 23 |
#include <cstring> |
|
| 24 | ||
| 23 | 25 |
#if XMP_DebugBuild |
| 24 | 26 |
#include <iostream> |
| 25 | 27 |
#endif |