diff options
Diffstat (limited to 'XMPFiles')
168 files changed, 229 insertions, 547 deletions
diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp index df78092..5e14abc 100644 --- a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.hpp b/XMPFiles/source/FileHandlers/AIFF_Handler.hpp index 86975c7..330303f 100644 --- a/XMPFiles/source/FileHandlers/AIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/AIFF_Handler.hpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __AIFF_Handler_hpp__ diff --git a/XMPFiles/source/FileHandlers/ASF_Handler.cpp b/XMPFiles/source/FileHandlers/ASF_Handler.cpp index cc659ae..ebc52d5 100644 --- a/XMPFiles/source/FileHandlers/ASF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/ASF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/ASF_Handler.hpp b/XMPFiles/source/FileHandlers/ASF_Handler.hpp index c72a00b..d8826f2 100644 --- a/XMPFiles/source/FileHandlers/ASF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/ASF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/XMPFiles_Impl.hpp" diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp index 37712e7..58b4b1f 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp index cc66340..6e9ee0e 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/Basic_Handler.cpp b/XMPFiles/source/FileHandlers/Basic_Handler.cpp index f5008c3..dd1a12d 100644 --- a/XMPFiles/source/FileHandlers/Basic_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Basic_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Basic_Handler.hpp b/XMPFiles/source/FileHandlers/Basic_Handler.hpp index c9fbe05..ecd9ea0 100644 --- a/XMPFiles/source/FileHandlers/Basic_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Basic_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.cpp b/XMPFiles/source/FileHandlers/FLV_Handler.cpp index 8581df4..9f748ab 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.hpp b/XMPFiles/source/FileHandlers/FLV_Handler.hpp index e0c11d2..0687627 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.hpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.cpp b/XMPFiles/source/FileHandlers/GIF_Handler.cpp index 14931b5..64ecbe2 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of GIF file metadata, according to GIF89a Specification. // https://www.w3.org/Graphics/GIF/spec-gif89a.txt diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.hpp b/XMPFiles/source/FileHandlers/GIF_Handler.hpp index 0be49d0..4e11ab4 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of GIF file metadata, according to GIF89a Specification. // https://www.w3.org/Graphics/GIF/spec-gif89a.txt diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp index b0edb47..90cb4c9 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.hpp b/XMPFiles/source/FileHandlers/InDesign_Handler.hpp index addcece..e91a600 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.hpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp index ed8a4f4..9012ecb 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.hpp b/XMPFiles/source/FileHandlers/JPEG_Handler.hpp index fe58b5c..7c0e513 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.cpp b/XMPFiles/source/FileHandlers/MP3_Handler.cpp index aa80f1c..6c942a7 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.hpp b/XMPFiles/source/FileHandlers/MP3_Handler.hpp index e2e7e07..fc37eec 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp index 66545ef..1de5a59 100644 --- a/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if XMP_WinBuild diff --git a/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp b/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp index 73da950..231f625 100644 --- a/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp index b7fe357..ca9d935 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. @@ -2107,46 +2105,48 @@ void MPEG4_MetaHandler::ProcessXMP() // Import the non-XMP items. Do the imports in reverse priority order, last import wins! - MOOV_Manager::BoxInfo mvhdInfo; - MOOV_Manager::BoxRef mvhdRef = this->moovMgr.GetBox ( "moov/mvhd", &mvhdInfo ); - bool mvhdFound = ((mvhdRef != 0) && (mvhdInfo.contentSize != 0)); + if ( !xmpOnly ) { + MOOV_Manager::BoxInfo mvhdInfo; + MOOV_Manager::BoxRef mvhdRef = this->moovMgr.GetBox ( "moov/mvhd", &mvhdInfo ); + bool mvhdFound = ((mvhdRef != 0) && (mvhdInfo.contentSize != 0)); + + MOOV_Manager::BoxInfo udtaInfo; + MOOV_Manager::BoxRef udtaRef = this->moovMgr.GetBox ( "moov/udta", &udtaInfo ); + std::vector<MOOV_Manager::BoxInfo> cprtBoxes; + if ( udtaRef != 0 ) { + for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) { + MOOV_Manager::BoxInfo currInfo; + MOOV_Manager::BoxRef currRef = this->moovMgr.GetNthChild ( udtaRef, i, &currInfo ); + if ( currRef == 0 ) break; // Sanity check, should not happen. + if ( currInfo.boxType != ISOMedia::k_cprt ) continue; + cprtBoxes.push_back ( currInfo ); + } + } + bool cprtFound = (! cprtBoxes.empty()); - MOOV_Manager::BoxInfo udtaInfo; - MOOV_Manager::BoxRef udtaRef = this->moovMgr.GetBox ( "moov/udta", &udtaInfo ); - std::vector<MOOV_Manager::BoxInfo> cprtBoxes; - if ( udtaRef != 0 ) { - for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) { - MOOV_Manager::BoxInfo currInfo; - MOOV_Manager::BoxRef currRef = this->moovMgr.GetNthChild ( udtaRef, i, &currInfo ); - if ( currRef == 0 ) break; // Sanity check, should not happen. - if ( currInfo.boxType != ISOMedia::k_cprt ) continue; - cprtBoxes.push_back ( currInfo ); - } - } - bool cprtFound = (! cprtBoxes.empty()); - - bool tradQTFound = this->tradQTMgr.ParseCachedBoxes ( this->moovMgr ); + bool tradQTFound = this->tradQTMgr.ParseCachedBoxes ( this->moovMgr ); - bool tmcdFound = this->ParseTimecodeTrack(); + bool tmcdFound = this->ParseTimecodeTrack(); - if ( this->fileMode == MOOV_Manager::kFileIsNormalISO ) { + if ( this->fileMode == MOOV_Manager::kFileIsNormalISO ) { - if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); - if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); - if ( tmcdFound ) this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); - } else { // This is a QuickTime file, either traditional or modern. + if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); + if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); + if ( tmcdFound ) this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); + } else { // This is a QuickTime file, either traditional or modern. - if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); - if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); - if ( tmcdFound | tradQTFound ) { - // Some of the timecode items are in the .../udta/... set but handled by ImportTimecodeItems. - this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); - } + if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); + if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); + if ( tmcdFound | tradQTFound ) { + // Some of the timecode items are in the .../udta/... set but handled by ImportTimecodeItems. + this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); + } - this->containsXMP |= ImportCr8rItems ( this->moovMgr, &this->xmpObj ); + this->containsXMP |= ImportCr8rItems ( this->moovMgr, &this->xmpObj ); + } } - + } // MPEG4_MetaHandler::ProcessXMP // ================================================================================================= diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp index a55aa1e..913597f 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/XMPFiles_Impl.hpp" diff --git a/XMPFiles/source/FileHandlers/P2_Handler.cpp b/XMPFiles/source/FileHandlers/P2_Handler.cpp index d4e6190..580fc5e 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/P2_Handler.hpp b/XMPFiles/source/FileHandlers/P2_Handler.hpp index ba07325..9a32527 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.hpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/PNG_Handler.cpp b/XMPFiles/source/FileHandlers/PNG_Handler.cpp index 78544e1..ac47831 100644 --- a/XMPFiles/source/FileHandlers/PNG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PNG_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/PNG_Handler.hpp b/XMPFiles/source/FileHandlers/PNG_Handler.hpp index b43f398..30622f1 100644 --- a/XMPFiles/source/FileHandlers/PNG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PNG_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.cpp b/XMPFiles/source/FileHandlers/PSD_Handler.cpp index e17a65a..cdca139 100644 --- a/XMPFiles/source/FileHandlers/PSD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PSD_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.hpp b/XMPFiles/source/FileHandlers/PSD_Handler.hpp index cf90fd8..1d43cba 100644 --- a/XMPFiles/source/FileHandlers/PSD_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PSD_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/TIFF_Support.hpp" diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp index 32b82ba..bc55dfa 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.hpp b/XMPFiles/source/FileHandlers/PostScript_Handler.hpp index ca8a93e..596313f 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp index 4c075b1..e21c9b6 100644 --- a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/RIFF_Handler.hpp b/XMPFiles/source/FileHandlers/RIFF_Handler.hpp index b067855..7a1fc5f 100644 --- a/XMPFiles/source/FileHandlers/RIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/RIFF_Handler.hpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __RIFF_Handler_hpp__ #define __RIFF_Handler_hpp__ 1 diff --git a/XMPFiles/source/FileHandlers/SVG_Handler.cpp b/XMPFiles/source/FileHandlers/SVG_Handler.cpp index b090823..029c8ad 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" @@ -390,6 +388,8 @@ bool SVG_CheckFormat( XMP_FileFormat format, if ( svgChecker == 0 ) return false; + svgChecker->SetErrorCallback(&parent->errorCallback); + bool isSVG = false; bool isCompressed = false; diff --git a/XMPFiles/source/FileHandlers/SVG_Handler.hpp b/XMPFiles/source/FileHandlers/SVG_Handler.hpp index f5681b0..f42857a 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.hpp @@ -7,13 +7,11 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" -// Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, +// Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, // Institut National de Recherche en Informatique et en Automatique, Keio University). // All Rights Reserved . http://www.w3.org/Consortium/Legal // diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.cpp b/XMPFiles/source/FileHandlers/SWF_Handler.cpp index 8ca52de..711b907 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.hpp b/XMPFiles/source/FileHandlers/SWF_Handler.hpp index 0feb43f..9efb7b0 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Scanner_Handler.cpp b/XMPFiles/source/FileHandlers/Scanner_Handler.cpp index cb34ef1..a3b68cc 100644 --- a/XMPFiles/source/FileHandlers/Scanner_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Scanner_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Scanner_Handler.hpp b/XMPFiles/source/FileHandlers/Scanner_Handler.hpp index aea311f..2bdae43 100644 --- a/XMPFiles/source/FileHandlers/Scanner_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Scanner_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FileHandlers/Trivial_Handler.hpp" diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp index 3e0faf8..e4a7162 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp index 73378b9..6efbc73 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp index bea3a8c..0960b07 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.hpp b/XMPFiles/source/FileHandlers/TIFF_Handler.hpp index c310dd5..4326427 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/TIFF_Support.hpp" diff --git a/XMPFiles/source/FileHandlers/Trivial_Handler.cpp b/XMPFiles/source/FileHandlers/Trivial_Handler.cpp index 19efa09..3507beb 100644 --- a/XMPFiles/source/FileHandlers/Trivial_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Trivial_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Trivial_Handler.hpp b/XMPFiles/source/FileHandlers/Trivial_Handler.hpp index 321034a..41a50cc 100644 --- a/XMPFiles/source/FileHandlers/Trivial_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Trivial_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/XMPFiles_Impl.hpp" diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.cpp b/XMPFiles/source/FileHandlers/UCF_Handler.cpp index ee03e24..561c5b3 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // =============================================================================================== #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.hpp b/XMPFiles/source/FileHandlers/UCF_Handler.hpp index 0177112..f20a9b2 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp index 9a55eb3..d3fb97c 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.hpp b/XMPFiles/source/FileHandlers/WAVE_Handler.hpp index 7c35ec6..d516acb 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.hpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.hpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __WAVE_Handler_hpp__ diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp index 25434c0..430ddf7 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp index e5eb716..e60f98b 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp index eb085ff..a70d76a 100644 --- a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp index cacf559..1d20393 100644 --- a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp index 9e60e74..08aceb9 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp index 957e965..4b7872d 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp index 9a39e4b..df26ec9 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp index 3bbfd0c..d0b4436 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp index 3851ad8..4e7b864 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h index 03a65c0..3476ef9 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _AIFFBEHAVIOR_h_ diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp index f1c54e2..55f29f5 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h index bc6c227..e284e4d 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _AIFFMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp index 57ddb47..3f95a16 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h index f4a65e7..9866853 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _AIFFReconcile_h_ diff --git a/XMPFiles/source/FormatSupport/ASF_Support.cpp b/XMPFiles/source/FormatSupport/ASF_Support.cpp index a6a0fef..bfde554 100644 --- a/XMPFiles/source/FormatSupport/ASF_Support.cpp +++ b/XMPFiles/source/FormatSupport/ASF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. @@ -159,6 +157,11 @@ bool ASF_Support::ReadHeaderObject ( XMP_IO* fileRef, ObjectState& inOutObjectSt fileRef->Seek ( pos, kXMP_SeekFromStart ); objectBase.size = GetUns64LE ( &objectBase.size ); + if (XMP_Uns32(objectBase.size) <= 0) /* as ASF_ObjectBase has size in XMP_Uns64 , XMP_Uns32 would give 0 for very large files exceeding UINT32_MAX */ + { + XMP_Throw("Failure reading ASF header object", kXMPErr_InternalFailure); + } + if ( IsEqualGUID ( ASF_File_Properties_Object, objectBase.guid) && (objectBase.size >= 104 ) ) { buffer.clear(); diff --git a/XMPFiles/source/FormatSupport/ASF_Support.hpp b/XMPFiles/source/FormatSupport/ASF_Support.hpp index 1bed9b5..76e3d1f 100644 --- a/XMPFiles/source/FormatSupport/ASF_Support.hpp +++ b/XMPFiles/source/FormatSupport/ASF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ID3_Support.cpp b/XMPFiles/source/FormatSupport/ID3_Support.cpp index 6ada5a3..fe632dd 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.cpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ID3_Support.hpp b/XMPFiles/source/FormatSupport/ID3_Support.hpp index cff626e..f9d8466 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.hpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp index 6801248..b96e409 100644 --- a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp +++ b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IFF/Chunk.h b/XMPFiles/source/FormatSupport/IFF/Chunk.h index 61bc9be..3f6efd8 100644 --- a/XMPFiles/source/FormatSupport/IFF/Chunk.h +++ b/XMPFiles/source/FormatSupport/IFF/Chunk.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _Chunk_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp index af924cf..0cf7faf 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp +++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkController.h b/XMPFiles/source/FormatSupport/IFF/ChunkController.h index f14ef01..5ac3bfc 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkController.h +++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _ChunkController_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp b/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp index 74d84d8..b399cd0 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp +++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h" diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkPath.h b/XMPFiles/source/FormatSupport/IFF/ChunkPath.h index dd25010..25597b8 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkPath.h +++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _ChunkPath_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp index 739144e..a245e46 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp +++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h index 7ac3ca5..984cc66 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IChunkBehavior_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h b/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h index 2544466..e6da016 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IChunkContainer_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkData.h b/XMPFiles/source/FormatSupport/IFF/IChunkData.h index 97c94bc..8c5ac78 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkData.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkData.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IChunkData_h_ diff --git a/XMPFiles/source/FormatSupport/IPTC_Support.cpp b/XMPFiles/source/FormatSupport/IPTC_Support.cpp index d921073..9c28c38 100644 --- a/XMPFiles/source/FormatSupport/IPTC_Support.cpp +++ b/XMPFiles/source/FormatSupport/IPTC_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IPTC_Support.hpp b/XMPFiles/source/FormatSupport/IPTC_Support.hpp index fe362f9..f0e38b5 100644 --- a/XMPFiles/source/FormatSupport/IPTC_Support.hpp +++ b/XMPFiles/source/FormatSupport/IPTC_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp index e0811af..b0945cb 100644 --- a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp +++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp index be62a8e..24f60c4 100644 --- a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp +++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/META_Support.cpp b/XMPFiles/source/FormatSupport/META_Support.cpp index 95d2de5..281b9a8 100644 --- a/XMPFiles/source/FormatSupport/META_Support.cpp +++ b/XMPFiles/source/FormatSupport/META_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/META_Support.hpp" diff --git a/XMPFiles/source/FormatSupport/META_Support.hpp b/XMPFiles/source/FormatSupport/META_Support.hpp index aef9e70..545acd7 100644 --- a/XMPFiles/source/FormatSupport/META_Support.hpp +++ b/XMPFiles/source/FormatSupport/META_Support.hpp @@ -6,9 +6,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/MOOV_Support.cpp b/XMPFiles/source/FormatSupport/MOOV_Support.cpp index 07d5d51..f2c848c 100644 --- a/XMPFiles/source/FormatSupport/MOOV_Support.cpp +++ b/XMPFiles/source/FormatSupport/MOOV_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef TraceParseMoovTree diff --git a/XMPFiles/source/FormatSupport/MOOV_Support.hpp b/XMPFiles/source/FormatSupport/MOOV_Support.hpp index b0a320d..03eafc7 100644 --- a/XMPFiles/source/FormatSupport/MOOV_Support.hpp +++ b/XMPFiles/source/FormatSupport/MOOV_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/P2_Support.cpp b/XMPFiles/source/FormatSupport/P2_Support.cpp index be6242f..222c910 100644 --- a/XMPFiles/source/FormatSupport/P2_Support.cpp +++ b/XMPFiles/source/FormatSupport/P2_Support.cpp @@ -5,9 +5,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. @@ -153,7 +151,7 @@ void P2_Clip::CacheClipContent() p2Offset= p2node->GetNamedElement ( p2NameSpace, "GlobalShotID" ); GetElementLocation(p2Offset,headContent.shotId ); XML_NodePtr p2connection= p2node->GetNamedElement ( p2NameSpace, "Connection" ); - if ( p2node != 0 ) + if ( p2connection != 0 ) { p2node= p2connection->GetNamedElement ( p2NameSpace, "Top" ); if ( p2node != 0 ) diff --git a/XMPFiles/source/FormatSupport/P2_Support.hpp b/XMPFiles/source/FormatSupport/P2_Support.hpp index ba9a633..e1c317b 100644 --- a/XMPFiles/source/FormatSupport/P2_Support.hpp +++ b/XMPFiles/source/FormatSupport/P2_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/XMPFiles/source/FormatSupport/PNG_Support.cpp b/XMPFiles/source/FormatSupport/PNG_Support.cpp index 42d523c..79e9f49 100644 --- a/XMPFiles/source/FormatSupport/PNG_Support.cpp +++ b/XMPFiles/source/FormatSupport/PNG_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. #include "public/include/XMP_Const.h" diff --git a/XMPFiles/source/FormatSupport/PNG_Support.hpp b/XMPFiles/source/FormatSupport/PNG_Support.hpp index b243b66..6142556 100644 --- a/XMPFiles/source/FormatSupport/PNG_Support.hpp +++ b/XMPFiles/source/FormatSupport/PNG_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp index 1580210..b1ddc05 100644 --- a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp b/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp index 8cd3a89..a58f238 100644 --- a/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp +++ b/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PSIR_Support.hpp b/XMPFiles/source/FormatSupport/PSIR_Support.hpp index 7a3cf90..2bd6946 100644 --- a/XMPFiles/source/FormatSupport/PSIR_Support.hpp +++ b/XMPFiles/source/FormatSupport/PSIR_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp b/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp index 843a4db..b40ca49 100644 --- a/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp +++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp b/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp index 65c6462..2f55e87 100644 --- a/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp +++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/PostScript_Support.cpp b/XMPFiles/source/FormatSupport/PostScript_Support.cpp index d958880..85e4a4f 100644 --- a/XMPFiles/source/FormatSupport/PostScript_Support.cpp +++ b/XMPFiles/source/FormatSupport/PostScript_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/PostScript_Support.hpp" diff --git a/XMPFiles/source/FormatSupport/PostScript_Support.hpp b/XMPFiles/source/FormatSupport/PostScript_Support.hpp index 3c0a878..7d1cbd2 100644 --- a/XMPFiles/source/FormatSupport/PostScript_Support.hpp +++ b/XMPFiles/source/FormatSupport/PostScript_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" @@ -149,7 +147,7 @@ static const std::string kPS_XMPHintMainLast="%ADO_ContainsXMP: MainLast\n"; // embedd xpacket in EPS files.the xpacket is written inbetween kEPS_Injectdata1 and kEPS_Injectdata2. // The tokens kPS_Injectdata1 and kPS_Injectdata2 are used to embedd xpacket in DSC compliant PS files // The code inside the tokens is taken from examples in XMP Spec part 3 -// section 2.6.2 PS, EPS (PostScript® and Encapsulated PostScript) +// section 2.6.2 PS, EPS (PostScript and Encapsulated PostScript) static const std::string kEPS_Injectdata1="\n/currentdistillerparams where\n" "{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse\n" "{userdict /EPSHandler1_pdfmark /cleartomark load put\n" diff --git a/XMPFiles/source/FormatSupport/QuickTime_Support.cpp b/XMPFiles/source/FormatSupport/QuickTime_Support.cpp index 999e241..c467703 100644 --- a/XMPFiles/source/FormatSupport/QuickTime_Support.cpp +++ b/XMPFiles/source/FormatSupport/QuickTime_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/QuickTime_Support.hpp b/XMPFiles/source/FormatSupport/QuickTime_Support.hpp index ae67df4..ce202ea 100644 --- a/XMPFiles/source/FormatSupport/QuickTime_Support.hpp +++ b/XMPFiles/source/FormatSupport/QuickTime_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. @@ -40,10 +38,10 @@ enum { // List of recognized items from the QuickTime 'moov'/'udta' box. // These items are defined by Adobe. - kQTilst_Reel = 0xA952454CUL, // '©REL' - kQTilst_Timecode = 0xA954494DUL, // '©TIM' - kQTilst_TimeScale = 0xA9545343UL, // '©TSC' - kQTilst_TimeSize = 0xA954535AUL // '©TSZ' + kQTilst_Reel = 0xA952454CUL, // 'REL' + kQTilst_Timecode = 0xA954494DUL, // 'TIM' + kQTilst_TimeScale = 0xA9545343UL, // 'TSC' + kQTilst_TimeSize = 0xA954535AUL // 'TSZ' }; diff --git a/XMPFiles/source/FormatSupport/RIFF.cpp b/XMPFiles/source/FormatSupport/RIFF.cpp index 8cd76ca..bff4e6f 100644 --- a/XMPFiles/source/FormatSupport/RIFF.cpp +++ b/XMPFiles/source/FormatSupport/RIFF.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/RIFF.hpp b/XMPFiles/source/FormatSupport/RIFF.hpp index 5084a20..68db6d4 100644 --- a/XMPFiles/source/FormatSupport/RIFF.hpp +++ b/XMPFiles/source/FormatSupport/RIFF.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/RIFF_Support.cpp b/XMPFiles/source/FormatSupport/RIFF_Support.cpp index 8c7454b..f7881cb 100644 --- a/XMPFiles/source/FormatSupport/RIFF_Support.cpp +++ b/XMPFiles/source/FormatSupport/RIFF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/RIFF_Support.hpp b/XMPFiles/source/FormatSupport/RIFF_Support.hpp index 4418b59..824c860 100644 --- a/XMPFiles/source/FormatSupport/RIFF_Support.hpp +++ b/XMPFiles/source/FormatSupport/RIFF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp b/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp index fd83983..bf797d5 100644 --- a/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp index 0243ec7..717959f 100644 --- a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp index 8805dce..7404753 100644 --- a/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp +++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp index a3e6d79..d455516 100644 --- a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp b/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp index c7ca7f8..b52700d 100644 --- a/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp +++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp b/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp index 8f889a1..95aea90 100644 --- a/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp +++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp index c21d60c..9907b9a 100644 --- a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp +++ b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp @@ -3,9 +3,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" @@ -184,7 +182,7 @@ void SVG_Adapter::ParseBuffer( const void * buffer, size_t length, bool last /* #if BanAllEntityUsage if ( this->isAborted ) { - XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ) + XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ); this->NotifyClient( kXMPErrSev_Recoverable, error ); } #endif @@ -213,11 +211,18 @@ XMP_Bool SVG_Adapter::ParseBufferNoThrow( const void * buffer, size_t length, bo length = 1; } - status = XML_Parse( this->parser, ( const char * ) buffer, static_cast< XMP_StringLen >( length ), last ); + try + { + status = XML_Parse(this->parser, (const char *)buffer, static_cast<XMP_StringLen>(length), last); + } + catch (XMP_Error &e) + { + return false; //Don't let one failure abort checking other file formats , this api is called only from checkFileFormat + } #if BanAllEntityUsage if ( this->isAborted ) { - XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ) + XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ); this->NotifyClient( kXMPErrSev_Recoverable, error ); } #endif @@ -235,6 +240,8 @@ static void ParseFullNS( XMP_StringPtr fullName, string & NS, string &localName { // Expat delivers the full name as a catenation of namespace URI, separator, and local name. size_t sepPos = strlen( fullName ); + if (!sepPos) + return; //Throw? for ( --sepPos; sepPos > 0; --sepPos ) { if ( fullName[ sepPos ] == FullNameSeparator ) break; } diff --git a/XMPFiles/source/FormatSupport/SVG_Adapter.hpp b/XMPFiles/source/FormatSupport/SVG_Adapter.hpp index 0e9955d..dbb4c28 100644 --- a/XMPFiles/source/FormatSupport/SVG_Adapter.hpp +++ b/XMPFiles/source/FormatSupport/SVG_Adapter.hpp @@ -6,13 +6,11 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" -// Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, +// Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, // Institut National de Recherche en Informatique et en Automatique, Keio University). // All Rights Reserved . http://www.w3.org/Consortium/Legal // diff --git a/XMPFiles/source/FormatSupport/SWF_Support.cpp b/XMPFiles/source/FormatSupport/SWF_Support.cpp index 9ad9916..57af239 100644 --- a/XMPFiles/source/FormatSupport/SWF_Support.cpp +++ b/XMPFiles/source/FormatSupport/SWF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/SWF_Support.hpp b/XMPFiles/source/FormatSupport/SWF_Support.hpp index 0cbc875..2adcd0a 100644 --- a/XMPFiles/source/FormatSupport/SWF_Support.hpp +++ b/XMPFiles/source/FormatSupport/SWF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp index 3e34d4e..c99fafa 100644 --- a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp b/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp index b85a904..ed9f135 100644 --- a/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.cpp b/XMPFiles/source/FormatSupport/TIFF_Support.cpp index 5c960a4..2ecfca9 100644 --- a/XMPFiles/source/FormatSupport/TIFF_Support.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.hpp b/XMPFiles/source/FormatSupport/TIFF_Support.hpp index d2a0e2b..40d2fe4 100644 --- a/XMPFiles/source/FormatSupport/TIFF_Support.hpp +++ b/XMPFiles/source/FormatSupport/TIFF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp b/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp index e87c687..0c6e43f 100644 --- a/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp +++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp b/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp index ee21e67..db03c7b 100644 --- a/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp +++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp index f45f244..2a76f17 100644 --- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h index 67ad53a..45f806a 100644 --- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _BEXTMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp index a3c1113..7096a60 100644 --- a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h index 9dfe6e0..95734f9 100644 --- a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _CartMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp index 99aaa9b..1c678e4 100644 --- a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h index ea45829..eef6f23 100644 --- a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _Cr8rMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp index f0b1ca4..df35182 100644 --- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h index 124d052..036e221 100644 --- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _DISPMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp index 13c8178..2dfa32a 100644 --- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h index 007f461..451f1c7 100644 --- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _INFOMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp index afd274d..0866e0a 100644 --- a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h index bc566e2..5e53c41 100644 --- a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _PrmlMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp index f731bd6..0ef50e6 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h index 4a7be50..3e5b590 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _WAVEBEHAVIOR_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp index e5fc5bb..de15d28 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h index 9fbd112..f013884 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _WAVEReconcile_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp index ea8383e..690f3f4 100644 --- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h index 2b80a52..8b909f7 100644 --- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/XDCAM_Support.cpp b/XMPFiles/source/FormatSupport/XDCAM_Support.cpp index db29c2e..44afe01 100644 --- a/XMPFiles/source/FormatSupport/XDCAM_Support.cpp +++ b/XMPFiles/source/FormatSupport/XDCAM_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/XDCAM_Support.hpp b/XMPFiles/source/FormatSupport/XDCAM_Support.hpp index 10927ef..80d4174 100644 --- a/XMPFiles/source/FormatSupport/XDCAM_Support.hpp +++ b/XMPFiles/source/FormatSupport/XDCAM_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/XMPScanner.cpp b/XMPFiles/source/FormatSupport/XMPScanner.cpp index bdcc442..234baec 100644 --- a/XMPFiles/source/FormatSupport/XMPScanner.cpp +++ b/XMPFiles/source/FormatSupport/XMPScanner.cpp @@ -3,9 +3,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // Adobe patent application tracking #P435, entitled 'Unique markers to simplify embedding data of // one format in a file with a different format', inventors: Sean Parent, Greg Gilley. diff --git a/XMPFiles/source/FormatSupport/XMPScanner.hpp b/XMPFiles/source/FormatSupport/XMPScanner.hpp index cfdaaa3..aaeacc1 100644 --- a/XMPFiles/source/FormatSupport/XMPScanner.hpp +++ b/XMPFiles/source/FormatSupport/XMPScanner.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // Adobe patent application tracking #P435, entitled 'Unique markers to simplify embedding data of // one format in a file with a different format', inventors: Sean Parent, Greg Gilley. diff --git a/XMPFiles/source/HandlerRegistry.cpp b/XMPFiles/source/HandlerRegistry.cpp index b5164e9..b3e1569 100644 --- a/XMPFiles/source/HandlerRegistry.cpp +++ b/XMPFiles/source/HandlerRegistry.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/HandlerRegistry.h b/XMPFiles/source/HandlerRegistry.h index 69509d8..4152274 100644 --- a/XMPFiles/source/HandlerRegistry.h +++ b/XMPFiles/source/HandlerRegistry.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _HANDLERREGISTRY_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp index 92bcf08..d75812b 100644 --- a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp +++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/NativeMetadataSupport/IMetadata.h" diff --git a/XMPFiles/source/NativeMetadataSupport/IMetadata.h b/XMPFiles/source/NativeMetadataSupport/IMetadata.h index fe03786..d2191cc 100644 --- a/XMPFiles/source/NativeMetadataSupport/IMetadata.h +++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IMetadata_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp b/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp index 4a44477..eb75edc 100644 --- a/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp +++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/NativeMetadataSupport/IReconcile.h" diff --git a/XMPFiles/source/NativeMetadataSupport/IReconcile.h b/XMPFiles/source/NativeMetadataSupport/IReconcile.h index b658559..bea372e 100644 --- a/XMPFiles/source/NativeMetadataSupport/IReconcile.h +++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IReconcile_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp b/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp index f2e2a5a..b75928a 100644 --- a/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp +++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/NativeMetadataSupport/MetadataSet.h" diff --git a/XMPFiles/source/NativeMetadataSupport/MetadataSet.h b/XMPFiles/source/NativeMetadataSupport/MetadataSet.h index cbda559..7b8f95d 100644 --- a/XMPFiles/source/NativeMetadataSupport/MetadataSet.h +++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _MetadataSet_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/ValueObject.h b/XMPFiles/source/NativeMetadataSupport/ValueObject.h index 7406bcc..8fa25a1 100644 --- a/XMPFiles/source/NativeMetadataSupport/ValueObject.h +++ b/XMPFiles/source/NativeMetadataSupport/ValueObject.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _ValueObject_h_ diff --git a/XMPFiles/source/PluginHandler/FileHandler.h b/XMPFiles/source/PluginHandler/FileHandler.h index 014a2d5..2dc6895 100644 --- a/XMPFiles/source/PluginHandler/FileHandler.h +++ b/XMPFiles/source/PluginHandler/FileHandler.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef PLUGINHANDLER_H diff --git a/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp index 28218d0..f998ceb 100644 --- a/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp +++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "FileHandlerInstance.h" diff --git a/XMPFiles/source/PluginHandler/FileHandlerInstance.h b/XMPFiles/source/PluginHandler/FileHandlerInstance.h index 84b64a1..60167dd 100644 --- a/XMPFiles/source/PluginHandler/FileHandlerInstance.h +++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef PLUGINHANDLERINSTANCE_H diff --git a/XMPFiles/source/PluginHandler/HostAPIImpl.cpp b/XMPFiles/source/PluginHandler/HostAPIImpl.cpp index 465421f..3a60d40 100644 --- a/XMPFiles/source/PluginHandler/HostAPIImpl.cpp +++ b/XMPFiles/source/PluginHandler/HostAPIImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "HostAPI.h" diff --git a/XMPFiles/source/PluginHandler/Module.cpp b/XMPFiles/source/PluginHandler/Module.cpp index 2ae0dcc..f5ff15d 100644 --- a/XMPFiles/source/PluginHandler/Module.cpp +++ b/XMPFiles/source/PluginHandler/Module.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "Module.h" diff --git a/XMPFiles/source/PluginHandler/Module.h b/XMPFiles/source/PluginHandler/Module.h index c03eb65..a722565 100644 --- a/XMPFiles/source/PluginHandler/Module.h +++ b/XMPFiles/source/PluginHandler/Module.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef MODULE_H diff --git a/XMPFiles/source/PluginHandler/ModuleUtils.h b/XMPFiles/source/PluginHandler/ModuleUtils.h index bbae559..cadbb00 100644 --- a/XMPFiles/source/PluginHandler/ModuleUtils.h +++ b/XMPFiles/source/PluginHandler/ModuleUtils.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef MODULEUTILS_H diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp index ade76ae..0d767de 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp index 6a36e03..84c0eb7 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp index e3300a0..0f70fb4 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp b/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp index 7426fb4..0a1ee3e 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/PluginManager.cpp b/XMPFiles/source/PluginHandler/PluginManager.cpp index d7a5591..8fb79d7 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.cpp +++ b/XMPFiles/source/PluginHandler/PluginManager.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "PluginManager.h" diff --git a/XMPFiles/source/PluginHandler/PluginManager.h b/XMPFiles/source/PluginHandler/PluginManager.h index c2d8e37..a6b460c 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.h +++ b/XMPFiles/source/PluginHandler/PluginManager.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef PLUGINMANAGER_H diff --git a/XMPFiles/source/PluginHandler/XMPAtoms.cpp b/XMPFiles/source/PluginHandler/XMPAtoms.cpp index 8329afc..42f9732 100644 --- a/XMPFiles/source/PluginHandler/XMPAtoms.cpp +++ b/XMPFiles/source/PluginHandler/XMPAtoms.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPAtoms.h" diff --git a/XMPFiles/source/PluginHandler/XMPAtoms.h b/XMPFiles/source/PluginHandler/XMPAtoms.h index 3bade33..102c489 100644 --- a/XMPFiles/source/PluginHandler/XMPAtoms.h +++ b/XMPFiles/source/PluginHandler/XMPAtoms.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _H_XMPATOMS diff --git a/XMPFiles/source/WXMPFiles.cpp b/XMPFiles/source/WXMPFiles.cpp index fae04c9..ca493d2 100644 --- a/XMPFiles/source/WXMPFiles.cpp +++ b/XMPFiles/source/WXMPFiles.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/XMPFiles/source/XMPFiles.cpp b/XMPFiles/source/XMPFiles.cpp index 3721fb1..465c859 100644 --- a/XMPFiles/source/XMPFiles.cpp +++ b/XMPFiles/source/XMPFiles.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! diff --git a/XMPFiles/source/XMPFiles.hpp b/XMPFiles/source/XMPFiles.hpp index d6d280b..03ba873 100644 --- a/XMPFiles/source/XMPFiles.hpp +++ b/XMPFiles/source/XMPFiles.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp index 8a517d1..f1eb207 100644 --- a/XMPFiles/source/XMPFiles_Impl.cpp +++ b/XMPFiles/source/XMPFiles_Impl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/XMPFiles_Impl.hpp b/XMPFiles/source/XMPFiles_Impl.hpp index 026d012..f3632ce 100644 --- a/XMPFiles/source/XMPFiles_Impl.hpp +++ b/XMPFiles/source/XMPFiles_Impl.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! |