xmp_sdk: fix -Wshadow warnings

5 files changed, 76 insertions, 76 deletions

diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
index ca0bc1f..a8496f3 100644
--- a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
@@ -1444,7 +1444,7 @@ struct Cr8rBoxContent {
 static bool ImportCr8rItems ( const MOOV_Manager & moovMgr, SXMPMeta * xmp )
 {
 	bool haveXMP = false;
-	std::string fieldPath;
+	std::string fieldPath1;
 
 	MOOV_Manager::BoxInfo infoPrmL, infoCr8r;
 	MOOV_Manager::BoxRef  refPrmL = moovMgr.GetBox ( "moov/udta/PrmL", &infoPrmL );
@@ -1468,16 +1468,16 @@ static bool ImportCr8rItems ( const MOOV_Manager & moovMgr, SXMPMeta * xmp )
 			if ( rawPrmL.filePath[0] == '/' ) {
 				haveXMP = true;
 				SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "macAtom",
-												    kXMP_NS_CreatorAtom, "posixProjectPath", &fieldPath );
-				if ( ! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() ) ) {
-					xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath.c_str(), rawPrmL.filePath );
+												    kXMP_NS_CreatorAtom, "posixProjectPath", &fieldPath1 );
+				if ( ! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath1.c_str() ) ) {
+					xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath1.c_str(), rawPrmL.filePath );
 				}
 			} else if ( XMP_LitNMatch ( rawPrmL.filePath, "\\\\?\\", 4 ) ) {
 				haveXMP = true;
 				SXMPUtils::ComposeStructFieldPath ( kXMP_NS_CreatorAtom, "windowsAtom",
-												    kXMP_NS_CreatorAtom, "uncProjectPath", &fieldPath );
-				if ( ! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath.c_str() ) ) {
-					xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath.c_str(), rawPrmL.filePath );
+												    kXMP_NS_CreatorAtom, "uncProjectPath", &fieldPath1 );
+				if ( ! xmp->DoesPropertyExist ( kXMP_NS_CreatorAtom, fieldPath1.c_str() ) ) {
+					xmp->SetProperty ( kXMP_NS_CreatorAtom, fieldPath1.c_str(), rawPrmL.filePath );
 				}
 			}
 		}
