diff options
author | Hubert Figuière <hub@figuiere.net> | 2017-01-11 00:00:04 -0500 |
---|---|---|
committer | Hubert Figuière <hub@figuiere.net> | 2017-01-11 00:00:04 -0500 |
commit | 11fe6fd927b7ddaf1b9b5478c226266d7f6b4ae8 (patch) | |
tree | 70b1c5d78c12ce28cb0dfa9114695af624df9180 /XMPFiles | |
parent | 5fe45960a83ba5803ca974709752bd2bb6139df0 (diff) |
Adobe SDK: fix unused variables errors in FileHandlers
Diffstat (limited to 'XMPFiles')
19 files changed, 70 insertions, 65 deletions
diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp index 95d4f1b..489ac42 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp @@ -559,13 +559,13 @@ static bool ReadAVCHDProgramInfo ( XMPFiles_IO & cpiFile, AVCHD_blkProgramInfo& cpiFile.ReadAll ( &avchdProgramInfo.mNumberOfStreamsInPS, 1 ); cpiFile.ReadAll ( &avchdProgramInfo.mReserved2, 1 ); - XMP_Uns16 streamPID = 0; for ( int i=0; i<avchdProgramInfo.mNumberOfStreamsInPS; ++i ) { XMP_Uns8 length = 0; XMP_Uns8 streamCodingType = 0; - streamPID = XIO::ReadUns16_BE ( &cpiFile ); + // Unused. But we shall read it. + /*streamPID =*/ XIO::ReadUns16_BE ( &cpiFile ); cpiFile.ReadAll ( &length, 1 ); XMP_Int64 pos = cpiFile.Offset(); @@ -917,7 +917,7 @@ static bool ReadAVCCAMMakersPrivateData ( XMPFiles_IO & fileRef, XMP_Uns16 playlistMarkID, AVCHD_blkPanasonicPrivateData& avccamPrivateData ) { - const XMP_Uns64 blockStart = fileRef.Offset(); + /*const XMP_Uns64 blockStart =*/ fileRef.Offset(); avccamPrivateData.mNumberOfData = XIO::ReadUns16_BE ( &fileRef ); fileRef.ReadAll ( &avccamPrivateData.mReserved, 2 ); @@ -968,13 +968,13 @@ static bool ReadAVCHDMakersPrivateData ( XMPFiles_IO & mplFile, XMP_Uns16 makerID; XMP_Uns16 makerModelCode; XMP_Uns32 mpdStartAddress; - XMP_Uns32 mpdLength; for ( int i = 0; i < avchdLegacyData.mNumberOfMakerEntries; ++i ) { makerID = XIO::ReadUns16_BE ( &mplFile ); makerModelCode = XIO::ReadUns16_BE ( &mplFile ); mpdStartAddress = XIO::ReadUns32_BE ( &mplFile ); - mpdLength = XIO::ReadUns32_BE ( &mplFile ); + // Unused bu we must read it. + /*mpdLength =*/ XIO::ReadUns32_BE ( &mplFile ); // We only have documentation for Panasonic's Maker's Private Data blocks, so we'll ignore everyone else's if ( makerID == kMakerIDPanasonic ) { @@ -1552,7 +1552,7 @@ static void AVCCAM_SetXMPStartTimecode ( SXMPMeta& xmpObj, const XMP_Uns8* avcca return; } - const XMP_Uns8 isColor = ( avccamTimecode[0] >> 7 ) & 0x01; + /*const XMP_Uns8 isColor = ( avccamTimecode[0] >> 7 ) & 0x01;*/ const XMP_Uns8 isDropFrame = ( avccamTimecode[0] >> 6 ) & 0x01; const XMP_Uns8 frameTens = ( avccamTimecode[0] >> 4 ) & 0x03; const XMP_Uns8 frameUnits = avccamTimecode[0] & 0x0f; @@ -1783,7 +1783,7 @@ static std::string BytesToHex ( const XMP_Uns8* inClipIDBytes, int inNumBytes ) static std::string AVCHD_DateFieldToXMP ( XMP_Uns8 avchdTimeZone, const XMP_Uns8* avchdDateTime ) { - const XMP_Uns8 daylightSavingsTime = ( avchdTimeZone >> 6 ) & 0x01; + /* const XMP_Uns8 daylightSavingsTime = ( avchdTimeZone >> 6 ) & 0x01; */ const XMP_Uns8 timezoneSign = ( avchdTimeZone >> 5 ) & 0x01; const XMP_Uns8 timezoneValue = ( avchdTimeZone >> 1 ) & 0x0F; const XMP_Uns8 halfHourFlag = avchdTimeZone & 0x01; @@ -2162,7 +2162,7 @@ void AVCHD_MetaHandler::CacheFileData() this->xmpPacket.erase(); this->xmpPacket.append ( (size_t ) xmpLen, ' ' ); - XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); + /*XMP_Int32 ioCount =*/ xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); this->packetInfo.offset = 0; this->packetInfo.length = (XMP_Int32)xmpLen; diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.cpp b/XMPFiles/source/FileHandlers/FLV_Handler.cpp index db6ae4b..a900835 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.cpp @@ -523,12 +523,12 @@ void FLV_MetaHandler::UpdateFile ( bool doSafeUpdate ) if ( ! this->needsUpdate ) return; XMP_Assert ( ! doSafeUpdate ); // This should only be called for "unsafe" updates. - XMP_AbortProc abortProc = this->parent->abortProc; - void * abortArg = this->parent->abortArg; - const bool checkAbort = (abortProc != 0); + //XMP_AbortProc abortProc = this->parent->abortProc; + //void * abortArg = this->parent->abortArg; + //const bool checkAbort = (abortProc != 0); XMP_IO* fileRef = this->parent->ioRef; - XMP_Uns64 fileSize = fileRef->Length(); + /*XMP_Uns64 fileSize =*/ fileRef->Length(); // Make sure the XMP has a legacy digest if appropriate. @@ -668,7 +668,7 @@ void FLV_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) XMP_AbortProc abortProc = this->parent->abortProc; void * abortArg = this->parent->abortArg; - const bool checkAbort = (abortProc != 0); + //const bool checkAbort = (abortProc != 0); XMP_IO* originalRef = this->parent->ioRef; diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.cpp b/XMPFiles/source/FileHandlers/GIF_Handler.cpp index ded9954..0b73b22 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.cpp @@ -215,7 +215,7 @@ bool GIF_MetaHandler::ParseGIFBlocks( XMP_IO* fileRef ) { XMP_Uns8 extensionLbl; XMP_Uns32 blockSize = 0; - XMP_Uns64 blockOffset = fileRef->Offset(); + /*XMP_Uns64 blockOffset = fileRef->Offset();*/ // Extension Label fileRef->Read( &extensionLbl, 1 ); @@ -335,7 +335,7 @@ void GIF_MetaHandler::UpdateFile ( bool doSafeUpdate ) XMP_IO * fileRef = this->parent->ioRef; - XMP_StringPtr packetStr = xmpPacket.c_str(); + /*XMP_StringPtr packetStr = xmpPacket.c_str();*/ XMP_StringLen newPacketLength = (XMP_StringLen)xmpPacket.size(); if ( newPacketLength == XMPPacketLength ) diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp index d627580..170234b 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp @@ -114,9 +114,9 @@ bool InDesign_CheckFormat ( XMP_FileFormat format, enum { kBufferSize = 2*kINDD_PageSize }; XMP_Uns8 buffer [kBufferSize]; - XMP_Int64 filePos = 0; + /*XMP_Int64 filePos = 0;*/ XMP_Uns8 * bufPtr = buffer; - XMP_Uns8 * bufLimit = bufPtr + kBufferSize; + /*XMP_Uns8 * bufLimit = bufPtr + kBufferSize;*/ fileRef->Rewind(); size_t bufLen = fileRef->Read ( buffer, kBufferSize ); diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp index a37f78e..c858c8c 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp @@ -273,7 +273,6 @@ static void CacheExtendedXMP ( ExtendedXMPInfo * extXMP, XMP_Uns8 * buffer, size void JPEG_MetaHandler::CacheFileData() { XMP_IO* fileRef = this->parent->ioRef; - XMP_PacketInfo & packetInfo = this->packetInfo; static const size_t kBufferSize = 64*1024; // Enough for maximum segment contents. XMP_Uns8 buffer [kBufferSize]; diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.cpp b/XMPFiles/source/FileHandlers/MP3_Handler.cpp index 9295a2e..2336c51 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.cpp @@ -167,7 +167,7 @@ void MP3_MetaHandler::CacheFileData() this->containsXMP = false; //assume no XMP for now XMP_IO* file = this->parent->ioRef; - XMP_PacketInfo &packetInfo = this->packetInfo; + /* XMP_PacketInfo &packetInfo = this->packetInfo; */ file->Rewind(); @@ -190,7 +190,7 @@ void MP3_MetaHandler::CacheFileData() } else { this->extHeaderSize = synchToInt32( XIO::ReadInt32_BE( file)); - XMP_Uns8 extHeaderNumFlagBytes = XIO::ReadUns8( file ); + /*XMP_Uns8 extHeaderNumFlagBytes =*/ XIO::ReadUns8( file ); // v2.3 doesn't include the size, while v2.4 does if ( this->majorVersion < 4 ) this->extHeaderSize += 4; @@ -714,7 +714,7 @@ void MP3_MetaHandler::UpdateFile ( bool doSafeUpdate ) } // check end of file for ID3v1 tag - XMP_Int64 possibleTruncationPoint = file->Seek ( -128, kXMP_SeekFromEnd ); + /* XMP_Int64 possibleTruncationPoint = */ file->Seek ( -128, kXMP_SeekFromEnd ); bool alreadyHasID3v1 = (XIO::ReadInt32_BE( file ) & 0xFFFFFF00) == 0x54414700; // "TAG" if ( ! alreadyHasID3v1 ) file->Seek ( 128, kXMP_SeekFromEnd ); // Seek will extend the file. id3v1Tag.write( file, &this->xmpObj ); diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp index ee25d7a..ebf190f 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp @@ -489,7 +489,7 @@ static bool ImportMVHDItems ( MOOV_Manager::BoxInfo mvhdInfo, SXMPMeta * xmp ) if ( timescale != 0 ) { // Avoid 1/0 for the scale field. char buffer [32]; // A 64-bit number is at most 20 digits. xmp->DeleteProperty ( kXMP_NS_DM, "duration" ); // Delete the whole struct. - snprintf ( buffer, sizeof(buffer), "%llu", duration ); // AUDIT: The buffer is big enough. + snprintf ( buffer, sizeof(buffer), "%llu", (long long unsigned)duration ); // AUDIT: The buffer is big enough. xmp->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "value", &buffer[0] ); snprintf ( buffer, sizeof(buffer), "1/%u", timescale ); // AUDIT: The buffer is big enough. xmp->SetStructField ( kXMP_NS_DM, "duration", kXMP_NS_DM, "scale", &buffer[0] ); @@ -722,7 +722,7 @@ static void ExportISOCopyrights ( const SXMPMeta & xmp, MOOV_Manager * moovMgr ) // Go through the XMP items and look for a corresponding ISO item. Skip if found (did it above), // otherwise add a new ISO item. - bool haveXDefault = false; + /*bool haveXDefault = false;*/ XMP_Index xmpCount = xmp.CountArrayItems ( kXMP_NS_DC, "rights" ); for ( XMP_Index xmpIndex = 1; xmpIndex <= xmpCount; ++xmpIndex ) { // ! The first XMP array index is 1. @@ -732,7 +732,7 @@ static void ExportISOCopyrights ( const SXMPMeta & xmp, MOOV_Manager * moovMgr ) bool hasLang = xmp.GetQualifier ( kXMP_NS_DC, xmpPath.c_str(), kXMP_NS_XML, "lang", &xmpLang, 0 ); if ( ! hasLang ) continue; // Sanity check. if ( xmpLang == "x-default" ) { - haveXDefault = true; // See later special case. + /*haveXDefault = true;*/ // See later special case. continue; } @@ -2647,7 +2647,7 @@ void MPEG4_MetaHandler::OptimizeFileLayout() XMP_AbortProc abortProc = parent->abortProc; void * abortArg = parent->abortArg; - const bool checkAbort = (abortProc != 0); + /*const bool checkAbort = (abortProc != 0);*/ XMP_Uns64 currPos, nextPos; ISOMedia::BoxInfo currBox; @@ -2922,12 +2922,12 @@ void MPEG4_MetaHandler::UpdateFile ( bool doSafeUpdate ) this->needsUpdate = false; // Make sure only called once. XMP_Assert ( ! doSafeUpdate ); // This should only be called for "unsafe" updates. - XMP_AbortProc abortProc = this->parent->abortProc; - void * abortArg = this->parent->abortArg; - const bool checkAbort = (abortProc != 0); + /*XMP_AbortProc abortProc = this->parent->abortProc;*/ + /*void * abortArg = this->parent->abortArg;*/ + /*const bool checkAbort = (abortProc != 0);*/ XMP_IO* fileRef = this->parent->ioRef; - XMP_Uns64 fileSize = fileRef->Length(); + /*XMP_Uns64 fileSize =*/ fileRef->Length(); bool haveISOFile = (this->fileMode == MOOV_Manager::kFileIsNormalISO); @@ -3063,4 +3063,4 @@ void MPEG4_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) } // MPEG4_MetaHandler::WriteTempFile -// =================================================================================================
\ No newline at end of file +// ================================================================================================= diff --git a/XMPFiles/source/FileHandlers/P2_Handler.cpp b/XMPFiles/source/FileHandlers/P2_Handler.cpp index 1b7ad09..b59bafb 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.cpp @@ -1103,7 +1103,7 @@ void P2_MetaHandler::CacheFileData() this->xmpPacket.erase(); this->xmpPacket.append ( (size_t)xmpLen, ' ' ); - XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); + /*XMP_Int32 ioCount =*/ xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); this->packetInfo.offset = 0; this->packetInfo.length = (XMP_Int32)xmpLen; diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.cpp b/XMPFiles/source/FileHandlers/PSD_Handler.cpp index 312e855..041c1e9 100644 --- a/XMPFiles/source/FileHandlers/PSD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PSD_Handler.cpp @@ -113,7 +113,7 @@ PSD_MetaHandler::~PSD_MetaHandler() void PSD_MetaHandler::CacheFileData() { XMP_IO* fileRef = this->parent->ioRef; - XMP_PacketInfo & packetInfo = this->packetInfo; + /*XMP_PacketInfo & packetInfo = this->packetInfo;*/ XMP_AbortProc abortProc = this->parent->abortProc; void * abortArg = this->parent->abortArg; @@ -357,7 +357,7 @@ void PSD_MetaHandler::WriteTempFile ( XMP_IO* tempRef ) XMP_AbortProc abortProc = this->parent->abortProc; void * abortArg = this->parent->abortArg; - const bool checkAbort = (abortProc != 0); + /*const bool checkAbort = (abortProc != 0);*/ XMP_ProgressTracker* progressTracker = this->parent->progressTracker; XMP_Uns64 sourceLen = origRef->Length(); diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp index 4467794..892475f 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp @@ -91,7 +91,7 @@ PostScript_MetaHandler::~PostScript_MetaHandler() int PostScript_MetaHandler::FindPostScriptHint() { - bool found = false; + /*bool found = false;*/ IOBuffer ioBuf; XMP_Uns8 ch; @@ -112,7 +112,7 @@ int PostScript_MetaHandler::FindPostScriptHint() if ( ! CheckFileSpace ( fileRef, &ioBuf, 30 ) ) return false; XMP_Uns32 psOffset = GetUns32LE ( ioBuf.ptr+4 ); // PostScript offset. - XMP_Uns32 psLength = GetUns32LE ( ioBuf.ptr+8 ); // PostScript length. + /*XMP_Uns32 psLength =*/ GetUns32LE ( ioBuf.ptr+8 ); // PostScript length. MoveToOffset ( fileRef, psOffset, &ioBuf ); @@ -227,7 +227,7 @@ int PostScript_MetaHandler::FindPostScriptHint() bool PostScript_MetaHandler::FindFirstPacket() { int snipCount; - bool found = false; + /*bool found = false;*/ size_t bufPos, bufLen; XMP_IO* fileRef = this->parent->ioRef; @@ -453,7 +453,7 @@ bool PostScript_MetaHandler::ExtractDSCCommentValue(IOBuffer &ioBuf,NativeMetada bool PostScript_MetaHandler::ExtractContainsXMPHint(IOBuffer &ioBuf,XMP_Int64 containsXMPStartpos) { XMP_IO* fileRef = this->parent->ioRef; - int xmpHint = kPSHint_NoMain; // ! From here on, a failure means "no main", not "no marker". + /*int xmpHint = kPSHint_NoMain;*/ // ! From here on, a failure means "no main", not "no marker". //checkfor atleast one whitespace if ( ! CheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false; if ( ! IsSpaceOrTab ( *ioBuf.ptr ) ) return false; @@ -547,7 +547,7 @@ bool PostScript_MetaHandler::ExtractDocInfoDict(IOBuffer &ioBuf) std::string key, value; while(true) { - XMP_Uns32 noOfMarks=0; + /*XMP_Uns32 noOfMarks=0;*/ if ( ! PostScript_Support::RevCheckFileSpace ( fileRef, &ioBuf, 1 ) ) return false; if (*ioBuf.ptr==')') { @@ -639,7 +639,7 @@ bool PostScript_MetaHandler::ExtractDocInfoDict(IOBuffer &ioBuf) // and other insertion related Data is looked for and stored void PostScript_MetaHandler::ParsePSFile() { - bool found = false; + /*bool found = false;*/ IOBuffer ioBuf; XMP_IO* fileRef = this->parent->ioRef; @@ -1752,7 +1752,7 @@ void PostScript_MetaHandler::UpdateFile ( bool doSafeUpdate ) XMP_IO * tempRef = 0; XMP_IO* fileRef = this->parent->ioRef; - std::string & xmpPacket = this->xmpPacket; + /*std::string & xmpPacket = this->xmpPacket;*/ std::string outStr; if (!fileRef ) diff --git a/XMPFiles/source/FileHandlers/SVG_Handler.cpp b/XMPFiles/source/FileHandlers/SVG_Handler.cpp index 93ef108..05bd81b 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.cpp @@ -206,8 +206,8 @@ void SVG_MetaHandler::CacheFileData() // Making SVG node as Root Node svgNode = rootElem; - bool FoundPI = false; - bool FoundWrapper = false; + /*bool FoundPI = false;*/ + /*bool FoundWrapper = false;*/ XML_NodePtr metadataNode = svgNode->GetNamedElement( rootElem->ns.c_str(), "metadata" ); // We are intersted only in the Metadata tag of outer SVG element diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.cpp b/XMPFiles/source/FileHandlers/SWF_Handler.cpp index 3266e94..b414f56 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.cpp @@ -239,7 +239,10 @@ void SWF_MetaHandler::UpdateFile ( bool doSafeUpdate ) memcpy ( &this->expandedSWF[this->firstTagOffset], &buffer[0], 6 ); this->hasFileAttributes = true; - bool ok = SWF_IO::GetTagInfo ( this->expandedSWF, this->firstTagOffset, &this->fileAttributesTag ); +#if XMP_DebugBuild + bool ok = +#endif + SWF_IO::GetTagInfo ( this->expandedSWF, this->firstTagOffset, &this->fileAttributesTag ); XMP_Assert ( ok ); if ( this->hasMetadata ) this->metadataTag.tagOffset += 6; // The Metadata tag is now further back. diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp index 17e5baf..e5660f0 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp @@ -859,7 +859,7 @@ void SonyHDV_MetaHandler::CacheFileData() this->xmpPacket.erase(); this->xmpPacket.append ( (size_t)xmpLen, ' ' ); - XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); + /*XMP_Int32 ioCount =*/ xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); this->packetInfo.offset = 0; this->packetInfo.length = (XMP_Int32)xmpLen; diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp index 66075bd..59c360b 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp @@ -114,7 +114,7 @@ TIFF_MetaHandler::~TIFF_MetaHandler() void TIFF_MetaHandler::CacheFileData() { XMP_IO* fileRef = this->parent->ioRef; - XMP_PacketInfo & packetInfo = this->packetInfo; + /*XMP_PacketInfo & packetInfo = this->packetInfo;*/ XMP_AbortProc abortProc = this->parent->abortProc; void * abortArg = this->parent->abortArg; @@ -294,8 +294,8 @@ void TIFF_MetaHandler::UpdateFile ( bool doSafeUpdate ) XMP_Assert ( ! doSafeUpdate ); // This should only be called for "unsafe" updates. XMP_IO* destRef = this->parent->ioRef; - XMP_AbortProc abortProc = this->parent->abortProc; - void * abortArg = this->parent->abortArg; + /*XMP_AbortProc abortProc = this->parent->abortProc;*/ + /*void * abortArg = this->parent->abortArg;*/ XMP_Int64 oldPacketOffset = this->packetInfo.offset; XMP_Int32 oldPacketLength = this->packetInfo.length; diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.cpp b/XMPFiles/source/FileHandlers/UCF_Handler.cpp index d304bc2..9c5cf10 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.cpp @@ -204,7 +204,7 @@ void UCF_MetaHandler::CacheFileData() //*** abort procedures this->containsXMP = false; //assume no XMP for now (beware of exceptions...) XMP_IO* file = this->parent->ioRef; - XMP_PacketInfo &packetInfo = this->packetInfo; + /*XMP_PacketInfo &packetInfo = this->packetInfo;*/ // clear file positioning info --------------------------------------------------- b=0;b2=0;x=0;x2=0;cd=0;cd2=0;cdx=0;cdx2=0;h=0;h2=0,fl=0;f2l=0; @@ -224,8 +224,8 @@ void UCF_MetaHandler::CacheFileData() // plus almost all comments will be zero or rather short //no need to check anything but the 21 chars of "METADATA-INF/metadata.xml" - char filenameToTest[22]; - filenameToTest[21]='\0'; + /*char filenameToTest[22];*/ + /*filenameToTest[21]='\0';*/ XMP_Int32 zipCommentLen = 0; for ( ; zipCommentLen <= EndOfDirectory::COMMENT_MAX; zipCommentLen++ ) @@ -267,7 +267,7 @@ void UCF_MetaHandler::CacheFileData() // to to central directory if ( cd == 0xffffffff ) { // deal with zip 64, otherwise continue - XMP_Int64 tmp = file->Seek ( -(EndOfDirectory::FIXED_SIZE + Zip64Locator::TOTAL_SIZE), + /*XMP_Int64 tmp =*/ file->Seek ( -(EndOfDirectory::FIXED_SIZE + Zip64Locator::TOTAL_SIZE), kXMP_SeekFromCurrent ); //go to begining of zip64 locator //relative movement , absolute would imho only require another -zipCommentLen @@ -290,7 +290,7 @@ void UCF_MetaHandler::CacheFileData() XMP_Validate( Zip64EndOfDirectory::ID == XIO::ReadUns32_LE(file), "invalid zip64 end of CD sig", kXMPErr_BadFileFormat ); - XMP_Int64 sizeOfZip64EOD = XIO::ReadUns64_LE(file); + /*XMP_Int64 sizeOfZip64EOD =*/ XIO::ReadUns64_LE(file); file->Seek ( 12, kXMP_SeekFromCurrent ); //yes twice "total" and "per disk" XMP_Int64 tmp64 = XIO::ReadUns64_LE(file); @@ -361,8 +361,8 @@ void UCF_MetaHandler::CacheFileData() XMP_Uns16 CD_compression = GetUns16LE( &xmpCDHeader.fields[CDFileHeader::o_compression] ); XMP_Validate(( CD_compression == 0 || CD_compression == 0x08), "illegal compression, must be flate or none", kXMPErr_BadFileFormat ); - XMP_Uns16 CD_flags = GetUns16LE( &xmpCDHeader.fields[CDFileHeader::o_flags] ); - XMP_Uns32 CD_crc = GetUns32LE( &xmpCDHeader.fields[CDFileHeader::o_crc32] ); + /*XMP_Uns16 CD_flags = GetUns16LE( &xmpCDHeader.fields[CDFileHeader::o_flags] );*/ + /*XMP_Uns32 CD_crc = GetUns32LE( &xmpCDHeader.fields[CDFileHeader::o_crc32] );*/ // parse (actual, non-CD!) file header //////////////////////////////////////////////// x = xmpCDHeader.offsetLocalHeader; @@ -829,8 +829,8 @@ void UCF_MetaHandler::writeOut( XMP_IO* sourceFile, XMP_IO* targetFile, bool isR // if inPlace, the only thing that needs still correction is the CRC in CDX: if ( isInPlace ) { - XMP_Uns32 crc; //TEMP, not actually needed - crc = GetUns32LE( &xmpFileHeader.fields[FileHeader::o_crc32] ); + /*XMP_Uns32 crc; //TEMP, not actually needed + crc = GetUns32LE( &xmpFileHeader.fields[FileHeader::o_crc32] ); */ // go there, // do the job (take value directly from (non-CD-)fileheader), @@ -847,10 +847,10 @@ void UCF_MetaHandler::writeOut( XMP_IO* sourceFile, XMP_IO* targetFile, bool isR int tmptmp=1; for( iter = cdEntries.begin(); iter != cdEntries.end(); iter++ ) { CDFileHeader* p=&(*iter); - XMP_Int64 before = targetFile->Offset(); + /*XMP_Int64 before = targetFile->Offset();*/ p->write( targetFile ); - XMP_Int64 total = targetFile->Offset() - before; - XMP_Int64 tmpSize = p->size(); + /*XMP_Int64 total = targetFile->Offset() - before;*/ + /*XMP_Int64 tmpSize = p->size();*/ tmptmp++; } diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp index 6f7f287..12b008d 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp @@ -186,9 +186,12 @@ void WAVE_MetaHandler::CacheFileData() this->parent->ioRef->Rewind(); XMP_Uns8 buffer[4]; - XMP_Int32 got = this->parent->ioRef->Read ( buffer, 4 ); +#if XMP_DebugBuild + XMP_Int32 got = +#endif + this->parent->ioRef->Read ( buffer, 4 ); XMP_Assert( got == 4 ); - + XMP_Uns32 type = WAVE_MetaHandler::whatRIFFFormat( buffer ); XMP_Assert( type == kChunk_RIFF || type == kChunk_RF64 ); diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp index 74c7c00..8e7a377 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp @@ -592,7 +592,7 @@ void XDCAMEX_MetaHandler::CacheFileData() this->xmpPacket.erase(); this->xmpPacket.append ( (size_t)xmpLen, ' ' ); - XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); + /*XMP_Int32 ioCount =*/ xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); this->packetInfo.offset = 0; this->packetInfo.length = (XMP_Int32)xmpLen; @@ -743,7 +743,7 @@ void XDCAMEX_MetaHandler::GetTakeUMID ( const std::string& clipUMID, // Parse MEDIAPRO.XML. XML_NodePtr mediaproRootElem = 0; - XML_NodePtr contentContext = 0, materialContext = 0; + XML_NodePtr contentContext = 0/*, materialContext = 0*/; Host_IO::FileRef hostRef = Host_IO::Open ( mediapropath.c_str(), Host_IO::openReadOnly ); if ( hostRef == Host_IO::noFileRef ) return; // The open failed. diff --git a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp index f0303df..b38f8f7 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp @@ -167,7 +167,7 @@ void XDCAMSAM_MetaHandler::SetPathVariables ( const std::string & clientPath ) XMP_Assert ( IsDigit( leafName.at( length - 2 ) ) && IsDigit( leafName.at( length - 1 ) ) ); // Last 3rd character of file will inform us about its type - const char fileType = leafName.at( length - 3 ); + /*const char fileType = leafName.at( length - 3 );*/ // A = Audio, C = ClipInfo, I = Picture Pointer, M = Non-Realtime, R = Realtime, S = Sub (Proxy), V = Video XMP_Assert ( fileType == 'A' || fileType == 'C' || fileType == 'I' || fileType == 'M' || fileType == 'R' || fileType == 'S' || fileType == 'V' ); diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp index 397b049..02386bc 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp @@ -511,7 +511,7 @@ void XDCAM_MetaHandler::CacheFileData() this->xmpPacket.erase(); this->xmpPacket.append ( (size_t)xmpLen, ' ' ); - XMP_Int32 ioCount = xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); + /*XMP_Int32 ioCount =*/ xmpFile->ReadAll ( (void*)this->xmpPacket.data(), (XMP_Int32)xmpLen ); this->packetInfo.offset = 0; this->packetInfo.length = (XMP_Int32)xmpLen; |