|
|
|
@ -30,7 +30,6 @@
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// =================================================================================================
|
|
|
|
|
// Local Types and Constants
|
|
|
|
|
// =========================
|
|
|
|
@ -584,7 +583,7 @@ static size_t MoveLargestProperty ( XMPMeta & stdXMP, XMPMeta * extXMP, PropSize
|
|
|
|
|
XMP_Assert ( ! propSizes.empty() );
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
// *** Xocde 2.3 on Mac OS X 10.4.7 seems to have a bug where this does not pick the last
|
|
|
|
|
// *** Xcode 2.3 on Mac OS X 10.4.7 seems to have a bug where this does not pick the last
|
|
|
|
|
// *** item in the map. We'll just avoid it on all platforms until thoroughly tested.
|
|
|
|
|
PropSizeMap::iterator lastPos = propSizes.end();
|
|
|
|
|
--lastPos; // Move to the actual last item.
|
|
|
|
@ -1194,6 +1193,9 @@ XMPUtils::ConvertToInt ( XMP_StringPtr strValue )
|
|
|
|
|
/* class static */ XMP_Int64
|
|
|
|
|
XMPUtils::ConvertToInt64 ( XMP_StringPtr strValue )
|
|
|
|
|
{
|
|
|
|
|
#if defined(__MINGW32__)// || defined(__MINGW64__)
|
|
|
|
|
return ConvertToInt(strValue);
|
|
|
|
|
#else
|
|
|
|
|
if ( (strValue == 0) || (*strValue == 0) ) XMP_Throw ( "Empty convert-from string", kXMPErr_BadValue );
|
|
|
|
|
|
|
|
|
|
int count;
|
|
|
|
@ -1209,7 +1211,7 @@ XMPUtils::ConvertToInt64 ( XMP_StringPtr strValue )
|
|
|
|
|
if ( count != 1 ) XMP_Throw ( "Invalid integer string", kXMPErr_BadParam );
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
} // ConvertToInt64
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|