@@ -1491,9 +1491,9 @@ static bool ImportCr8rItems ( const MOOV_Manager & moovMgr, SXMPMeta * xmp )
 		}
 		if ( exportStr != 0 ) {
 			haveXMP = true;
-			SXMPUtils::ComposeStructFieldPath ( kXMP_NS_DM, "projectRef", kXMP_NS_DM, "type", &fieldPath );
-			if ( ! xmp->DoesPropertyExist ( kXMP_NS_DM, fieldPath.c_str() ) ) {
-				xmp->SetProperty ( kXMP_NS_DM, fieldPath.c_str(), exportStr );
+			SXMPUtils::ComposeStructFieldPath ( kXMP_NS_DM, "projectRef", kXMP_NS_DM, "type", &fieldPath1 );
+			if ( ! xmp->DoesPropertyExist ( kXMP_NS_DM, fieldPath1.c_str() ) ) {
+				xmp->SetProperty ( kXMP_NS_DM, fieldPath1.c_str(), exportStr );
 			}
 		}
 
@@ -2650,7 +2650,7 @@ void MPEG4_MetaHandler::OptimizeFileLayout()
 	/*const bool    checkAbort = (abortProc != 0);*/
 
 	XMP_Uns64 currPos, nextPos;
-	ISOMedia::BoxInfo currBox;
+	ISOMedia::BoxInfo currBox1;
 
 	size_t boxCount = 0;
 	size_t moovIndex = 0, xmpIndex = 0;
@@ -2663,26 +2663,26 @@ void MPEG4_MetaHandler::OptimizeFileLayout()
 
 	for ( currPos = 0; currPos < originalSize; currPos = nextPos ) {
 
-		nextPos = ISOMedia::GetBoxInfo ( originalFile, currPos, originalSize, &currBox );
-		if ( (currBox.boxType == ISOMedia::k_free) ||
-			 (currBox.boxType == ISOMedia::k_skip) ||
-			 (currBox.boxType == ISOMedia::k_wide) ) continue;
+		nextPos = ISOMedia::GetBoxInfo ( originalFile, currPos, originalSize, &currBox1 );
+		if ( (currBox1.boxType == ISOMedia::k_free) ||
+			 (currBox1.boxType == ISOMedia::k_skip) ||
+			 (currBox1.boxType == ISOMedia::k_wide) ) continue;
 
 		++boxCount;	// ! Must be counted for all, continue statements below skip an end of loop increment.
 
-		if ( currBox.boxType == ISOMedia::k_mdat ) {
+		if ( currBox1.boxType == ISOMedia::k_mdat ) {
 
 			mdatFound = true;
 			XMP_Assert ( (! moovFound) | (! xmpFound) );	// The other cases should be exiting.
 
-		} else if ( currBox.boxType == ISOMedia::k_moov ) {
+		} else if ( currBox1.boxType == ISOMedia::k_moov ) {
 
 			moovFound = true;
 			moovIndex = boxCount-1;	// Need later for optimization.
 			needsOptimization = mdatFound;
 			if ( xmpFound ) break;	// Don't need to look further.
 
-		} else if ( currBox.boxType == ISOMedia::k_uuid && ( memcmp( currBox.idUUID, ISOMedia::k_xmpUUID, 16 ) == 0 ) ) {
+		} else if ( currBox1.boxType == ISOMedia::k_uuid && ( memcmp( currBox1.idUUID, ISOMedia::k_xmpUUID, 16 ) == 0 ) ) {
 
 			xmpFound = true;
 			xmpIndex = boxCount-1;	// Need later for optimization.
@@ -2739,12 +2739,12 @@ void MPEG4_MetaHandler::OptimizeFileLayout()
 	LayoutMap optLayout;
 
 	for ( currPos = 0; currPos < originalSize; currPos = nextPos ) {
-		nextPos = ISOMedia::GetBoxInfo ( originalFile, currPos, originalSize, &currBox );
-		if ( (currBox.boxType == ISOMedia::k_free) ||
-			 (currBox.boxType == ISOMedia::k_skip) ||
-			 (currBox.boxType == ISOMedia::k_wide) ) continue;
+		nextPos = ISOMedia::GetBoxInfo ( originalFile, currPos, originalSize, &currBox1 );
+		if ( (currBox1.boxType == ISOMedia::k_free) ||
+			 (currBox1.boxType == ISOMedia::k_skip) ||
+			 (currBox1.boxType == ISOMedia::k_wide) ) continue;
 		--boxCount;	// For sanity check below.
-		fileBoxes.push_back ( LayoutInfo ( currBox.boxType, (currBox.headerSize + currBox.contentSize), currPos ) );
+		fileBoxes.push_back ( LayoutInfo ( currBox1.boxType, (currBox1.headerSize + currBox1.contentSize), currPos ) );
 	}
 
 	XMP_Assert ( boxCount == 0 );	// Must get the same count in both loops.
@@ -2752,7 +2752,7 @@ void MPEG4_MetaHandler::OptimizeFileLayout()
 	XMP_Assert ( (!moovFound) || (fileBoxes[moovIndex].boxType == ISOMedia::k_moov) );
 	XMP_Assert ( (!xmpFound) || (fileBoxes[xmpIndex].boxType == ISOMedia::k_uuid) );
 
-	size_t currIndex = 0, limit = fileBoxes.size();
+	size_t currIndex = 0, limit1 = fileBoxes.size();
 	XMP_Uns64 newSize = 0;
 
 	if ( fileBoxes[0].boxType == ISOMedia::k_ftyp ) {
@@ -2773,7 +2773,7 @@ void MPEG4_MetaHandler::OptimizeFileLayout()
 		newSize += fileBoxes[xmpIndex].boxSize;
 	}
 
-	for ( ; currIndex < limit; ++currIndex ) {	// Add all of the other non-'mdat' boxes to the map.
+	for ( ; currIndex < limit1; ++currIndex ) {	// Add all of the other non-'mdat' boxes to the map.
 		if ( moovFound && (currIndex == moovIndex) ) continue;
 		if ( xmpFound && (currIndex == xmpIndex) ) continue;
 		if ( fileBoxes[currIndex].boxType == ISOMedia::k_mdat ) continue;
@@ -2782,7 +2782,7 @@ void MPEG4_MetaHandler::OptimizeFileLayout()
 		newSize += fileBoxes[currIndex].boxSize;
 	}
 
-	for ( currIndex = 0; currIndex < limit; ++currIndex ) {	// Add all of the 'mdat' boxes to the map.
+	for ( currIndex = 0; currIndex < limit1; ++currIndex ) {	// Add all of the 'mdat' boxes to the map.
 		if ( fileBoxes[currIndex].boxType != ISOMedia::k_mdat ) continue;
 		optLayout.insert ( optLayout.end(), LayoutMap::value_type ( newSize, &fileBoxes[currIndex] ) );
 		fileBoxes[currIndex].newOffset = newSize;
@@ -2829,9 +2829,9 @@ void MPEG4_MetaHandler::OptimizeFileLayout()
 	moovRef = this->moovMgr.GetBox ( "moov", &boxInfo );
 	XMP_Enforce ( moovRef != 0 );
 
-	for ( size_t i = 0, limit = boxInfo.childCount; i < limit; ++i ) {
+	for ( size_t i1 = 0, limit = boxInfo.childCount; i1 < limit; ++i1 ) {
 
-		trakRef = this->moovMgr.GetNthChild ( moovRef, i, &boxInfo );
+		trakRef = this->moovMgr.GetNthChild ( moovRef, i1, &boxInfo );
 		if ( boxInfo.boxType != ISOMedia::k_trak ) continue;
 
 		tempRef = this->moovMgr.GetTypeChild ( trakRef, ISOMedia::k_mdia, 0 );
diff --git a/XMPFiles/source/FormatSupport/MOOV_Support.cpp b/XMPFiles/source/FormatSupport/MOOV_Support.cpp
index 06e28c7..26bb859 100644
--- a/XMPFiles/source/FormatSupport/MOOV_Support.cpp
+++ b/XMPFiles/source/FormatSupport/MOOV_Support.cpp
@@ -186,9 +186,9 @@ XMP_Uns32 MOOV_Manager::GetHeaderSize ( BoxRef ref ) const
 // Parse the fullSubtree data, building the BoxNode tree for the stuff that we care about. Tolerate
 // errors like content ending too soon, make a best effoert to parse what we can.
 
-void MOOV_Manager::ParseMemoryTree ( XMP_Uns8 fileMode )
+void MOOV_Manager::ParseMemoryTree ( XMP_Uns8 fileMode1 )
 {
-	this->fileMode = fileMode;
+	this->fileMode = fileMode1;
 	
 	this->moovNode.offset = this->moovNode.boxType = 0;
 	this->moovNode.headerSize = this->moovNode.contentSize = 0;
@@ -214,7 +214,7 @@ void MOOV_Manager::ParseMemoryTree ( XMP_Uns8 fileMode )
 	this->moovNode.headerSize = moovInfo.headerSize;
 	this->moovNode.contentSize = (XMP_Uns32)moovInfo.contentSize;
 
-	bool ignoreMetaBoxes = (fileMode == kFileIsTraditionalQT);	// ! Don't want, these don't follow ISO spec.
+	bool ignoreMetaBoxes = (fileMode1 == kFileIsTraditionalQT);	// ! Don't want, these don't follow ISO spec.
 	#if TraceParseMoovTree
 		fprintf ( stderr, "Parsing 'moov' subtree, moovNode @ 0x%X, ignoreMetaBoxes = %d\n",
 				  &this->moovNode, ignoreMetaBoxes );
diff --git a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
index 91f79e0..92bba14 100644
--- a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
+++ b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
@@ -677,23 +677,23 @@ XMP_Uns32 TIFF_FileWriter::ProcessMemoryIFD ( XMP_Uns32 ifdOffset, XMP_Uns8 ifd
 	}
 
 	XMP_Uns8* ifdPtr = this->memStream + ifdOffset;
-	XMP_Uns16 tagCount = this->GetUns16 ( ifdPtr );
+	XMP_Uns16 tagCount1 = this->GetUns16 ( ifdPtr );
 	RawIFDEntry* ifdEntries = (RawIFDEntry*)(ifdPtr+2);
 
-	if ( tagCount >= 0x8000 ) {
+	if ( tagCount1 >= 0x8000 ) {
 		XMP_Error error ( kXMPErr_BadTIFF, "Outrageous IFD count" );
 		this->NotifyClient ( kXMPErrSev_FileFatal, error );
 	}
 
-	if ( (XMP_Uns32)(2 + tagCount*12 + 4) > (this->tiffLength - ifdOffset) ) {
+	if ( (XMP_Uns32)(2 + tagCount1*12 + 4) > (this->tiffLength - ifdOffset) ) {
 		XMP_Error error ( kXMPErr_BadTIFF, "Out of bounds IFD" );
 		this->NotifyClient ( kXMPErrSev_FileFatal, error );
 	}
 
 	ifdInfo.origIFDOffset = ifdOffset;
-	ifdInfo.origCount  = tagCount;
+	ifdInfo.origCount  = tagCount1;
 
-	for ( size_t i = 0; i < tagCount; ++i ) {
+	for ( size_t i = 0; i < tagCount1; ++i ) {
 
 		RawIFDEntry* rawTag  = &ifdEntries[i];
 		XMP_Uns16    tagType = this->GetUns16 ( &rawTag->type );
@@ -731,7 +731,7 @@ XMP_Uns32 TIFF_FileWriter::ProcessMemoryIFD ( XMP_Uns32 ifdOffset, XMP_Uns8 ifd
 
 	}
 
-	ifdPtr += (2 + tagCount*12);
+	ifdPtr += (2 + tagCount1*12);
 	ifdInfo.origNextIFD = this->GetUns32 ( ifdPtr );
 // The following code modifies a file in case it is invalid, we should keep this fix so that we can track this issue if we receive client bugs for this
 #if 0
@@ -865,10 +865,10 @@ XMP_Uns32 TIFF_FileWriter::ProcessFileIFD ( XMP_Uns8 ifd, XMP_Uns32 ifdOffset, X
 	if ( ! XIO::CheckFileSpace ( fileRef, 2 ) ) return 0;	// Bail for a truncated file.
 	fileRef->ReadAll ( intBuffer, 2 );
 
-	XMP_Uns16 tagCount = this->GetUns16 ( intBuffer );
-	if ( tagCount >= 0x8000 ) return 0;	// Maybe wrong byte order.
-	if ( ! XIO::CheckFileSpace ( fileRef, 12*tagCount ) ) return 0;	// Bail for a truncated file.
-	fileRef->ReadAll ( &ifdBuffer[0], 12*tagCount );
+	XMP_Uns16 tagCount1 = this->GetUns16 ( intBuffer );
+	if ( tagCount1 >= 0x8000 ) return 0;	// Maybe wrong byte order.
+	if ( ! XIO::CheckFileSpace ( fileRef, 12*tagCount1 ) ) return 0;	// Bail for a truncated file.
+	fileRef->ReadAll ( &ifdBuffer[0], 12*tagCount1 );
 
 	if ( ! XIO::CheckFileSpace ( fileRef, 4 ) ) {
         ifdInfo.origNextIFD = 0;	// Tolerate a trncated file, do the remaining processing.
@@ -878,7 +878,7 @@ XMP_Uns32 TIFF_FileWriter::ProcessFileIFD ( XMP_Uns8 ifd, XMP_Uns32 ifdOffset, X
 	}
 
 	ifdInfo.origIFDOffset = ifdOffset;
-	ifdInfo.origCount  = tagCount;
+	ifdInfo.origCount  = tagCount1;
 
 	// ---------------------------------------------------------------------------------------------
 	// First create all of the IFD map entries, capturing short values, and get the next IFD offset.
@@ -888,7 +888,7 @@ XMP_Uns32 TIFF_FileWriter::ProcessFileIFD ( XMP_Uns8 ifd, XMP_Uns32 ifdOffset, X
 
 	XMP_Uns8* ifdPtr = &ifdBuffer[0];	// Move to the first IFD entry.
 
-	for ( XMP_Uns16 i = 0; i < tagCount; ++i, ifdPtr += 12 ) {
+	for ( XMP_Uns16 i = 0; i < tagCount1; ++i, ifdPtr += 12 ) {
 
 		RawIFDEntry* rawTag = (RawIFDEntry*)ifdPtr;
 		XMP_Uns16    tagType = this->GetUns16 ( &rawTag->type );
diff --git a/XMPFiles/source/PluginHandler/PluginManager.cpp b/XMPFiles/source/PluginHandler/PluginManager.cpp
index de2eaa5..bfc132e 100644
--- a/XMPFiles/source/PluginHandler/PluginManager.cpp
+++ b/XMPFiles/source/PluginHandler/PluginManager.cpp
@@ -240,16 +240,16 @@ PluginManager::PluginManager( const std::string& pluginDir, const std::string& p
 		mExtensions.push_back ( std::string ( kLibraryExtensions[i] ) );
 	}
 
-	size_t pos = std::string::npos;
+	size_t pos1 = std::string::npos;
 
 	#if XMP_WinBuild
 		// convert to Win kDirChar
-		while ( (pos = mPluginDir.find ('/')) != string::npos ) {
-			mPluginDir.replace (pos, 1, "\\");
+		while ( (pos1 = mPluginDir.find ('/')) != string::npos ) {
+			mPluginDir.replace (pos1, 1, "\\");
 		}
 	#else
-		while ( (pos = mPluginDir.find ('\\')) != string::npos ) {
-			mPluginDir.replace (pos, 1, "/");
+		while ( (pos1 = mPluginDir.find ('\\')) != string::npos ) {
+			mPluginDir.replace (pos1, 1, "/");
 		}
 	#endif
 
diff --git a/XMPFiles/source/XMPFiles.cpp b/XMPFiles/source/XMPFiles.cpp
index 165b27f..81e0541 100644
--- a/XMPFiles/source/XMPFiles.cpp
+++ b/XMPFiles/source/XMPFiles.cpp
@@ -1172,11 +1172,11 @@ static bool DoOpenFile( XMPFiles* thiz,
 
 bool
 XMPFiles::OpenFile ( XMP_StringPtr  clientPath,
-	                 XMP_FileFormat format /* = kXMP_UnknownFile */,
-	                 XMP_OptionBits openFlags /* = 0 */ )
+	                 XMP_FileFormat format1 /* = kXMP_UnknownFile */,
+	                 XMP_OptionBits openFlags1 /* = 0 */ )
 {
 	XMP_FILES_START
-	return DoOpenFile ( this, 0, clientPath, format, openFlags );
+	return DoOpenFile ( this, 0, clientPath, format1, openFlags1 );
 	XMP_FILES_END2 ( clientPath, kXMPErrSev_FileFatal )
 	return false;
 }
@@ -1187,12 +1187,12 @@ XMPFiles::OpenFile ( XMP_StringPtr  clientPath,
 
 bool
 XMPFiles::OpenFile ( XMP_IO*        clientIO,
-	                 XMP_FileFormat format /* = kXMP_UnknownFile */,
-	                 XMP_OptionBits openFlags /* = 0 */ )
+	                 XMP_FileFormat format1 /* = kXMP_UnknownFile */,
+	                 XMP_OptionBits openFlags1 /* = 0 */ )
 {
 	XMP_FILES_START
 	this->progressTracker = 0;	// Progress tracking is not supported for client-managed I/O.
-	return DoOpenFile ( this, clientIO, "", format, openFlags );
+	return DoOpenFile ( this, clientIO, "", format1, openFlags1 );
 	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
 	return false;
 
@@ -1200,11 +1200,11 @@ XMPFiles::OpenFile ( XMP_IO*        clientIO,
 
 bool XMPFiles::OpenFile ( const Common::XMPFileHandlerInfo&	hdlInfo,
 						 XMP_IO*							clientIO,
-						 XMP_OptionBits						openFlags /*= 0*/ )
+						 XMP_OptionBits						openFlags1 /*= 0*/ )
 {
 	XMP_FILES_START
 	this->progressTracker = 0;	// Progress tracking is not supported for client-managed I/O.
-	return DoOpenFile ( this, hdlInfo, clientIO, NULL, openFlags );
+	return DoOpenFile ( this, hdlInfo, clientIO, NULL, openFlags1 );
 	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
 	return false;
 
@@ -1215,12 +1215,12 @@ bool XMPFiles::OpenFile ( const Common::XMPFileHandlerInfo&	hdlInfo,
 // =================================================================================================
 
 bool XMPFiles::OpenFile ( const Common::XMPFileHandlerInfo&	hdlInfo,
-						 XMP_StringPtr						filePath,
-						 XMP_OptionBits						openFlags /*= 0*/ )
+						 XMP_StringPtr						filePath1,
+						 XMP_OptionBits						openFlags1 /*= 0*/ )
 {
 	XMP_FILES_START
-	return DoOpenFile ( this, hdlInfo, NULL, filePath, openFlags );
-	XMP_FILES_END2 (filePath, kXMPErrSev_FileFatal )
+	return DoOpenFile ( this, hdlInfo, NULL, filePath1, openFlags1 );
+	XMP_FILES_END2 (filePath1, kXMPErrSev_FileFatal )
 	return false;
 }
 
@@ -1387,26 +1387,26 @@ XMPFiles::CloseFile ( XMP_OptionBits closeFlags /* = 0 */ )
 // =================================================================================================
 
 bool
-XMPFiles::GetFileInfo ( XMP_StringPtr *  filePath /* = 0 */,
+XMPFiles::GetFileInfo ( XMP_StringPtr *  filePath1 /* = 0 */,
                         XMP_StringLen *  pathLen /* = 0 */,
-	                    XMP_OptionBits * openFlags /* = 0 */,
-	                    XMP_FileFormat * format /* = 0 */,
+	                    XMP_OptionBits * openFlags1 /* = 0 */,
+	                    XMP_FileFormat * format1 /* = 0 */,
 	                    XMP_OptionBits * handlerFlags /* = 0 */ ) const
 {
 	XMP_FILES_START
 	if ( this->handler == 0 ) return false;
 	/*XMPFileHandler * handler = this->handler;*/
 
-	if ( filePath == 0 ) filePath = &voidStringPtr;
+	if ( filePath1 == 0 ) filePath1 = &voidStringPtr;
 	if ( pathLen == 0 ) pathLen = &voidStringLen;
-	if ( openFlags == 0 ) openFlags = &voidOptionBits;
-	if ( format == 0 ) format = &voidFileFormat;
+	if ( openFlags1 == 0 ) openFlags1 = &voidOptionBits;
+	if ( format1 == 0 ) format1 = &voidFileFormat;
 	if ( handlerFlags == 0 ) handlerFlags = &voidOptionBits;
 
-	*filePath     = this->filePath.c_str();
+	*filePath1    = this->filePath.c_str();
 	*pathLen      = (XMP_StringLen) this->filePath.size();
-	*openFlags    = this->openFlags;
-	*format       = this->format;
+	*openFlags1   = this->openFlags;
+	*format1      = this->format;
 	*handlerFlags = this->handler->handlerFlags;
 	XMP_FILES_END1 ( kXMPErrSev_FileFatal )
 	return true;
@@ -1416,14 +1416,14 @@ XMPFiles::GetFileInfo ( XMP_StringPtr *  filePath /* = 0 */,
 // =================================================================================================
 
 void
-XMPFiles::SetAbortProc ( XMP_AbortProc abortProc,
-						 void *        abortArg )
+XMPFiles::SetAbortProc ( XMP_AbortProc abortProc1,
+						 void *        abortArg1 )
 {
 	XMP_FILES_START
-	this->abortProc = abortProc;
-	this->abortArg  = abortArg;
+	this->abortProc = abortProc1;
+	this->abortArg  = abortArg1;
 
-	XMP_Assert ( (abortProc != (XMP_AbortProc)0) || (abortArg != (void*)(unsigned long long)0xDEADBEEFULL) );	// Hack to test the assert callback.
+	XMP_Assert ( (abortProc1 != (XMP_AbortProc)0) || (abortArg1 != (void*)(unsigned long long)0xDEADBEEFULL) );	// Hack to test the assert callback.
 	XMP_FILES_END1 ( kXMPErrSev_OperationFatal )
 }	// XMPFiles::SetAbortProc
 
@@ -1771,13 +1771,13 @@ bool
 // This is const just to be usable from const XMPMeta functions.
 
 bool
-	XMPFiles::ErrorCallbackInfo::ClientCallbackWrapper ( XMP_StringPtr filePath,
+	XMPFiles::ErrorCallbackInfo::ClientCallbackWrapper ( XMP_StringPtr filePath1,
 														 XMP_ErrorSeverity severity,
 														 XMP_Int32 cause,
 														 XMP_StringPtr messsage ) const
 {
 	
-	XMP_StringPtr filePathPtr = filePath;
+	XMP_StringPtr filePathPtr = filePath1;
 	if ( filePathPtr == 0 ) {
 		filePathPtr = this->filePath.c_str();
 	}