Fix a few warnings in XMPCore

8 files changed, 13 insertions, 12 deletions

diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp
index 8c9d604..6331a0b 100644
--- a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp
@@ -132,7 +132,7 @@ const ChunkIdentifier AIFF_MetaHandler::kAIFCAnno[2] = { { kChunk_FORM, kType_AI
 // ================================
 
 AIFF_MetaHandler::AIFF_MetaHandler ( XMPFiles * _parent )
-	: mChunkBehavior(NULL), mChunkController(NULL),
+	: mChunkController(NULL), mChunkBehavior(NULL),
 	mAiffMeta(), mXMPChunk(NULL),
 	mNameChunk(NULL), mAuthChunk(NULL),
 	mCprChunk(NULL), mAnnoChunk(NULL)
diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.cpp b/XMPFiles/source/FileHandlers/PSD_Handler.cpp
index 1db6ec9..e5847e9 100644
--- a/XMPFiles/source/FileHandlers/PSD_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/PSD_Handler.cpp
@@ -81,7 +81,7 @@ XMPFileHandler * PSD_MetaHandlerCTor ( XMPFiles * parent )
 // PSD_MetaHandler::PSD_MetaHandler
 // ================================
 
-PSD_MetaHandler::PSD_MetaHandler ( XMPFiles * _parent ) : iptcMgr(0), exifMgr(0), skipReconcile(false),imageWidth(0),imageHeight(0)
+PSD_MetaHandler::PSD_MetaHandler ( XMPFiles * _parent ) : skipReconcile(false), iptcMgr(0), exifMgr(0),imageWidth(0),imageHeight(0)
 {
 	this->parent = _parent;
 	this->handlerFlags = kPSD_HandlerFlags;
diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp
index 1695013..6f7f287 100644
--- a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp
@@ -140,7 +140,7 @@ const ChunkIdentifier WAVE_MetaHandler::kRF64iXML[2] = { { kChunk_RF64, kType_WA
 // ================================
 
 WAVE_MetaHandler::WAVE_MetaHandler ( XMPFiles * _parent )
-	: mChunkBehavior(NULL), mChunkController(NULL),
+	: mChunkController(NULL), mChunkBehavior(NULL),
 	mINFOMeta(), mBEXTMeta(), mCartMeta(), mDISPMeta(), miXMLMeta(),
 	mXMPChunk(NULL), mINFOChunk(NULL),
 	mBEXTChunk(NULL), mCartChunk(NULL), mDISPChunk(NULL), miXMLChunk(NULL)
diff --git a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp
index 9e1407f..e8acc9f 100644
--- a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp
+++ b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp
@@ -15,6 +15,7 @@
 #include "source/XIO.hpp"
 
 #include <cstdio>
+#include <cstdlib>
 #include <typeinfo>
 
 using namespace IFF_RIFF;
@@ -1207,7 +1208,7 @@ void Chunk::adjustSize( XMP_Int64 sizeChange )
 		mSize = mBufferSize;
 
 		// if the difference is odd, the corrected even size has be incremented by 1
-		sizeChange += abs(sizeChange % 2);
+		sizeChange += std::abs(sizeChange % 2);
 	}
 	else // mChunkMode == CHUNK_NODE/CHUNK_UNKNOWN
 	{
diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp
index fc7c2c6..29dec94 100644
--- a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp
+++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp
@@ -31,8 +31,8 @@ ChunkController::ChunkController( IChunkBehavior* chunkBehavior, XMP_Bool bigEnd
   mChunkBehavior			(chunkBehavior), 
   mFileSize					(0),
   mRoot						(NULL), 
-  mTrailingGarbageSize		(0), 
-  mTrailingGarbageOffset	(0)
+  mTrailingGarbageOffset	(0),
+  mTrailingGarbageSize		(0)
 {
 	if (bigEndian)
 	{
diff --git a/XMPFiles/source/FormatSupport/P2_Support.cpp b/XMPFiles/source/FormatSupport/P2_Support.cpp
index a5336d5..fc5a334 100644
--- a/XMPFiles/source/FormatSupport/P2_Support.cpp
+++ b/XMPFiles/source/FormatSupport/P2_Support.cpp
@@ -25,7 +25,7 @@
 #include <sstream>
 
 P2_Clip::P2_Clip(const std::string & p2ClipMetadataFilePath)
-	try :p2XMLParser(0),p2Root(0),headContentCached(false)
+	try :headContentCached(false),p2XMLParser(0),p2Root(0)
 	,p2ClipContent(0),filePath(p2ClipMetadataFilePath)
 {
 	Host_IO::FileRef hostRef = Host_IO::Open ( p2ClipMetadataFilePath.c_str(), Host_IO::openReadOnly );
diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.cpp b/XMPFiles/source/FormatSupport/TIFF_Support.cpp
index 22f3cf3..08b0bc6 100644
--- a/XMPFiles/source/FormatSupport/TIFF_Support.cpp
+++ b/XMPFiles/source/FormatSupport/TIFF_Support.cpp
@@ -33,9 +33,9 @@ static const char * kTIFF_TypeNames[] = { "ShortOrLong", "BYTE", "ASCII", "SHORT
 static bool sFirstCTor = true;
 
 TIFF_Manager::TIFF_Manager()
-	: bigEndian(false), nativeEndian(false), errorCallbackPtr( NULL ),
-	  GetUns16(0), GetUns32(0), GetFloat(0), GetDouble(0),
-	  PutUns16(0), PutUns32(0), PutFloat(0), PutDouble(0)
+	: GetUns16(0), GetUns32(0), GetFloat(0), GetDouble(0),
+	  PutUns16(0), PutUns32(0), PutFloat(0), PutDouble(0),
+	  bigEndian(false), nativeEndian(false), errorCallbackPtr( NULL )
 {
 
 	if ( sFirstCTor ) {
diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp
index 5df7439..d6ea068 100644
--- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp
+++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp
@@ -51,8 +51,8 @@ namespace IFF_RIFF {
 	static const char * bextTagName = "BEXT";
 
 	iXMLMetadata::iXMLMetadata()
-		: mRootNode( NULL )
-		, mExpatAdapter( NULL )
+		: mExpatAdapter( NULL )
+		, mRootNode( NULL )
 		, mErrorCallback( NULL )
 		, mExtraSpaceSize( 1024 ) {}