diff options
62 files changed, 151 insertions, 136 deletions
diff --git a/XMPCore/source/ExpatAdapter.cpp b/XMPCore/source/ExpatAdapter.cpp index 38ad449..1f4f353 100644 --- a/XMPCore/source/ExpatAdapter.cpp +++ b/XMPCore/source/ExpatAdapter.cpp @@ -505,7 +505,7 @@ static void CommentHandler ( void * userData, XMP_StringPtr comment ) #if BanAllEntityUsage static void StartDoctypeDeclHandler ( void * userData, XMP_StringPtr doctypeName, - XMP_StringPtr sysid, XMP_StringPtr pubid, int has_internal_subset ) + XMP_StringPtr /*sysid*/, XMP_StringPtr /*pubid*/, int /*has_internal_subset*/ ) { IgnoreParam(userData); @@ -516,6 +516,8 @@ static void StartDoctypeDeclHandler ( void * userData, XMP_StringPtr doctypeName PrintIndent ( thiz->parseLog, thiz->elemNesting ); fprintf ( thiz->parseLog, "DocType: \"%s\"\n", doctypeName ); } + #else + IgnoreParam(doctypeName); #endif thiz->isAborted = true; // ! Can't throw an exception across the plain C Expat frames. diff --git a/XMPCore/source/WXMPMeta.cpp b/XMPCore/source/WXMPMeta.cpp index b547f76..2e584f6 100644 --- a/XMPCore/source/WXMPMeta.cpp +++ b/XMPCore/source/WXMPMeta.cpp @@ -1247,12 +1247,14 @@ WXMPMeta_ResetErrorCallbackLimit_1 ( XMPMetaRef xmpObjRef, } void WXMPMeta_Use_CPP_DOM_APIs_1(XMP_Bool useNewCoreAPIs, - WXMP_Result * wResult ) + WXMP_Result * /*wResult*/ ) { #if ENABLE_CPP_DOM_MODEL XMP_ENTER_Static ( "WXMPMeta_Use_CPP_DOM_APIs_1" ) sUseNewCoreAPIs = useNewCoreAPIs; XMP_EXIT +#else + IgnoreParam(useNewCoreAPIs); #endif } diff --git a/XMPCore/source/XMPIterator.cpp b/XMPCore/source/XMPIterator.cpp index 80cf6ca..cafdd2d 100644 --- a/XMPCore/source/XMPIterator.cpp +++ b/XMPCore/source/XMPIterator.cpp @@ -42,7 +42,7 @@ static XMP_Node * sDummySchema = 0; // ! Used for some ugliness with aliases. // Add the top level properties to the IterNode for a schema. static void -AddSchemaProps ( IterInfo & info, IterNode & iterSchema, const XMP_Node * xmpSchema ) +AddSchemaProps ( IterInfo & /*info*/, IterNode & iterSchema, const XMP_Node * xmpSchema ) { #if TraceIterators printf ( " Adding properties of %s\n", xmpSchema->name.c_str() ); diff --git a/XMPCore/source/XMPMeta-Parse.cpp b/XMPCore/source/XMPMeta-Parse.cpp index 49d9007..a0d43a8 100644 --- a/XMPCore/source/XMPMeta-Parse.cpp +++ b/XMPCore/source/XMPMeta-Parse.cpp @@ -633,7 +633,7 @@ RepairAltText ( XMP_Node & tree, XMP_StringPtr schemaNS, XMP_StringPtr arrayName // ---------------- void -TouchUpDataModel ( XMPMeta * xmp, XMPMeta::ErrorCallbackInfo & errorCallback ) +TouchUpDataModel ( XMPMeta * xmp, XMPMeta::ErrorCallbackInfo & /*errorCallback*/ ) { XMP_Node & tree = xmp->tree; diff --git a/XMPCore/source/XMPMeta.cpp b/XMPCore/source/XMPMeta.cpp index ae31063..445931f 100644 --- a/XMPCore/source/XMPMeta.cpp +++ b/XMPCore/source/XMPMeta.cpp @@ -1105,7 +1105,7 @@ XMPMeta::GetNamespaceURI ( XMP_StringPtr namespacePrefix, // *** restricted to the object that introduced them. /* class-static */ void -XMPMeta::DeleteNamespace ( XMP_StringPtr namespaceURI ) +XMPMeta::DeleteNamespace ( XMP_StringPtr /*namespaceURI*/ ) { XMP_Throw ( "Unimplemented method XMPMeta::DeleteNamespace", kXMPErr_Unimplemented ); @@ -1482,7 +1482,7 @@ bool XMPMeta::ErrorCallbackInfo::CanNotify() const // // This is const just to be usable from const XMPMeta functions. -bool XMPMeta::ErrorCallbackInfo::ClientCallbackWrapper ( XMP_StringPtr filePath, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr messsage ) const +bool XMPMeta::ErrorCallbackInfo::ClientCallbackWrapper ( XMP_StringPtr /*filePath*/, XMP_ErrorSeverity severity, XMP_Int32 cause, XMP_StringPtr messsage ) const { XMP_Bool retValue = (*this->wrapperProc) ( this->clientProc, this->context, severity, cause, messsage ); return ConvertXMP_BoolToBool(retValue); diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp index 869aed4..5fa2c6b 100644 --- a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp @@ -41,10 +41,10 @@ XMPFileHandler * AIFF_MetaHandlerCTor ( XMPFiles * parent ) // The first 12 bytes are checked. The first 4 must be "FORM" // Bytes 8 to 12 must be "AIFF" or "AIFC" -bool AIFF_CheckFormat ( XMP_FileFormat format, - XMP_StringPtr filePath, +bool AIFF_CheckFormat ( XMP_FileFormat /*format*/, + XMP_StringPtr /*filePath*/, XMP_IO* file, - XMPFiles* parent ) + XMPFiles* /*parent*/ ) { // Reset file pointer position file ->Rewind(); @@ -438,7 +438,7 @@ void AIFF_MetaHandler::updateLegacyChunk( IChunkData **chunk, XMP_Uns32 chunkID, // AIFF_MetaHandler::WriteTempFile // =============================== -void AIFF_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void AIFF_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { XMP_Throw ( "AIFF_MetaHandler::WriteTempFile is not Implemented!", kXMPErr_Unimplemented ); } // AIFF_MetaHandler::WriteTempFile diff --git a/XMPFiles/source/FileHandlers/ASF_Handler.cpp b/XMPFiles/source/FileHandlers/ASF_Handler.cpp index 14bf225..2ffec3a 100644 --- a/XMPFiles/source/FileHandlers/ASF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/ASF_Handler.cpp @@ -46,7 +46,7 @@ bool ASF_CheckFormat ( XMP_FileFormat format, XMPFiles * parent ) { - IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent); + IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(fileRef); IgnoreParam(parent); XMP_Assert ( format == kXMP_WMAVFile ); if ( fileRef->Length() < guidLen ) return false; diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp index 489ac42..c87cfd6 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp @@ -454,7 +454,7 @@ static bool MakeLeafPath ( std::string * path, XMP_StringPtr root, XMP_StringPtr // ! Sample files show that the ".bdmv" extension can sometimes be ".bdm". Allow either. -bool AVCHD_CheckFormat ( XMP_FileFormat format, +bool AVCHD_CheckFormat ( XMP_FileFormat /*format*/, const std::string & rootPath, const std::string & gpName, const std::string & parentName, @@ -1744,7 +1744,7 @@ static std::string AVCHD_StringFieldToXMP ( XMP_Uns8 avchdLength, // AVCHD_SetXMPShotName // ==================== -static void AVCHD_SetXMPShotName ( SXMPMeta& xmpObj, const AVCHD_blkPlayListMarkExt& markExt, const std::string& strClipName ) +static void AVCHD_SetXMPShotName ( SXMPMeta& xmpObj, const AVCHD_blkPlayListMarkExt& markExt, const std::string& /*strClipName*/ ) { if ( markExt.mPresent ) { const std::string shotName = AVCHD_StringFieldToXMP ( markExt.mMarkNameLength, markExt.mMarkCharacterSet, markExt.mMarkName, 24 ); @@ -2413,7 +2413,7 @@ void AVCHD_MetaHandler::UpdateFile ( bool doSafeUpdate ) // AVCHD_MetaHandler::WriteTempFile // ================================ -void AVCHD_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void AVCHD_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { // ! WriteTempFile is not supposed to be called for handlers that own the file. diff --git a/XMPFiles/source/FileHandlers/Basic_Handler.cpp b/XMPFiles/source/FileHandlers/Basic_Handler.cpp index 795dbd7..d8415c0 100644 --- a/XMPFiles/source/FileHandlers/Basic_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Basic_Handler.cpp @@ -54,7 +54,7 @@ void Basic_MetaHandler::UpdateFile ( bool doSafeUpdate ) XMP_IO* fileRef = this->parent->ioRef; XMP_PacketInfo & packetInfo = this->packetInfo; std::string & xmpPacket = this->xmpPacket; - + XMP_AbortProc abortProc = this->parent->abortProc; void * abortArg = this->parent->abortArg; const bool checkAbort = (abortProc != 0); @@ -210,32 +210,32 @@ void Basic_MetaHandler::ShuffleTrailingContent ( XMP_IO* fileRef ) // Dummies needed for VS.Net // ========================= -void Basic_MetaHandler::WriteXMPPrefix ( XMP_IO* fileRef ) +void Basic_MetaHandler::WriteXMPPrefix ( XMP_IO* /*fileRef*/ ) { XMP_Throw ( "Basic_MetaHandler::WriteXMPPrefix - Needs specific override", kXMPErr_InternalFailure ); } -void Basic_MetaHandler::WriteXMPSuffix ( XMP_IO* fileRef ) +void Basic_MetaHandler::WriteXMPSuffix ( XMP_IO* /*fileRef*/ ) { XMP_Throw ( "Basic_MetaHandler::WriteXMPSuffix - Needs specific override", kXMPErr_InternalFailure ); } -void Basic_MetaHandler::NoteXMPRemoval ( XMP_IO* fileRef ) +void Basic_MetaHandler::NoteXMPRemoval ( XMP_IO* /*fileRef*/ ) { XMP_Throw ( "Basic_MetaHandler::NoteXMPRemoval - Needs specific override", kXMPErr_InternalFailure ); } -void Basic_MetaHandler::NoteXMPInsertion ( XMP_IO* fileRef ) +void Basic_MetaHandler::NoteXMPInsertion ( XMP_IO* /*fileRef*/ ) { XMP_Throw ( "Basic_MetaHandler::NoteXMPInsertion - Needs specific override", kXMPErr_InternalFailure ); } -void Basic_MetaHandler::CaptureFileEnding ( XMP_IO* fileRef ) +void Basic_MetaHandler::CaptureFileEnding ( XMP_IO* /*fileRef*/ ) { XMP_Throw ( "Basic_MetaHandler::CaptureFileEnding - Needs specific override", kXMPErr_InternalFailure ); } -void Basic_MetaHandler::RestoreFileEnding ( XMP_IO* fileRef ) +void Basic_MetaHandler::RestoreFileEnding ( XMP_IO* /*fileRef*/ ) { XMP_Throw ( "Basic_MetaHandler::RestoreFileEnding - Needs specific override", kXMPErr_InternalFailure ); } diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.cpp b/XMPFiles/source/FileHandlers/FLV_Handler.cpp index a900835..c5a0d6a 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.cpp @@ -111,10 +111,10 @@ static inline void PutUns24BE ( XMP_Uns32 value, void * addr ) #define kFLV1 0x464C5601UL -bool FLV_CheckFormat ( XMP_FileFormat format, - XMP_StringPtr filePath, +bool FLV_CheckFormat ( XMP_FileFormat /*format*/, + XMP_StringPtr /*filePath*/, XMP_IO* fileRef, - XMPFiles * parent ) + XMPFiles * /*parent*/ ) { XMP_Uns8 buffer [9]; @@ -521,6 +521,7 @@ void FLV_MetaHandler::ProcessXMP() void FLV_MetaHandler::UpdateFile ( bool doSafeUpdate ) { if ( ! this->needsUpdate ) return; + IgnoreParam(doSafeUpdate); XMP_Assert ( ! doSafeUpdate ); // This should only be called for "unsafe" updates. //XMP_AbortProc abortProc = this->parent->abortProc; diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.cpp b/XMPFiles/source/FileHandlers/GIF_Handler.cpp index 0b73b22..791a0b7 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.cpp @@ -54,7 +54,7 @@ bool GIF_CheckFormat ( XMP_FileFormat format, XMP_IO* fileRef, XMPFiles * parent ) { - IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent); + IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent); XMP_Assert ( format == kXMP_GIFFile ); if ( fileRef->Length() < GIF_89_Header_LEN ) return false; @@ -329,6 +329,7 @@ void GIF_MetaHandler::SeekFile( XMP_IO * fileRef, XMP_Int64 offset, SeekMode mod void GIF_MetaHandler::UpdateFile ( bool doSafeUpdate ) { + IgnoreParam(doSafeUpdate); XMP_Assert( !doSafeUpdate ); // This should only be called for "unsafe" updates. if ( ! this->needsUpdate ) return; diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp index 170234b..01a4d50 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp @@ -376,7 +376,7 @@ void InDesign_MetaHandler::WriteXMPSuffix ( XMP_IO* fileRef ) // InDesign_MetaHandler::NoteXMPRemoval // ==================================== -void InDesign_MetaHandler::NoteXMPRemoval ( XMP_IO* fileRef ) +void InDesign_MetaHandler::NoteXMPRemoval ( XMP_IO* /*fileRef*/ ) { // Nothing to do. @@ -386,7 +386,7 @@ void InDesign_MetaHandler::NoteXMPRemoval ( XMP_IO* fileRef ) // InDesign_MetaHandler::NoteXMPInsertion // ====================================== -void InDesign_MetaHandler::NoteXMPInsertion ( XMP_IO* fileRef ) +void InDesign_MetaHandler::NoteXMPInsertion ( XMP_IO* /*fileRef*/ ) { // Nothing to do. @@ -396,7 +396,7 @@ void InDesign_MetaHandler::NoteXMPInsertion ( XMP_IO* fileRef ) // InDesign_MetaHandler::CaptureFileEnding // ======================================= -void InDesign_MetaHandler::CaptureFileEnding ( XMP_IO* fileRef ) +void InDesign_MetaHandler::CaptureFileEnding ( XMP_IO* /*fileRef*/ ) { // Nothing to do. The back of an InDesign file is the final zero padding. diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp index c858c8c..3448cf1 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp @@ -665,6 +665,7 @@ void JPEG_MetaHandler::ProcessXMP() void JPEG_MetaHandler::UpdateFile ( bool doSafeUpdate ) { + IgnoreParam(doSafeUpdate); XMP_Assert ( ! doSafeUpdate ); // This should only be called for "unsafe" updates. XMP_Int64 oldPacketOffset = this->packetInfo.offset; diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.cpp b/XMPFiles/source/FileHandlers/MP3_Handler.cpp index 2336c51..a6ce26c 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.cpp @@ -86,7 +86,7 @@ bool MP3_CheckFormat ( XMP_FileFormat format, XMP_IO* file, XMPFiles * parent ) { - IgnoreParam(filePath); IgnoreParam(parent); //supress warnings + IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent); //suppress warnings XMP_Assert ( format == kXMP_MP3File ); //standard assert if ( file->Length() < 10 ) return false; diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp index ebf190f..ca0bc1f 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp @@ -201,7 +201,7 @@ static inline bool IsXMPUUID ( XMP_IO * fileRef,XMP_Uns64 contentSize, bool unmo // ! can check afterwards using GetFileInfo to see what the file happens to be. bool MPEG4_CheckFormat ( XMP_FileFormat format, - XMP_StringPtr filePath, + XMP_StringPtr /*filePath*/, XMP_IO* fileRef, XMPFiles* parent ) { @@ -1243,7 +1243,7 @@ static bool ImportTimecodeItems ( const MPEG4_MetaHandler::TimecodeTrackInfo & t // =================== static void ExportTimecodeItems ( const SXMPMeta & xmp, MPEG4_MetaHandler::TimecodeTrackInfo * tmcdInfo, - TradQT_Manager * qtMgr, MOOV_Manager * moovMgr ) + TradQT_Manager * /*qtMgr*/, MOOV_Manager * moovMgr ) { // Export the items that go into the timecode track: // - the timescale and frame duration in the first 'stsd' table entry @@ -2920,6 +2920,7 @@ void MPEG4_MetaHandler::UpdateFile ( bool doSafeUpdate ) } this->needsUpdate = false; // Make sure only called once. + IgnoreParam(doSafeUpdate); XMP_Assert ( ! doSafeUpdate ); // This should only be called for "unsafe" updates. /*XMP_AbortProc abortProc = this->parent->abortProc;*/ diff --git a/XMPFiles/source/FileHandlers/P2_Handler.cpp b/XMPFiles/source/FileHandlers/P2_Handler.cpp index b59bafb..f3e1c01 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.cpp @@ -137,7 +137,7 @@ static void InternalMakeClipFilePath ( std::string * path, // ! also made sure that for a logical clip path the rootPath is an existing folder, and that the // ! file exists for a full file path. -bool P2_CheckFormat ( XMP_FileFormat format, +bool P2_CheckFormat ( XMP_FileFormat /*format*/, const std::string & rootPath, const std::string & gpName, const std::string & parentName, @@ -368,7 +368,7 @@ void P2_MetaHandler::SetXMPPropertyFromLegacyXML ( bool digestFound, // ================================================================================================= // P2_MetaHandler::SetXMPPropertyFromLegacyXML // =========================================== -void P2_MetaHandler::SetXMPPropertyFromLegacyXML ( bool digestFound, +void P2_MetaHandler::SetXMPPropertyFromLegacyXML ( bool /*digestFound*/, XML_NodePtr legacyContext, XMP_StringPtr schemaNS, XMP_StringPtr propName, @@ -1382,7 +1382,7 @@ void P2_MetaHandler::UpdateFile ( bool doSafeUpdate ) // P2_MetaHandler::WriteTempFile // ============================= -void P2_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void P2_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { // ! WriteTempFile is not supposed to be called for handlers that own the file. diff --git a/XMPFiles/source/FileHandlers/PNG_Handler.cpp b/XMPFiles/source/FileHandlers/PNG_Handler.cpp index 8c2fe8c..3b35ef6 100644 --- a/XMPFiles/source/FileHandlers/PNG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PNG_Handler.cpp @@ -44,7 +44,7 @@ bool PNG_CheckFormat ( XMP_FileFormat format, XMP_IO* fileRef, XMPFiles * parent ) { - IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent); + IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent); XMP_Assert ( format == kXMP_PNGFile ); if ( fileRef->Length() < PNG_SIGNATURE_LEN ) return false; diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp index 892475f..85f644e 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp @@ -1641,7 +1641,7 @@ void PostScript_MetaHandler::DetermineInsertionOffsets(XMP_Int64& ADOhintOffset, // Method inserts a new Xpacket in the postscript file.This will be called in two cases // a) If there is no xpacket in the PS file // b) If the existing xpacket is embedded using readstring or readline method -void PostScript_MetaHandler::InsertNewUpdate (std::string &outStr,XMP_IO* &tempRef,bool doSafeUpdate ) +void PostScript_MetaHandler::InsertNewUpdate (std::string &outStr, XMP_IO* &tempRef, bool /*doSafeUpdate*/ ) { // In this case it is better to have safe update // as non-safe update implementation is going to be complex diff --git a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp index 5884390..913e3a9 100644 --- a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp @@ -42,7 +42,7 @@ bool RIFF_CheckFormat ( XMP_FileFormat format, XMP_IO* file, XMPFiles* parent ) { - IgnoreParam(format); IgnoreParam(parent); + IgnoreParam(filePath); IgnoreParam(parent); XMP_Assert ( (format == kXMP_AVIFile) || (format == kXMP_WAVFile) ); if ( file->Length() < 12 ) return false; diff --git a/XMPFiles/source/FileHandlers/SVG_Handler.cpp b/XMPFiles/source/FileHandlers/SVG_Handler.cpp index 82958cc..55172e0 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.cpp @@ -42,7 +42,7 @@ bool SVG_CheckFormat( XMP_FileFormat format, { // 8K buffer is provided just to handle maximum SVG files // We can't check for SVG element in whole file which could take a lot of time for valid XML files - IgnoreParam( filePath ); IgnoreParam( parent ); + IgnoreParam(format); IgnoreParam( filePath ); IgnoreParam( parent ); XMP_Assert( format == kXMP_SVGFile ); @@ -412,6 +412,7 @@ void SVG_MetaHandler::InsertNewMetadata( XMP_IO * destRef, const std::string &va void SVG_MetaHandler::UpdateFile( bool doSafeUpdate ) { + IgnoreParam(doSafeUpdate); XMP_Assert( !doSafeUpdate ); // This should only be called for "unsafe" updates. XMP_IO* sourceRef = this->parent->ioRef; diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.cpp b/XMPFiles/source/FileHandlers/SWF_Handler.cpp index b414f56..30c3b0a 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.cpp @@ -48,7 +48,7 @@ bool SWF_CheckFormat ( XMP_FileFormat format, XMP_IO * fileRef, XMPFiles * parent ) { - IgnoreParam(format); IgnoreParam(fileRef); IgnoreParam(parent); + IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent); XMP_Assert ( format == kXMP_SWFFile ); // Make sure the file is long enough for an empty SWF stream. Check the signature. @@ -331,7 +331,7 @@ void SWF_MetaHandler::UpdateFile ( bool doSafeUpdate ) // ! See important notes in SWF_Handler.hpp about file handling. -void SWF_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void SWF_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { // ! WriteTempFile is not supposed to be called for SWF. diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp index e5660f0..e3b87d3 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp @@ -79,7 +79,7 @@ using namespace std; // ! also made sure that for a logical clip path the rootPath is an existing folder, and that the // ! file exists for a full file path. -bool SonyHDV_CheckFormat ( XMP_FileFormat format, +bool SonyHDV_CheckFormat ( XMP_FileFormat /*format*/, const std::string & rootPath, const std::string & gpName, const std::string & parentName, @@ -941,7 +941,7 @@ void SonyHDV_MetaHandler::UpdateFile ( bool doSafeUpdate ) // SonyHDV_MetaHandler::WriteTempFile // ================================== -void SonyHDV_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void SonyHDV_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { // ! WriteTempFile is not supposed to be called for handlers that own the file. diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp index 59c360b..1a49ab2 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp @@ -291,6 +291,7 @@ void TIFF_MetaHandler::ProcessXMP() void TIFF_MetaHandler::UpdateFile ( bool doSafeUpdate ) { + IgnoreParam(doSafeUpdate); XMP_Assert ( ! doSafeUpdate ); // This should only be called for "unsafe" updates. XMP_IO* destRef = this->parent->ioRef; diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.cpp b/XMPFiles/source/FileHandlers/UCF_Handler.cpp index 9c5cf10..af9e0d4 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.cpp @@ -79,7 +79,7 @@ bool UCF_CheckFormat ( XMP_FileFormat format, { // *not* using buffer functionality here, all we need // to detect UCF securely is in the first 38 bytes... - IgnoreParam(filePath); IgnoreParam(parent); //suppress warnings + IgnoreParam(format); IgnoreParam(filePath); IgnoreParam(parent); //suppress warnings XMP_Assert ( format == kXMP_UCFFile ); //standard assert XMP_Uns8 buffer[MIN_UCF_LENGTH]; diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.hpp b/XMPFiles/source/FileHandlers/UCF_Handler.hpp index eee46ef..513687a 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.hpp @@ -470,7 +470,7 @@ private: } // Assignment operator - CDFileHeader& operator=(const CDFileHeader& obj) + CDFileHeader& operator=(const CDFileHeader& /*obj*/) { XMP_Throw("not supported",kXMPErr_Unimplemented); } diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp index 12b008d..749e032 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp @@ -41,10 +41,10 @@ XMPFileHandler * WAVE_MetaHandlerCTor ( XMPFiles * parent ) // The first 12 bytes are checked. The first 4 must be "RIFF" // Bytes 8 to 12 must be "WAVE" -bool WAVE_CheckFormat ( XMP_FileFormat format, - XMP_StringPtr filePath, +bool WAVE_CheckFormat ( XMP_FileFormat /*format*/, + XMP_StringPtr /*filePath*/, XMP_IO* file, - XMPFiles* parent ) + XMPFiles* /*parent*/ ) { // Reset file pointer position file->Rewind(); @@ -513,7 +513,7 @@ void WAVE_MetaHandler::updateLegacyChunk( IChunkData **chunk, XMP_Uns32 chunkID, // RIFF_MetaHandler::WriteFile // ========================== -void WAVE_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void WAVE_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { XMP_Throw( "WAVE_MetaHandler::WriteTempFile is not Implemented!", kXMPErr_Unimplemented ); }//WAVE_MetaHandler::WriteFile diff --git a/XMPFiles/source/FileHandlers/WEBP_Handler.cpp b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp index c0b1f09..24b0147 100644 --- a/XMPFiles/source/FileHandlers/WEBP_Handler.cpp +++ b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp @@ -25,7 +25,7 @@ XMPFileHandler* WEBP_MetaHandlerCTor(XMPFiles* parent) bool WEBP_CheckFormat(XMP_FileFormat format, XMP_StringPtr filePath, XMP_IO* file, XMPFiles* parent) { - IgnoreParam(format); + IgnoreParam(filePath); IgnoreParam(parent); XMP_Assert(format == kXMP_WEBPFile); @@ -148,7 +148,7 @@ void WEBP_MetaHandler::ProcessXMP() this->processedXMP = true; } -void WEBP_MetaHandler::UpdateFile(bool doSafeUpdate) +void WEBP_MetaHandler::UpdateFile(bool /*doSafeUpdate*/) { XMP_Validate(this->needsUpdate, "nothing to update", kXMPErr_InternalFailure); diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp index 8e7a377..cc8b829 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp @@ -85,7 +85,7 @@ using namespace std; // ! Using explicit '/' as a separator when creating paths, it works on Windows. -bool XDCAMEX_CheckFormat ( XMP_FileFormat format, +bool XDCAMEX_CheckFormat ( XMP_FileFormat /*format*/, const std::string & _rootPath, const std::string & gpName, const std::string & parentName, @@ -1035,7 +1035,7 @@ void XDCAMEX_MetaHandler::UpdateFile ( bool doSafeUpdate ) // XDCAMEX_MetaHandler::WriteTempFile // ================================== -void XDCAMEX_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void XDCAMEX_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { // ! WriteTempFile is not supposed to be called for handlers that own the file. diff --git a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp index ded65c4..98e16cc 100644 --- a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp @@ -33,7 +33,7 @@ bool XDCAMFAM_CheckFormat ( XMP_FileFormat format, const std::string & groupName, const std::string & parentName, const std::string & leafName, - XMPFiles * parent ) + XMPFiles * /*parent*/ ) { /* isXDStyle = true Means SxS Memory or XDStyle , = false Means Professional Disk */ diff --git a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp index b38f8f7..bb28981 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp @@ -26,7 +26,7 @@ bool XDCAMSAM_CheckFormat ( XMP_FileFormat format, const std::string & groupName, const std::string & parentName, const std::string & leafName, - XMPFiles * parent ) + XMPFiles * /*parent*/ ) { // We only support file in CLPR folder not in other folders diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp index 02386bc..354d57c 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp @@ -666,7 +666,7 @@ void XDCAM_MetaHandler::UpdateFile ( bool doSafeUpdate ) // XDCAM_MetaHandler::WriteTempFile // ================================ -void XDCAM_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) +void XDCAM_MetaHandler::WriteTempFile ( XMP_IO* /*tempRef*/ ) { // ! WriteTempFile is not supposed to be called for handlers that own the file. diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp index e70621a..271f56f 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp @@ -35,7 +35,7 @@ public: bool GetFileModDate ( XMP_DateTime * modDate ); - virtual void FillAssociatedResources ( std::vector<std::string> * resourceList ) {}; + virtual void FillAssociatedResources ( std::vector<std::string> * /*resourceList*/ ) {}; bool IsMetadataWritable ( ) ; void CacheFileData(); @@ -54,13 +54,13 @@ protected: XDCAM_MetaHandler() : expat(0), clipMetadata(0) {}; // Hidden on purpose. - virtual bool MakeClipFilePath ( std::string * path, XMP_StringPtr suffix, bool checkFile = false ) { return false; } - virtual void SetPathVariables ( const std::string & clientPath ) { } - virtual bool GetMediaProMetadata ( SXMPMeta * xmpObjPtr, const std::string& clipUMID, bool digestFound ) { + virtual bool MakeClipFilePath ( std::string * /*path*/, XMP_StringPtr /*suffix*/, bool checkFile = false ) { IgnoreParam(checkFile); return false; } + virtual void SetPathVariables ( const std::string & /*clientPath*/ ) { } + virtual bool GetMediaProMetadata ( SXMPMeta * /*xmpObjPtr*/, const std::string& /*clipUMID*/, bool /*digestFound*/ ) { return false; } bool MakeMediaproPath ( std::string * path, bool checkFile = false ); - virtual bool GetClipUmid ( std::string &clipUmid ) { return false; } + virtual bool GetClipUmid ( std::string & /*clipUmid*/ ) { return false; } void readXMLFile( XMP_StringPtr filePath,ExpatAdapter* &expat ); bool RefersClipUmid ( std::string clipUmid , XMP_StringPtr editInfoPath ) ; std::string rootPath, clipName, sidecarPath; diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp index a97c2b0..a2d8f8f 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp @@ -35,7 +35,7 @@ const BigEndian& AIFFBehavior::mEndian = BigEndian::getInstance(); // //----------------------------------------------------------------------------- -XMP_Uns64 AIFFBehavior::getRealSize( const XMP_Uns64 size, const ChunkIdentifier& id, IChunkContainer& tree, XMP_IO* stream ) +XMP_Uns64 AIFFBehavior::getRealSize( const XMP_Uns64 size, const ChunkIdentifier& /*id*/, IChunkContainer& /*tree*/, XMP_IO* /*stream*/ ) { if( (size & 0x80000000) > 0 ) { diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp index 8fadba3..816bb05 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp @@ -38,7 +38,7 @@ AIFFMetadata::~AIFFMetadata() // //----------------------------------------------------------------------------- -bool AIFFMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj ) +bool AIFFMetadata::isEmptyValue( XMP_Uns32 /*id*/, ValueObject& valueObj ) { TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj); diff --git a/XMPFiles/source/FormatSupport/ASF_Support.cpp b/XMPFiles/source/FormatSupport/ASF_Support.cpp index 9202359..c7e2bc1 100644 --- a/XMPFiles/source/FormatSupport/ASF_Support.cpp +++ b/XMPFiles/source/FormatSupport/ASF_Support.cpp @@ -728,7 +728,7 @@ bool ASF_Support::UpdateFileSize ( XMP_IO* fileRef ) // ============================================================================================= -bool ASF_Support::ReadHeaderExtensionObject ( XMP_IO* fileRef, ObjectState& inOutObjectState, const XMP_Uns64& _pos, const ASF_ObjectBase& _objectBase ) +bool ASF_Support::ReadHeaderExtensionObject ( XMP_IO* fileRef, ObjectState& /*inOutObjectState*/, const XMP_Uns64& _pos, const ASF_ObjectBase& _objectBase ) { if ( ! IsEqualGUID ( ASF_Header_Extension_Object, _objectBase.guid) || (! legacyManager ) ) return false; diff --git a/XMPFiles/source/FormatSupport/GIF_Support.cpp b/XMPFiles/source/FormatSupport/GIF_Support.cpp index 4f2ac6c..b155afc 100644 --- a/XMPFiles/source/FormatSupport/GIF_Support.cpp +++ b/XMPFiles/source/FormatSupport/GIF_Support.cpp @@ -68,7 +68,7 @@ namespace GIF_Support long bytesRead; long headerSize; long tableSize = 0; - long bytesPerColor = 0; + /*long bytesPerColor = 0;*/ unsigned char buffer[768]; headerSize = 0; @@ -96,13 +96,13 @@ namespace GIF_Support // ============================================================================================= - bool ReadBlock ( XMP_IO* fileRef, BlockState & inOutBlockState, unsigned char * blockType, XMP_Uns32 * blockLength, XMP_Uns64 & inOutPosition ) + bool ReadBlock ( XMP_IO* fileRef, BlockState & inOutBlockState, unsigned char * /*blockType*/, XMP_Uns32 * /*blockLength*/, XMP_Uns64 & inOutPosition ) { try { XMP_Uns64 startPosition = inOutPosition; long bytesRead; - long blockSize; + /*long blockSize;*/ unsigned char buffer[768]; bytesRead = fileRef->Read ( buffer, 1 ); @@ -287,7 +287,7 @@ namespace GIF_Support { // We still have to go through all of the data... long tableSize = 0; - long xmpSize; + /*long xmpSize;*/ inOutPosition = inOutBlockData.pos + APPLICATION_HEADER_LEN; inOutBlockState.xmpPos = inOutPosition; diff --git a/XMPFiles/source/FormatSupport/ID3_Support.cpp b/XMPFiles/source/FormatSupport/ID3_Support.cpp index 790c299..f9aeefe 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.cpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp @@ -639,7 +639,7 @@ bool ID3v2Frame::advancePastCOMMDescriptor ( XMP_Int32& pos ) // ================================================================================================= -bool ID3v2Frame::getFrameValue ( XMP_Uns8 majorVersion, XMP_Uns32 logicalID, std::string* utf8string ) +bool ID3v2Frame::getFrameValue ( XMP_Uns8 /*majorVersion*/, XMP_Uns32 logicalID, std::string* utf8string ) { XMP_Assert ( (this->content != 0) && (this->contentSize >= 0) && (this->contentSize < 20*1024*1024) ); diff --git a/XMPFiles/source/FormatSupport/ID3_Support.hpp b/XMPFiles/source/FormatSupport/ID3_Support.hpp index dda6bfc..8b61894 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.hpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.hpp @@ -111,7 +111,7 @@ namespace ID3_Support { ID3v2Frame(); ID3v2Frame ( XMP_Uns32 id ); - ID3v2Frame ( const ID3v2Frame& orig ) { + ID3v2Frame ( const ID3v2Frame& /*orig*/ ) { XMP_Throw ( "ID3v2Frame copy constructor not implemented", kXMPErr_InternalFailure ); } diff --git a/XMPFiles/source/FormatSupport/IPTC_Support.hpp b/XMPFiles/source/FormatSupport/IPTC_Support.hpp index e81f1e0..b0b697b 100644 --- a/XMPFiles/source/FormatSupport/IPTC_Support.hpp +++ b/XMPFiles/source/FormatSupport/IPTC_Support.hpp @@ -258,9 +258,9 @@ public: IPTC_Reader() {}; - void SetDataSet_UTF8 ( XMP_Uns8 dsNum, const void* utf8Ptr, XMP_Uns32 utf8Len, long which = -1 ) { NotAppropriate(); }; + void SetDataSet_UTF8 ( XMP_Uns8 /*dsNum*/, const void* /*utf8Ptr*/, XMP_Uns32 /*utf8Len*/, long which = -1 ) { IgnoreParam(which); NotAppropriate(); }; - void DeleteDataSet ( XMP_Uns8 dsNum, long which = -1 ) { NotAppropriate(); }; + void DeleteDataSet ( XMP_Uns8 /*dsNum*/, long which = -1 ) { IgnoreParam(which); NotAppropriate(); }; bool IsChanged() { return false; }; diff --git a/XMPFiles/source/FormatSupport/P2_Support.cpp b/XMPFiles/source/FormatSupport/P2_Support.cpp index fc5a334..9e8af88 100644 --- a/XMPFiles/source/FormatSupport/P2_Support.cpp +++ b/XMPFiles/source/FormatSupport/P2_Support.cpp @@ -268,7 +268,7 @@ std::string P2_Clip::GetXMPFilePath() return ClipMetadataPath+ ".XMP"; } -void P2_Clip::CreateDigest ( std::string * digestStr ) +void P2_Clip::CreateDigest ( std::string * /*digestStr*/ ) { return; } diff --git a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp index 202de06..182926a 100644 --- a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp @@ -483,7 +483,7 @@ XMP_Uns32 PSIR_FileWriter::UpdateMemoryResources ( void** dataPtr ) // ==================================== XMP_Uns32 PSIR_FileWriter::UpdateFileResources ( XMP_IO* sourceRef, XMP_IO* destRef, - XMP_AbortProc abortProc, void * abortArg, + XMP_AbortProc /*abortProc*/, void * /*abortArg*/, XMP_ProgressTracker* progressTracker ) { const XMP_Uns32 zero32 = 0; diff --git a/XMPFiles/source/FormatSupport/PSIR_Support.hpp b/XMPFiles/source/FormatSupport/PSIR_Support.hpp index bd231b3..f3f9b88 100644 --- a/XMPFiles/source/FormatSupport/PSIR_Support.hpp +++ b/XMPFiles/source/FormatSupport/PSIR_Support.hpp @@ -168,20 +168,20 @@ public: bool GetImgRsrc ( XMP_Uns16 id, ImgRsrcInfo* info ) const; - void SetImgRsrc ( XMP_Uns16 id, const void* dataPtr, XMP_Uns32 length ) { NotAppropriate(); }; + void SetImgRsrc ( XMP_Uns16 /*id*/, const void* /*dataPtr*/, XMP_Uns32 /*length*/ ) { NotAppropriate(); }; - void DeleteImgRsrc ( XMP_Uns16 id ) { NotAppropriate(); }; + void DeleteImgRsrc ( XMP_Uns16 /*id*/ ) { NotAppropriate(); }; bool IsChanged() { return false; }; bool IsLegacyChanged() { return false; }; void ParseMemoryResources ( const void* data, XMP_Uns32 length, bool copyData = true ); - void ParseFileResources ( XMP_IO* file, XMP_Uns32 length ) { NotAppropriate(); }; + void ParseFileResources ( XMP_IO* /*file*/, XMP_Uns32 /*length*/ ) { NotAppropriate(); }; XMP_Uns32 UpdateMemoryResources ( void** dataPtr ) { if ( dataPtr != 0 ) *dataPtr = psirContent; return psirLength; }; - XMP_Uns32 UpdateFileResources ( XMP_IO* sourceRef, XMP_IO* destRef, - XMP_AbortProc abortProc, void * abortArg, - XMP_ProgressTracker* progressTracker ) { NotAppropriate(); return 0; }; + XMP_Uns32 UpdateFileResources ( XMP_IO* /*sourceRef*/, XMP_IO* /*destRef*/, + XMP_AbortProc /*abortProc*/, void * /*abortArg*/, + XMP_ProgressTracker* /*progressTracker*/ ) { NotAppropriate(); return 0; }; PSIR_MemoryReader() : ownedContent(false), psirLength(0), psirContent(0) {}; diff --git a/XMPFiles/source/FormatSupport/RIFF.cpp b/XMPFiles/source/FormatSupport/RIFF.cpp index 6930190..587bb8d 100644 --- a/XMPFiles/source/FormatSupport/RIFF.cpp +++ b/XMPFiles/source/FormatSupport/RIFF.cpp @@ -203,7 +203,7 @@ Chunk::Chunk( ContainerChunk* parent, RIFF_MetaHandler* handler, bool skip, Chun } } -void Chunk::changesAndSize( RIFF_MetaHandler* handler ) +void Chunk::changesAndSize( RIFF_MetaHandler* /*handler*/ ) { // only unknown chunks should reach this method, // all others must reach overloads, hence little to do here: @@ -211,7 +211,7 @@ void Chunk::changesAndSize( RIFF_MetaHandler* handler ) this->newSize = this->oldSize; } -std::string Chunk::toString(XMP_Uns8 level ) +std::string Chunk::toString(XMP_Uns8 /*level*/) { char buffer[256]; snprintf( buffer, 255, "%.4s -- " @@ -222,7 +222,7 @@ std::string Chunk::toString(XMP_Uns8 level ) return std::string(buffer); } -void Chunk::write( RIFF_MetaHandler* handler, XMP_IO* file , bool isMainChunk ) +void Chunk::write( RIFF_MetaHandler* /*handler*/, XMP_IO* /*file*/, bool /*isMainChunk*/ ) { throw new XMP_Error(kXMPErr_InternalFailure, "Chunk::write never to be called for unknown chunks."); } @@ -696,7 +696,7 @@ XMPChunk::XMPChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chunk( { chunkType = chunk_XMP; XMP_IO* file = handler->parent->ioRef; - XMP_Uns8 level = handler->level; + /*XMP_Uns8 level = handler->level*/; handler->packetInfo.offset = this->oldPos + 8; handler->packetInfo.length = (XMP_Int32) this->oldSize - 8; @@ -723,7 +723,7 @@ void XMPChunk::changesAndSize( RIFF_MetaHandler* handler ) this->hasChange = true; } -void XMPChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk ) +void XMPChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool /*isMainChunk*/ ) { XIO::WriteUns32_LE( file, kChunk_XMP ); XIO::WriteUns32_LE( file, (XMP_Uns32) this->newSize - 8 ); // validated in changesAndSize() above @@ -743,7 +743,7 @@ ValueChunk::ValueChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Ch { // set value: ----------------- XMP_IO* file = handler->parent->ioRef; - XMP_Uns8 level = handler->level; + /*XMP_Uns8 level = handler->level;*/ // unless changed through reconciliation, assume for now. // IMPORTANT to stay true to the original (no \0 cleanup or similar) @@ -769,7 +769,7 @@ void ValueChunk::SetValue( std::string value, bool optionalNUL /* = false */ ) this->newSize = this->newValue.size() + 8; } -void ValueChunk::changesAndSize( RIFF_MetaHandler* handler ) +void ValueChunk::changesAndSize( RIFF_MetaHandler* /*handler*/ ) { // Don't simply assign to this->hasChange, it might already be true. if ( this->newValue.size() != this->oldValue.size() ) { @@ -779,7 +779,7 @@ void ValueChunk::changesAndSize( RIFF_MetaHandler* handler ) } } -void ValueChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk ) +void ValueChunk::write( RIFF_MetaHandler* /*handler*/, XMP_IO* file, bool /*isMainChunk*/ ) { XIO::WriteUns32_LE( file, this->id ); XIO::WriteUns32_LE( file, (XMP_Uns32)this->newSize - 8 ); @@ -859,7 +859,7 @@ JunkChunk::JunkChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chun chunkType = chunk_JUNK; } -void JunkChunk::changesAndSize( RIFF_MetaHandler* handler ) +void JunkChunk::changesAndSize( RIFF_MetaHandler* /*handler*/ ) { this->newSize = this->oldSize; // optimization at a later stage XMP_Validate( this->newSize <= 0xFFFFFFFFLL, "no single chunk may be above 4 GB", kXMPErr_InternalFailure ); @@ -870,7 +870,7 @@ void JunkChunk::changesAndSize( RIFF_MetaHandler* handler ) const static XMP_Uns32 kZeroBufferSize64K = 64 * 1024; static XMP_Uns8 kZeroes64K [ kZeroBufferSize64K ]; // C semantics guarantee zero initialization. -void JunkChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool isMainChunk ) +void JunkChunk::write( RIFF_MetaHandler* /*handler*/, XMP_IO* file, bool /*isMainChunk*/ ) { XIO::WriteUns32_LE( file, kChunk_JUNK ); // write JUNK, never JUNQ XMP_Enforce( this->newSize < 0xFFFFFFFF ); diff --git a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp index 4e8809d..7d1c830 100644 --- a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp @@ -107,7 +107,7 @@ void ExportPhotoData ( XMP_FileFormat destFormat, TIFF_Manager * exif, // Pass 0 if not wanted. IPTC_Manager * iptc, // Pass 0 if not wanted. PSIR_Manager * psir, // Pass 0 if not wanted. - XMP_OptionBits options /* = 0 */ ) + XMP_OptionBits /* options = 0 */ ) { XMP_Assert ( (destFormat == kXMP_JPEGFile) || (destFormat == kXMP_TIFFFile) || (destFormat == kXMP_PhotoshopFile) ); diff --git a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp index 9757200..5eaf4bf 100644 --- a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp @@ -302,7 +302,7 @@ bool PhotoDataUtils::GetNativeInfo ( const TIFF_Manager & exif, XMP_Uns8 ifd, XM // ================================================================================================= -size_t PhotoDataUtils::GetNativeInfo ( const IPTC_Manager & iptc, XMP_Uns8 id, int digestState, bool haveXMP, IPTC_Manager::DataSetInfo * info ) +size_t PhotoDataUtils::GetNativeInfo ( const IPTC_Manager & iptc, XMP_Uns8 id, int /*digestState*/, bool /*haveXMP*/, IPTC_Manager::DataSetInfo * info ) { size_t iptcCount = 0; @@ -1421,7 +1421,7 @@ ImportTIFF_EncodedString ( const TIFF_Manager & tiff, const TIFF_Manager::TagInf static void ImportTIFF_Flash ( const TIFF_Manager::TagInfo & tagInfo, bool nativeEndian, - SXMPMeta * xmp, const char * xmpNS, const char * xmpProp ) + SXMPMeta * xmp, const char * /*xmpNS*/, const char * /*xmpProp*/ ) { try { // Don't let errors with one stop the others. @@ -1994,7 +1994,7 @@ static void ImportTIFF_PhotographicSensitivity ( const TIFF_Manager & exif, SXMP // These are always imported for the tiff: and exif: namespaces, but not for others. void -PhotoDataUtils::Import2WayExif ( const TIFF_Manager & exif, SXMPMeta * xmp, int iptcDigestState ) +PhotoDataUtils::Import2WayExif ( const TIFF_Manager & exif, SXMPMeta * xmp, int /*iptcDigestState*/ ) { const bool nativeEndian = exif.IsNativeEndian(); @@ -2254,7 +2254,7 @@ PhotoDataUtils::Import2WayExif ( const TIFF_Manager & exif, SXMPMeta * xmp, int // ================== static void Import3WayDateTime ( XMP_Uns16 exifTag, const TIFF_Manager & exif, const IPTC_Manager & iptc, - SXMPMeta * xmp, int iptcDigestState, const IPTC_Manager & oldIPTC ) + SXMPMeta * xmp, int iptcDigestState, const IPTC_Manager & /*oldIPTC*/ ) { XMP_Uns8 iptcDS; XMP_StringPtr xmpNS, xmpProp; @@ -2450,7 +2450,7 @@ static bool DecodeRational ( const char * ratio, XMP_Uns32 * num, XMP_Uns32 * de static void ExportSingleTIFF ( TIFF_Manager * tiff, XMP_Uns8 ifd, const TIFF_MappingToXMP & mapInfo, - bool nativeEndian, const std::string & xmpValue ) + bool /*nativeEndian*/, const std::string & xmpValue ) { XMP_Assert ( (mapInfo.count == 1) || (mapInfo.type == kTIFF_ASCIIType) ); XMP_Assert ( mapInfo.name[0] != 0 ); // Must be a standard mapping. diff --git a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp index a35fc20..fb7ebb6 100644 --- a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp +++ b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp @@ -273,7 +273,7 @@ static void EndNamespaceDeclHandler( void * userData, XMP_StringPtr prefix ) // ================================================================================================= -static void StartElementHandler( void * userData, XMP_StringPtr name, XMP_StringPtr* attrs ) +static void StartElementHandler( void * userData, XMP_StringPtr name, XMP_StringPtr* /*attrs*/ ) { // In case, if name is NULL then ParseBuffer would return with error status SVG_Adapter * thiz = ( SVG_Adapter* ) userData; @@ -429,7 +429,7 @@ static void ProcessingInstructionHandler( void * userData, XMP_StringPtr target, // ================================================================================================= -static void DeclarationHandler( void *userData, const XML_Char *version, const XML_Char *encoding, int standalone ) +static void DeclarationHandler( void *userData, const XML_Char * /*version*/, const XML_Char *encoding, int /*standalone*/ ) { if ( encoding == NULL || strlen( encoding ) != 5 || ( tolower( encoding[ 0 ] ) == 'u' @@ -448,11 +448,10 @@ static void DeclarationHandler( void *userData, const XML_Char *version, const // ================================================================================================= #if BanAllEntityUsage -static void StartDoctypeDeclHandler( void * userData, XMP_StringPtr doctypeName, - XMP_StringPtr sysid, XMP_StringPtr pubid, int has_internal_subset ) +static void StartDoctypeDeclHandler( void * userData, XMP_StringPtr /*doctypeName*/, + XMP_StringPtr /*sysid*/, XMP_StringPtr /*pubid*/, + int /*has_internal_subset*/ ) { - IgnoreParam( userData ); - SVG_Adapter * thiz = ( SVG_Adapter* ) userData; thiz->isAborted = true; // ! Can't throw an exception across the plain C Expat frames. diff --git a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp index a646393..91f79e0 100644 --- a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp @@ -92,7 +92,7 @@ void TIFF_FileWriter::DeleteExistingInfo() // TIFF_FileWriter::PickIFD // ======================== -XMP_Uns8 TIFF_FileWriter::PickIFD ( XMP_Uns8 ifd, XMP_Uns16 id ) +XMP_Uns8 TIFF_FileWriter::PickIFD ( XMP_Uns8 ifd, XMP_Uns16 /*id*/ ) { if ( ifd > kTIFF_LastRealIFD ) { if ( ifd != kTIFF_KnownIFD ) XMP_Throw ( "Invalid IFD number", kXMPErr_BadParam ); @@ -571,7 +571,7 @@ bool TIFF_FileWriter::IsLegacyChanged() // TIFF_FileWriter::ParseMemoryStream // ================================== -void TIFF_FileWriter::ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData /* = true */, bool isAlreadyLittle /*= false */ ) +void TIFF_FileWriter::ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData /* = true */, bool /* isAlreadyLittle = false */ ) { this->DeleteExistingInfo(); this->memParsed = true; @@ -1037,7 +1037,7 @@ static bool FlipCFATable ( void* voidPtr, XMP_Uns32 tagLen, GetUns16_Proc GetUns // ! The Exif 2.2 description is a bit garbled. It might be wrong. It would be nice to have a real example. -static bool FlipDSDTable ( void* voidPtr, XMP_Uns32 tagLen, GetUns16_Proc GetUns16 ) +static bool FlipDSDTable ( void* voidPtr, XMP_Uns32 tagLen, GetUns16_Proc /*GetUns16*/ ) { if ( tagLen < 4 ) return false; diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.hpp b/XMPFiles/source/FormatSupport/TIFF_Support.hpp index 5ed5965..3914809 100644 --- a/XMPFiles/source/FormatSupport/TIFF_Support.hpp +++ b/XMPFiles/source/FormatSupport/TIFF_Support.hpp @@ -708,9 +708,9 @@ public: bool GetTag ( XMP_Uns8 ifd, XMP_Uns16 id, TagInfo* info ) const; - void SetTag ( XMP_Uns8 ifd, XMP_Uns16 id, XMP_Uns16 type, XMP_Uns32 count, const void* dataPtr ) { NotAppropriate(); }; + void SetTag ( XMP_Uns8 /*ifd*/, XMP_Uns16 /*id*/, XMP_Uns16 /*type*/, XMP_Uns32 /*count*/, const void* /*dataPtr*/ ) { NotAppropriate(); }; - void DeleteTag ( XMP_Uns8 ifd, XMP_Uns16 id ) { NotAppropriate(); }; + void DeleteTag ( XMP_Uns8 /*ifd*/, XMP_Uns16 /*id*/ ) { NotAppropriate(); }; XMP_Uns32 GetValueOffset ( XMP_Uns8 ifd, XMP_Uns16 id ) const; @@ -733,19 +733,19 @@ public: bool GetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, std::string* utf8Str ) const; - void SetTag_EncodedString ( XMP_Uns8 ifd, XMP_Uns16 id, const std::string& utf8Str, XMP_Uns8 encoding ) { NotAppropriate(); }; + void SetTag_EncodedString ( XMP_Uns8 /*ifd*/, XMP_Uns16 /*id*/, const std::string& /*utf8Str*/, XMP_Uns8 /*encoding*/ ) { NotAppropriate(); }; bool IsChanged() { return false; }; bool IsLegacyChanged() { return false; }; // isAlredyLittle is provided for case when data contain no information about Endianess, So need not to check for header void ParseMemoryStream ( const void* data, XMP_Uns32 length, bool copyData = true, bool isAlreadyLittle = false ); - void ParseFileStream ( XMP_IO* fileRef ) { NotAppropriate(); }; + void ParseFileStream ( XMP_IO* /*fileRef*/ ) { NotAppropriate(); }; - void IntegrateFromPShop6 ( const void * buriedPtr, size_t buriedLen ) { NotAppropriate(); }; + void IntegrateFromPShop6 ( const void * /*buriedPtr*/, size_t /*buriedLen*/ ) { NotAppropriate(); }; - XMP_Uns32 UpdateMemoryStream ( void** dataPtr, bool condenseStream = false ) { if ( dataPtr != 0 ) *dataPtr = tiffStream; return tiffLength; }; - void UpdateFileStream ( XMP_IO* fileRef, XMP_ProgressTracker* progressTracker ) { NotAppropriate(); }; + XMP_Uns32 UpdateMemoryStream ( void** dataPtr, bool condenseStream = false ) { IgnoreParam(condenseStream); if ( dataPtr != 0 ) *dataPtr = tiffStream; return tiffLength; }; + void UpdateFileStream ( XMP_IO* /*fileRef*/, XMP_ProgressTracker* /*progressTracker*/ ) { NotAppropriate(); }; TIFF_MemoryReader() : ownedStream(false), tiffStream(0), tiffLength(0) {}; diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp index 5b98ba0..ecf7716 100644 --- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp @@ -340,7 +340,7 @@ bool BEXTMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj ) if( obj != NULL ) { XMP_Uns32 size = 0; - const XMP_Uns8* const buffer = obj->getArray( size ); + /*const XMP_Uns8* const buffer =*/ obj->getArray( size ); ret = ( size == 0 ); } diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp index 9e821ef..6ef70bd 100644 --- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp @@ -130,7 +130,7 @@ XMP_Uns64 DISPMetadata::serialize( XMP_Uns8** outBuffer ) // //----------------------------------------------------------------------------- -bool DISPMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj ) +bool DISPMetadata::isEmptyValue( XMP_Uns32 /*id*/, ValueObject& valueObj ) { TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj); diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp index 9bdeb94..6bea3d3 100644 --- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp @@ -256,7 +256,7 @@ XMP_Uns64 INFOMetadata::serialize( XMP_Uns8** outBuffer ) // //----------------------------------------------------------------------------- -bool INFOMetadata::isEmptyValue( XMP_Uns32 id, ValueObject& valueObj ) +bool INFOMetadata::isEmptyValue( XMP_Uns32 /*id*/, ValueObject& valueObj ) { TValueObject<std::string>* strObj = dynamic_cast<TValueObject<std::string>*>(&valueObj); diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp index 8e559a1..cd4240b 100644 --- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp @@ -981,7 +981,7 @@ namespace IFF_RIFF { return false; } - bool iXMLMetadata::validateTrackListInfo( ValueObject * value ) { + bool iXMLMetadata::validateTrackListInfo( ValueObject * /*value*/ ) { return true; } diff --git a/XMPFiles/source/HandlerRegistry.cpp b/XMPFiles/source/HandlerRegistry.cpp index 55fec8b..f0c04e1 100644 --- a/XMPFiles/source/HandlerRegistry.cpp +++ b/XMPFiles/source/HandlerRegistry.cpp @@ -933,7 +933,7 @@ XMPFileHandlerInfo* HandlerRegistry::tryFolderHandlers( XMP_FileFormat format, const std::string& parentName, const std::string& leafName ) { - IgnoreParam ( parentName ); + IgnoreParam(leafName); // This is called when the input path to XMPFiles::OpenFile names an existing file. We need to // quickly decide if this might be inside a folder-handler's structure. See if the containing diff --git a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp index 2a3560c..19e1a4f 100644 --- a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp +++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp @@ -41,7 +41,7 @@ IMetadata::~IMetadata() // //----------------------------------------------------------------------------- -void IMetadata::parse( const XMP_Uns8* input, XMP_Uns64 size ) +void IMetadata::parse( const XMP_Uns8* /*input*/, XMP_Uns64 /*size*/ ) { XMP_Throw ( "Method not implemented", kXMPErr_Unimplemented ); } @@ -55,7 +55,7 @@ void IMetadata::parse( const XMP_Uns8* input, XMP_Uns64 size ) // //----------------------------------------------------------------------------- -void IMetadata::parse( XMP_IO* input ) +void IMetadata::parse( XMP_IO* /*input*/ ) { XMP_Throw ( "Method not implemented", kXMPErr_Unimplemented ); } @@ -73,7 +73,7 @@ void IMetadata::parse( XMP_IO* input ) // //----------------------------------------------------------------------------- -XMP_Uns64 IMetadata::serialize( XMP_Uns8** buffer ) +XMP_Uns64 IMetadata::serialize( XMP_Uns8** /*buffer*/ ) { XMP_Throw ( "Method not implemented", kXMPErr_Unimplemented ); } @@ -213,7 +213,7 @@ bool IMetadata::valueChanged( XMP_Uns32 id ) const // //----------------------------------------------------------------------------- -bool IMetadata::valueValid( XMP_Uns32 id, ValueObject *value ) +bool IMetadata::valueValid( XMP_Uns32 /*id*/, ValueObject * /*value*/ ) { return true; } @@ -225,7 +225,7 @@ bool IMetadata::valueValid( XMP_Uns32 id, ValueObject *value ) // Purpose: Return true if the value for the passed identifier is valid // //----------------------------------------------------------------------------- -void IMetadata::valueModify(XMP_Uns32 id, ValueObject *value) +void IMetadata::valueModify(XMP_Uns32 /*id*/, ValueObject * /*value*/) { return; -}
\ No newline at end of file +} diff --git a/XMPFiles/source/PluginHandler/PluginManager.cpp b/XMPFiles/source/PluginHandler/PluginManager.cpp index 3f1f6a2..de2eaa5 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.cpp +++ b/XMPFiles/source/PluginHandler/PluginManager.cpp @@ -83,7 +83,7 @@ static XMPFileHandler* Plugin_MetaHandlerCTor_Replacement( XMPFiles * parent ) // ================================================================================================= -static bool Plugin_CheckFileFormat ( FileHandlerSharedPtr handler, XMP_StringPtr filePath, XMP_IO * fileRef, XMPFiles * parent ) +static bool Plugin_CheckFileFormat ( FileHandlerSharedPtr handler, XMP_StringPtr filePath, XMP_IO * fileRef, XMPFiles * /*parent*/ ) { if ( handler != 0 ) { @@ -186,7 +186,7 @@ static bool Plugin_CheckFolderFormat( FileHandlerSharedPtr handler, const std::string & gpName, const std::string & parentName, const std::string & leafName, - XMPFiles * parent ) + XMPFiles * /*parent*/ ) { XMP_Bool result = false; diff --git a/XMPFiles/source/PluginHandler/XMPAtoms.cpp b/XMPFiles/source/PluginHandler/XMPAtoms.cpp index 8379c8b..4f778c2 100644 --- a/XMPFiles/source/PluginHandler/XMPAtoms.cpp +++ b/XMPFiles/source/PluginHandler/XMPAtoms.cpp @@ -122,7 +122,7 @@ void ResourceParser::addHandler() } } -bool ResourceParser::parseElementAttrs( const XML_Node * xmlNode, bool isTopLevel ) +bool ResourceParser::parseElementAttrs( const XML_Node * xmlNode, bool /*isTopLevel*/ ) { XMPAtom nodeAtom = getXMPAtomFromString( xmlNode->name ); if( nodeAtom == Handler_K ) diff --git a/XMPFiles/source/XMPFiles.cpp b/XMPFiles/source/XMPFiles.cpp index b477cc0..165b27f 100644 --- a/XMPFiles/source/XMPFiles.cpp +++ b/XMPFiles/source/XMPFiles.cpp @@ -630,7 +630,7 @@ bool XMPFiles::GetFileModDate ( const Common::XMPFileHandlerInfo& hdlInfo, XMP_StringPtr clientPath, XMP_DateTime * modDate, - XMP_OptionBits options /* = 0 */ ) + XMP_OptionBits /* options = 0 */ ) { XMP_FILES_STATIC_START Host_IO::FileMode clientMode; @@ -762,7 +762,7 @@ XMPFiles::GetAssociatedResources ( const Common::XMPFileHandlerInfo& hdlInfo, XMP_StringPtr filePath, std::vector<std::string> * resourceList, - XMP_OptionBits options /* = 0 */ ) + XMP_OptionBits /* options = 0 */ ) { XMP_FILES_STATIC_START Host_IO::FileMode clientMode; @@ -883,7 +883,7 @@ XMPFiles::IsMetadataWritable ( const Common::XMPFileHandlerInfo& hdlInfo, XMP_StringPtr filePath, XMP_Bool * writable, - XMP_OptionBits options /* = 0 */ ) + XMP_OptionBits /* options = 0 */ ) { XMP_FILES_STATIC_START Host_IO::FileMode clientMode; diff --git a/XMPFiles/source/XMPFiles_Impl.hpp b/XMPFiles/source/XMPFiles_Impl.hpp index f8bc5ac..e89b351 100644 --- a/XMPFiles/source/XMPFiles_Impl.hpp +++ b/XMPFiles/source/XMPFiles_Impl.hpp @@ -303,8 +303,8 @@ public: // Currently, FileHandleInstance needs to implement Error and progress callback because of plugins, // Rest handlers need not to implement them because handlers can access them parent - virtual void SetErrorCallback ( ErrorCallbackBox errorCallbackBox ) {} - virtual void SetProgressCallback ( XMP_ProgressTracker::CallbackInfo * progCBInfoPtr ) {} + virtual void SetErrorCallback ( ErrorCallbackBox /*errorCallbackBox*/ ) {} + virtual void SetProgressCallback ( XMP_ProgressTracker::CallbackInfo * /*progCBInfoPtr*/ ) {} static void NotifyClient(GenericErrorCallback * errCBptr, XMP_ErrorSeverity severity, XMP_Error & error); diff --git a/samples/source/XMPCoreCoverage.cpp b/samples/source/XMPCoreCoverage.cpp index e1dc30c..748b7ff 100644 --- a/samples/source/XMPCoreCoverage.cpp +++ b/samples/source/XMPCoreCoverage.cpp @@ -340,6 +340,7 @@ static void WriteMinorLabel ( FILE * log, const char * title ) // ------------------------------------------------------------------------------------------------- +#if 0 static XMP_Status DumpToString ( void * refCon, XMP_StringPtr outStr, XMP_StringLen outLen ) { XMP_Status status = 0; @@ -353,6 +354,7 @@ static XMP_Status DumpToString ( void * refCon, XMP_StringPtr outStr, XMP_String return status; } // DumpToString +#endif // ------------------------------------------------------------------------------------------------- diff --git a/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp index c482694..aefd9cf 100644 --- a/samples/source/XMPFilesCoverage.cpp +++ b/samples/source/XMPFilesCoverage.cpp @@ -265,7 +265,7 @@ static void TestOneFile ( const char * fileName ) // ------------------------------------------------------------------------------------------------- -extern "C" int main ( int argc, const char * argv[] ) +extern "C" int main ( int /*argc*/, const char * argv[] ) { int result = 0; diff --git a/samples/source/common/DumpFile.cpp b/samples/source/common/DumpFile.cpp index 4d1e59f..41be637 100644 --- a/samples/source/common/DumpFile.cpp +++ b/samples/source/common/DumpFile.cpp @@ -804,11 +804,13 @@ void static Rewind(LFA_FileRef file, XMP_Int64 size) LFA_Seek (file, -size, SEEK_CUR); // ditto to above } +#if 0 // overload, no size parameter, rewinds to start void static Rewind(LFA_FileRef file) { LFA_Seek (file, 0, SEEK_SET); } +#endif XMP_Uns32 static Peek32u(LFA_FileRef file, bool bigEndian = false ) { @@ -916,6 +918,7 @@ static void PrintOnlyASCII_8 ( XMP_Uns8 * strPtr, XMP_Uns32 strLen, bool stopOnN // this wrap and the LE counterpart can only be inferior, since // its always added as a comment, even if value was more appropriate. // ==> callers should make use of convert16Bit directly. +#if 0 static void PrintOnlyASCII_16BE ( XMP_Uns16 * u16Ptr, XMP_Uns32 u16Bytes, bool stopOnNUL = true ) { tree->addComment ( convert16Bit( true, (XMP_Uns8*) u16Ptr, stopOnNUL, u16Bytes ) ); @@ -927,6 +930,7 @@ static void PrintOnlyASCII_16LE ( XMP_Uns16 * u16Ptr, XMP_Uns32 u16Bytes, bool s { tree->addComment ( convert16Bit( false, (XMP_Uns8*) u16Ptr, stopOnNUL, u16Bytes ) ); } // PrintOnlyASCII_16LE +#endif // ================================================================================================= @@ -1281,7 +1285,7 @@ DumpImageResources ( const JpegMarkers& psirMarkers, XMP_Uns8 * dataStart, const lastIndexUsed = i; } XMP_Uns32 fileOffset = psirMarkers[i].jpegMarkerPtr - dataStart; - XMP_Uns8 * psirOrigin = psirMarkers[i].jpegMarkerPtr; + /* XMP_Uns8 * psirOrigin = psirMarkers[i].jpegMarkerPtr;*/ std::string irTypeStr = convert8Bit(psirPtr,false,4); //get in an endian neutral way XMP_Uns16 irID = GetUns16BE ( psirPtr+4 ); // The image resource ID. @@ -3220,7 +3224,7 @@ struct DataSize64Chunk // declare DataSize64Chunk structure static XMP_Uns64 parseRF64( LFA_FileRef file, DataSize64Chunk* rf64Sizes ) { - XMP_Int64 chunkPos= LFA_Tell( file ); + /*XMP_Int64 chunkPos= */ LFA_Tell( file ); rf64Sizes->chunkId = tree->digest32u( file, "", false ); std::string ds64ChunkID_ST( fromArgs( "%.4s" , &rf64Sizes->chunkId) ); assertMsg("Not a valid RF64 file!", ds64ChunkID_ST == "ds64"); @@ -3764,7 +3768,7 @@ DumpPNGChunk ( LFA_FileRef file, XMP_Uns32 pngLen, XMP_Uns32 chunkOffset ) // ================================================================================================= static void -DumpPS ( LFA_FileRef file, XMP_Uns32 fileLen ) +DumpPS ( LFA_FileRef file, XMP_Uns32 /*fileLen*/ ) { XMP_Int32 psOffset; size_t psLength; @@ -4838,7 +4842,7 @@ struct ID3_v23_FrameHeader { // ================================================================================================= -static void DumpID3v22Frames ( LFA_FileRef file, XMP_Uns8 vMajor, XMP_Uns32 framePos, XMP_Uns32 frameEnd ) { +static void DumpID3v22Frames ( LFA_FileRef file, XMP_Uns8 /*vMajor*/, XMP_Uns32 framePos, XMP_Uns32 frameEnd ) { // Dump the frames in an ID3 v2.2 tag. diff --git a/source/XMPFiles_IO.cpp b/source/XMPFiles_IO.cpp index b613dbd..dfbd399 100644 --- a/source/XMPFiles_IO.cpp +++ b/source/XMPFiles_IO.cpp @@ -129,7 +129,7 @@ XMPFiles_IO::~XMPFiles_IO() // XMPFiles_IO::operator= // ====================== -void XMPFiles_IO::operator = ( const XMP_IO& in ) +void XMPFiles_IO::operator = ( const XMP_IO& /*in*/ ) { XMP_FILESIO_START XMP_Throw ( "No assignment for XMPFiles_IO", kXMPErr_InternalFailure ); |