|
Line
Link Here
|
| 0 |
-- a/xmpsdk/src/XMPCore_Impl.hpp |
0 |
++ b/xmpsdk/src/XMPCore_Impl.hpp |
|
Lines 24-29
Link Here
|
| 24 |
#include <map> |
24 |
#include <map> |
| 25 |
|
25 |
|
| 26 |
#include <cassert> |
26 |
#include <cassert> |
|
|
27 |
#include <cstring> |
| 27 |
|
28 |
|
| 28 |
#if XMP_MacBuild |
29 |
#if XMP_MacBuild |
| 29 |
#include <Multiprocessing.h> |
30 |
#include <Multiprocessing.h> |
|
Lines 89-95
Link Here
|
| 89 |
#define kHexDigits "0123456789ABCDEF" |
90 |
#define kHexDigits "0123456789ABCDEF" |
| 90 |
|
91 |
|
| 91 |
#define XMP_LitMatch(s,l) (std::strcmp((s),(l)) == 0) |
92 |
#define XMP_LitMatch(s,l) (std::strcmp((s),(l)) == 0) |
| 92 |
#define XMP_LitNMatch(s,l,n) (std::strncmp((s),(l),(n)) == 0) |
93 |
#define XMP_LitNMatch(s,l,n) (strncmp((s),(l),(n)) == 0) |
| 93 |
// *** Use the above macros! |
94 |
// *** Use the above macros! |
| 94 |
|
95 |
|
| 95 |
#define kTab ((char)0x09) |
96 |
#define kTab ((char)0x09) |
|
Lines 369-375
Link Here
|
| 369 |
IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix ) |
370 |
IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix ) |
| 370 |
{ |
371 |
{ |
| 371 |
bool isPrefix = false; |
372 |
bool isPrefix = false; |
| 372 |
XMP_StringLen prefixLen = std::strlen(prefix); |
373 |
XMP_StringLen prefixLen = strlen(prefix); |
| 373 |
if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) { |
374 |
if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) { |
| 374 |
char separator = fullPath[prefixLen]; |
375 |
char separator = fullPath[prefixLen]; |
| 375 |
if ( (separator == 0) || (separator == '/') || |
376 |
if ( (separator == 0) || (separator == '/') || |
| 376 |
-- a/xmpsdk/src/XMPMeta.cpp |
377 |
++ b/xmpsdk/src/XMPMeta.cpp |
|
Lines 20-25
Link Here
|
| 20 |
#include "UnicodeInlines.incl_cpp" |
20 |
#include "UnicodeInlines.incl_cpp" |
| 21 |
#include "UnicodeConversions.hpp" |
21 |
#include "UnicodeConversions.hpp" |
| 22 |
|
22 |
|
|
|
23 |
#include <cstring> |
| 24 |
|
| 23 |
#if XMP_DebugBuild |
25 |
#if XMP_DebugBuild |
| 24 |
#include <iostream> |
26 |
#include <iostream> |
| 25 |
#endif |
27 |
#endif |
