diff options
| author | arpitapanda05 <79362772+arpitapanda05@users.noreply.github.com> | 2021-08-30 13:14:19 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 13:14:19 +0530 |
| commit | a0476060ed1acc70f532c43a6f0193de97210c5e (patch) | |
| tree | 9dc2232e3bbcadde91d1d990be179d34ba0361f0 | |
| parent | 62baeb24aaf4a091790f0e57e7cbaf2755acb85b (diff) | |
Integration For August Release (#43)
* [CTECHXMP-4170513] Fix for PSIRT-17958
* [CTECHXMP-4170540] Fix for PSIRT-18145
* [CTECHXMP-4170557] Fix for PSIRT-18538
* [CTECHXMP-4170585] Fix for PSIRT-18750
* Fix add semicolons
* Changing the CopyRight note in all the files
514 files changed, 2458 insertions, 3322 deletions
diff --git a/XMPCommon/BaseClasses/MemoryManagedObject.h b/XMPCommon/BaseClasses/MemoryManagedObject.h index 18f9bfd..ae9362e 100644 --- a/XMPCommon/BaseClasses/MemoryManagedObject.h +++ b/XMPCommon/BaseClasses/MemoryManagedObject.h @@ -2,13 +2,11 @@ #define MemoryManagedObject_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/BaseClasses/TSingleton.h b/XMPCommon/BaseClasses/TSingleton.h index 543d484..afb780d 100644 --- a/XMPCommon/BaseClasses/TSingleton.h +++ b/XMPCommon/BaseClasses/TSingleton.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/ImplHeaders/ConfigurableImpl.h b/XMPCommon/ImplHeaders/ConfigurableImpl.h index f7ee1df..9465767 100644 --- a/XMPCommon/ImplHeaders/ConfigurableImpl.h +++ b/XMPCommon/ImplHeaders/ConfigurableImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h b/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h index b5cbdff..2925c8a 100644 --- a/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h +++ b/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h b/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h index e960f78..839c151 100644 --- a/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h +++ b/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IErrorNotifier_I.h" diff --git a/XMPCommon/ImplHeaders/ErrorImpl.h b/XMPCommon/ImplHeaders/ErrorImpl.h index 10e55f2..3b2f5f4 100644 --- a/XMPCommon/ImplHeaders/ErrorImpl.h +++ b/XMPCommon/ImplHeaders/ErrorImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h b/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h index 7d70665..d06f5e5 100644 --- a/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h +++ b/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h b/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h index 38e60e8..ac74a88 100644 --- a/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h +++ b/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IMemoryAllocator.h" diff --git a/XMPCommon/ImplHeaders/SharedMutexImpl.h b/XMPCommon/ImplHeaders/SharedMutexImpl.h index 1fb5f11..1a4d95b 100644 --- a/XMPCommon/ImplHeaders/SharedMutexImpl.h +++ b/XMPCommon/ImplHeaders/SharedMutexImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/SharedObjectImpl.h b/XMPCommon/ImplHeaders/SharedObjectImpl.h index 613fde9..8ef00ae 100644 --- a/XMPCommon/ImplHeaders/SharedObjectImpl.h +++ b/XMPCommon/ImplHeaders/SharedObjectImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h" diff --git a/XMPCommon/ImplHeaders/ThreadSafeImpl.h b/XMPCommon/ImplHeaders/ThreadSafeImpl.h index cb522b8..04f14e2 100644 --- a/XMPCommon/ImplHeaders/ThreadSafeImpl.h +++ b/XMPCommon/ImplHeaders/ThreadSafeImpl.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/UTF8StringImpl.h b/XMPCommon/ImplHeaders/UTF8StringImpl.h index c43d986..a8991e6 100644 --- a/XMPCommon/ImplHeaders/UTF8StringImpl.h +++ b/XMPCommon/ImplHeaders/UTF8StringImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h b/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h index 658bda2..d6a1169 100644 --- a/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h +++ b/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h b/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h index 94f6d95..4751048 100644 --- a/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h +++ b/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h b/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h index 73c8619..24a8ec2 100644 --- a/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h +++ b/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IConfigurationManager_I.h b/XMPCommon/Interfaces/IConfigurationManager_I.h index fa577d7..a8dcc95 100644 --- a/XMPCommon/Interfaces/IConfigurationManager_I.h +++ b/XMPCommon/Interfaces/IConfigurationManager_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IErrorNotifier_I.h b/XMPCommon/Interfaces/IErrorNotifier_I.h index 40f91d4..d270512 100644 --- a/XMPCommon/Interfaces/IErrorNotifier_I.h +++ b/XMPCommon/Interfaces/IErrorNotifier_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IError_I.h b/XMPCommon/Interfaces/IError_I.h index 9021605..080a863 100644 --- a/XMPCommon/Interfaces/IError_I.h +++ b/XMPCommon/Interfaces/IError_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCommon/Interfaces/IMemoryAllocator_I.h b/XMPCommon/Interfaces/IMemoryAllocator_I.h index 843714e..e520983 100644 --- a/XMPCommon/Interfaces/IMemoryAllocator_I.h +++ b/XMPCommon/Interfaces/IMemoryAllocator_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/ISharedMutex.h b/XMPCommon/Interfaces/ISharedMutex.h index 7353ae3..f8c2880 100644 --- a/XMPCommon/Interfaces/ISharedMutex.h +++ b/XMPCommon/Interfaces/ISharedMutex.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IUTF8String_I.h b/XMPCommon/Interfaces/IUTF8String_I.h index cb3f43e..3a8411c 100644 --- a/XMPCommon/Interfaces/IUTF8String_I.h +++ b/XMPCommon/Interfaces/IUTF8String_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Utilities/AutoSharedLock.h b/XMPCommon/Utilities/AutoSharedLock.h index 4be0b26..ba505e9 100644 --- a/XMPCommon/Utilities/AutoSharedLock.h +++ b/XMPCommon/Utilities/AutoSharedLock.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Utilities/IUTF8StringComparator.h b/XMPCommon/Utilities/IUTF8StringComparator.h index e964e78..aa0dfc5 100644 --- a/XMPCommon/Utilities/IUTF8StringComparator.h +++ b/XMPCommon/Utilities/IUTF8StringComparator.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Utilities/TAllocator.h b/XMPCommon/Utilities/TAllocator.h index 8842671..374f996 100644 --- a/XMPCommon/Utilities/TAllocator.h +++ b/XMPCommon/Utilities/TAllocator.h @@ -2,13 +2,11 @@ #define __TAllocator_h__ 1 // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/Utilities/TAtomicTypes.h b/XMPCommon/Utilities/TAtomicTypes.h index c8bdf4a..38bf805 100644 --- a/XMPCommon/Utilities/TAtomicTypes.h +++ b/XMPCommon/Utilities/TAtomicTypes.h @@ -2,13 +2,11 @@ #define __TAtomicTypes_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCommon/Utilities/TAtomicTypes_Android.h b/XMPCommon/Utilities/TAtomicTypes_Android.h index 66a4d32..6c53485 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Android.h +++ b/XMPCommon/Utilities/TAtomicTypes_Android.h @@ -4,13 +4,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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_AndroidBuild diff --git a/XMPCommon/Utilities/TAtomicTypes_Linux.h b/XMPCommon/Utilities/TAtomicTypes_Linux.h index 134216a..c2895dd 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Linux.h +++ b/XMPCommon/Utilities/TAtomicTypes_Linux.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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_UNIXBuild diff --git a/XMPCommon/Utilities/TAtomicTypes_Mac.h b/XMPCommon/Utilities/TAtomicTypes_Mac.h index 409b11f..9ed9838 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Mac.h +++ b/XMPCommon/Utilities/TAtomicTypes_Mac.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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_MacBuild || XMP_iOSBuild diff --git a/XMPCommon/Utilities/TAtomicTypes_Win.h b/XMPCommon/Utilities/TAtomicTypes_Win.h index 1bddd2c..6cce19a 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Win.h +++ b/XMPCommon/Utilities/TAtomicTypes_Win.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCommon/Utilities/TSmartPointers_I.h b/XMPCommon/Utilities/TSmartPointers_I.h index 4b1e9d3..762406e 100644 --- a/XMPCommon/Utilities/TSmartPointers_I.h +++ b/XMPCommon/Utilities/TSmartPointers_I.h @@ -2,13 +2,11 @@ #define __TSmartPointers_I_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/Utilities/UTF8String.h b/XMPCommon/Utilities/UTF8String.h index ec73e70..95845a8 100644 --- a/XMPCommon/Utilities/UTF8String.h +++ b/XMPCommon/Utilities/UTF8String.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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> diff --git a/XMPCommon/XMPCommonDefines_I.h b/XMPCommon/XMPCommonDefines_I.h index d344856..ca39630 100644 --- a/XMPCommon/XMPCommonDefines_I.h +++ b/XMPCommon/XMPCommonDefines_I.h @@ -2,13 +2,11 @@ #define XMPCommonDefines_I_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines.h" diff --git a/XMPCommon/XMPCommonErrorCodes_I.h b/XMPCommon/XMPCommonErrorCodes_I.h index 691ed6b..3b0de65 100644 --- a/XMPCommon/XMPCommonErrorCodes_I.h +++ b/XMPCommon/XMPCommonErrorCodes_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/XMPCommonFwdDeclarations_I.h b/XMPCommon/XMPCommonFwdDeclarations_I.h index 381b85c..23b046d 100644 --- a/XMPCommon/XMPCommonFwdDeclarations_I.h +++ b/XMPCommon/XMPCommonFwdDeclarations_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/XMPCommon_I.h b/XMPCommon/XMPCommon_I.h index 1aa3fad..84f8d5d 100644 --- a/XMPCommon/XMPCommon_I.h +++ b/XMPCommon/XMPCommon_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/source/AutoSharedLock.cpp b/XMPCommon/source/AutoSharedLock.cpp index 5f7ec91..bf5e007 100644 --- a/XMPCommon/source/AutoSharedLock.cpp +++ b/XMPCommon/source/AutoSharedLock.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Utilities/AutoSharedLock.h" diff --git a/XMPCommon/source/ConfigurableImpl.cpp b/XMPCommon/source/ConfigurableImpl.cpp index 0ef3a69..1b4e2c4 100644 --- a/XMPCommon/source/ConfigurableImpl.cpp +++ b/XMPCommon/source/ConfigurableImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/ConfigurationManagerImpl.cpp b/XMPCommon/source/ConfigurationManagerImpl.cpp index 188e399..23de255 100644 --- a/XMPCommon/source/ConfigurationManagerImpl.cpp +++ b/XMPCommon/source/ConfigurationManagerImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/DefaultErrorNotifierImpl.cpp b/XMPCommon/source/DefaultErrorNotifierImpl.cpp index 245f2d5..83c7241 100644 --- a/XMPCommon/source/DefaultErrorNotifierImpl.cpp +++ b/XMPCommon/source/DefaultErrorNotifierImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCommon/source/ErrorImpl.cpp b/XMPCommon/source/ErrorImpl.cpp index 804bef5..58ab226 100644 --- a/XMPCommon/source/ErrorImpl.cpp +++ b/XMPCommon/source/ErrorImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/ErrorNotifierWrapperImpl.cpp b/XMPCommon/source/ErrorNotifierWrapperImpl.cpp index 5847850..54300dc 100644 --- a/XMPCommon/source/ErrorNotifierWrapperImpl.cpp +++ b/XMPCommon/source/ErrorNotifierWrapperImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/source/IConfigurable_I.cpp b/XMPCommon/source/IConfigurable_I.cpp index 23f06c6..92d2779 100644 --- a/XMPCommon/source/IConfigurable_I.cpp +++ b/XMPCommon/source/IConfigurable_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h" diff --git a/XMPCommon/source/IConfigurationManager_I.cpp b/XMPCommon/source/IConfigurationManager_I.cpp index 98ea66d..ebbf68a 100644 --- a/XMPCommon/source/IConfigurationManager_I.cpp +++ b/XMPCommon/source/IConfigurationManager_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IConfigurationManager_I.h" diff --git a/XMPCommon/source/IErrorNotifier_I.cpp b/XMPCommon/source/IErrorNotifier_I.cpp index e986307..85c800b 100644 --- a/XMPCommon/source/IErrorNotifier_I.cpp +++ b/XMPCommon/source/IErrorNotifier_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IErrorNotifier_I.h" diff --git a/XMPCommon/source/IError_I.cpp b/XMPCommon/source/IError_I.cpp index 6f44edf..93234fb 100644 --- a/XMPCommon/source/IError_I.cpp +++ b/XMPCommon/source/IError_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IError_I.h" diff --git a/XMPCommon/source/IMemoryAllocator_I.cpp b/XMPCommon/source/IMemoryAllocator_I.cpp index 6dac79e..4c76afa 100644 --- a/XMPCommon/source/IMemoryAllocator_I.cpp +++ b/XMPCommon/source/IMemoryAllocator_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IMemoryAllocator_I.h" diff --git a/XMPCommon/source/IUTF8StringComparator.cpp b/XMPCommon/source/IUTF8StringComparator.cpp index 8e83f61..d110b65 100644 --- a/XMPCommon/source/IUTF8StringComparator.cpp +++ b/XMPCommon/source/IUTF8StringComparator.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Utilities/IUTF8StringComparator.h" diff --git a/XMPCommon/source/IUTF8String_I.cpp b/XMPCommon/source/IUTF8String_I.cpp index 8ef2e82..8e7dd80 100644 --- a/XMPCommon/source/IUTF8String_I.cpp +++ b/XMPCommon/source/IUTF8String_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IUTF8String_I.h" diff --git a/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp b/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp index 8ffc33c..bb648bc 100644 --- a/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp +++ b/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/MemoryManagedObject.cpp b/XMPCommon/source/MemoryManagedObject.cpp index 7f3d453..3ed2875 100644 --- a/XMPCommon/source/MemoryManagedObject.cpp +++ b/XMPCommon/source/MemoryManagedObject.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCommon/source/SharedMutexImpl.cpp b/XMPCommon/source/SharedMutexImpl.cpp index 96a6979..da6e3a8 100644 --- a/XMPCommon/source/SharedMutexImpl.cpp +++ b/XMPCommon/source/SharedMutexImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/SharedObjectImpl.cpp b/XMPCommon/source/SharedObjectImpl.cpp index 19262f4..7fbd944 100644 --- a/XMPCommon/source/SharedObjectImpl.cpp +++ b/XMPCommon/source/SharedObjectImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/ThreadSafeImpl.cpp b/XMPCommon/source/ThreadSafeImpl.cpp index f760f63..c9357c9 100644 --- a/XMPCommon/source/ThreadSafeImpl.cpp +++ b/XMPCommon/source/ThreadSafeImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/UTF8StringImpl.cpp b/XMPCommon/source/UTF8StringImpl.cpp index e36df2e..f7eec2d 100644 --- a/XMPCommon/source/UTF8StringImpl.cpp +++ b/XMPCommon/source/UTF8StringImpl.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 <algorithm> diff --git a/XMPCommon/source/XMPCommon.cpp b/XMPCommon/source/XMPCommon.cpp index c227ee3..10dcdcd 100644 --- a/XMPCommon/source/XMPCommon.cpp +++ b/XMPCommon/source/XMPCommon.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommon_I.h" diff --git a/XMPCore/ImplHeaders/ArrayNodeImpl.h b/XMPCore/ImplHeaders/ArrayNodeImpl.h index 226953e..99a9f80 100644 --- a/XMPCore/ImplHeaders/ArrayNodeImpl.h +++ b/XMPCore/ImplHeaders/ArrayNodeImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h b/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h index eac03ba..ef410a7 100644 --- a/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h +++ b/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h b/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h index 44c7f1a..8156183 100644 --- a/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h +++ b/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/CompositeNodeImpl.h b/XMPCore/ImplHeaders/CompositeNodeImpl.h index 7e98288..dddd86f 100644 --- a/XMPCore/ImplHeaders/CompositeNodeImpl.h +++ b/XMPCore/ImplHeaders/CompositeNodeImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h b/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h index 43c91f1..5fb03b2 100644 --- a/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h +++ b/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h b/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h index d23737c..e75c3c5 100644 --- a/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h +++ b/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h b/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h index 8adf861..71374cd 100644 --- a/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h +++ b/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/DOMParserImpl.h b/XMPCore/ImplHeaders/DOMParserImpl.h index a6e668f..2061dbd 100644 --- a/XMPCore/ImplHeaders/DOMParserImpl.h +++ b/XMPCore/ImplHeaders/DOMParserImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/DOMSerializerImpl.h b/XMPCore/ImplHeaders/DOMSerializerImpl.h index d8dfe3a..4aa3913 100644 --- a/XMPCore/ImplHeaders/DOMSerializerImpl.h +++ b/XMPCore/ImplHeaders/DOMSerializerImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h b/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h index 88f50a5..4edf884 100644 --- a/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h +++ b/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/MetadataImpl.h b/XMPCore/ImplHeaders/MetadataImpl.h index bfa73b4..79fccda 100644 --- a/XMPCore/ImplHeaders/MetadataImpl.h +++ b/XMPCore/ImplHeaders/MetadataImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h b/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h index de6bfc9..e08aa1e 100644 --- a/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h +++ b/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/NodeImpl.h b/XMPCore/ImplHeaders/NodeImpl.h index 7699fd1..cf4a637 100644 --- a/XMPCore/ImplHeaders/NodeImpl.h +++ b/XMPCore/ImplHeaders/NodeImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/PathImpl.h b/XMPCore/ImplHeaders/PathImpl.h index efe58a2..95ce434 100644 --- a/XMPCore/ImplHeaders/PathImpl.h +++ b/XMPCore/ImplHeaders/PathImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/PathSegmentImpl.h b/XMPCore/ImplHeaders/PathSegmentImpl.h index f2fae98..034f306 100644 --- a/XMPCore/ImplHeaders/PathSegmentImpl.h +++ b/XMPCore/ImplHeaders/PathSegmentImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/RDFDOMParserImpl.h b/XMPCore/ImplHeaders/RDFDOMParserImpl.h index 1f7b829..1f74082 100644 --- a/XMPCore/ImplHeaders/RDFDOMParserImpl.h +++ b/XMPCore/ImplHeaders/RDFDOMParserImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h b/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h index 2d89a5a..3a8f01a 100644 --- a/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h +++ b/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/SimpleNodeImpl.h b/XMPCore/ImplHeaders/SimpleNodeImpl.h index a720031..57c47d6 100644 --- a/XMPCore/ImplHeaders/SimpleNodeImpl.h +++ b/XMPCore/ImplHeaders/SimpleNodeImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/ImplHeaders/StructureNodeImpl.h b/XMPCore/ImplHeaders/StructureNodeImpl.h index 0e27819..734a8ba 100644 --- a/XMPCore/ImplHeaders/StructureNodeImpl.h +++ b/XMPCore/ImplHeaders/StructureNodeImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/TNodeIteratorImpl.h b/XMPCore/ImplHeaders/TNodeIteratorImpl.h index ce9f400..c4ef6bc 100644 --- a/XMPCore/ImplHeaders/TNodeIteratorImpl.h +++ b/XMPCore/ImplHeaders/TNodeIteratorImpl.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/Interfaces/IArrayNode_I.h b/XMPCore/Interfaces/IArrayNode_I.h index fd846a3..0fd12c3 100644 --- a/XMPCore/Interfaces/IArrayNode_I.h +++ b/XMPCore/Interfaces/IArrayNode_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/ICompositeNode_I.h b/XMPCore/Interfaces/ICompositeNode_I.h index 7d84d9a..f9956a1 100644 --- a/XMPCore/Interfaces/ICompositeNode_I.h +++ b/XMPCore/Interfaces/ICompositeNode_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/ICoreConfigurationManager_I.h b/XMPCore/Interfaces/ICoreConfigurationManager_I.h index 30ab5e4..c129fb7 100644 --- a/XMPCore/Interfaces/ICoreConfigurationManager_I.h +++ b/XMPCore/Interfaces/ICoreConfigurationManager_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/ICoreObjectFactory_I.h b/XMPCore/Interfaces/ICoreObjectFactory_I.h index c495f80..fae354b 100644 --- a/XMPCore/Interfaces/ICoreObjectFactory_I.h +++ b/XMPCore/Interfaces/ICoreObjectFactory_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IDOMImplementationRegistry_I.h b/XMPCore/Interfaces/IDOMImplementationRegistry_I.h index 5678eed..9b09f6a 100644 --- a/XMPCore/Interfaces/IDOMImplementationRegistry_I.h +++ b/XMPCore/Interfaces/IDOMImplementationRegistry_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IDOMParser_I.h b/XMPCore/Interfaces/IDOMParser_I.h index d43a379..4d09731 100644 --- a/XMPCore/Interfaces/IDOMParser_I.h +++ b/XMPCore/Interfaces/IDOMParser_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IDOMSerializer_I.h b/XMPCore/Interfaces/IDOMSerializer_I.h index f4be443..cd68ae3 100644 --- a/XMPCore/Interfaces/IDOMSerializer_I.h +++ b/XMPCore/Interfaces/IDOMSerializer_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IMetadataConverterUtils_I.h b/XMPCore/Interfaces/IMetadataConverterUtils_I.h index 14a34c0..abe493d 100644 --- a/XMPCore/Interfaces/IMetadataConverterUtils_I.h +++ b/XMPCore/Interfaces/IMetadataConverterUtils_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IMetadata_I.h b/XMPCore/Interfaces/IMetadata_I.h index 74e44fb..3cabbd6 100644 --- a/XMPCore/Interfaces/IMetadata_I.h +++ b/XMPCore/Interfaces/IMetadata_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/INameSpacePrefixMap_I.h b/XMPCore/Interfaces/INameSpacePrefixMap_I.h index 6201aad..c350336 100644 --- a/XMPCore/Interfaces/INameSpacePrefixMap_I.h +++ b/XMPCore/Interfaces/INameSpacePrefixMap_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/INodeIterator_I.h b/XMPCore/Interfaces/INodeIterator_I.h index 20b69c4..2a37bc4 100644 --- a/XMPCore/Interfaces/INodeIterator_I.h +++ b/XMPCore/Interfaces/INodeIterator_I.h @@ -4,13 +4,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/INode_I.h b/XMPCore/Interfaces/INode_I.h index bf0bfd1..5e15407 100644 --- a/XMPCore/Interfaces/INode_I.h +++ b/XMPCore/Interfaces/INode_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IPathSegment_I.h b/XMPCore/Interfaces/IPathSegment_I.h index b0e1f25..fc95db7 100644 --- a/XMPCore/Interfaces/IPathSegment_I.h +++ b/XMPCore/Interfaces/IPathSegment_I.h @@ -2,13 +2,11 @@ #define __IPathSegment_I_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IPath_I.h b/XMPCore/Interfaces/IPath_I.h index 9c284f4..02e2505 100644 --- a/XMPCore/Interfaces/IPath_I.h +++ b/XMPCore/Interfaces/IPath_I.h @@ -2,13 +2,11 @@ #define __IPath_I_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/ISimpleNode_I.h b/XMPCore/Interfaces/ISimpleNode_I.h index b699d73..3d2330d 100644 --- a/XMPCore/Interfaces/ISimpleNode_I.h +++ b/XMPCore/Interfaces/ISimpleNode_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IStructureNode_I.h b/XMPCore/Interfaces/IStructureNode_I.h index 93dfd02..601e6a8 100644 --- a/XMPCore/Interfaces/IStructureNode_I.h +++ b/XMPCore/Interfaces/IStructureNode_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/Interfaces/IXMPLanguageAlternative_I.h b/XMPCore/Interfaces/IXMPLanguageAlternative_I.h index 66aa23f..6256f49 100644 --- a/XMPCore/Interfaces/IXMPLanguageAlternative_I.h +++ b/XMPCore/Interfaces/IXMPLanguageAlternative_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCore_Defines.h" diff --git a/XMPCore/XMPCoreDefines_I.h b/XMPCore/XMPCoreDefines_I.h index 3a29ba5..a2679ee 100644 --- a/XMPCore/XMPCoreDefines_I.h +++ b/XMPCore/XMPCoreDefines_I.h @@ -2,13 +2,11 @@ #define XMPCoreDefines_I_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/XMPCore/XMPCoreFwdDeclarations_I.h b/XMPCore/XMPCoreFwdDeclarations_I.h index 59635e5..661941c 100644 --- a/XMPCore/XMPCoreFwdDeclarations_I.h +++ b/XMPCore/XMPCoreFwdDeclarations_I.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreDefines_I.h" diff --git a/XMPCore/build/CMakeLists.txt b/XMPCore/build/CMakeLists.txt index 72b4b50..25deaa3 100644 --- a/XMPCore/build/CMakeLists.txt +++ b/XMPCore/build/CMakeLists.txt @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/XMPCore/source/ArrayNodeImpl.cpp b/XMPCore/source/ArrayNodeImpl.cpp index f8bf938..c35772c 100644 --- a/XMPCore/source/ArrayNodeImpl.cpp +++ b/XMPCore/source/ArrayNodeImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/ClientDOMParserWrapperImpl.cpp b/XMPCore/source/ClientDOMParserWrapperImpl.cpp index ab5c46a..92b698a 100644 --- a/XMPCore/source/ClientDOMParserWrapperImpl.cpp +++ b/XMPCore/source/ClientDOMParserWrapperImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore_Int { diff --git a/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp b/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp index 38da828..a334df8 100644 --- a/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp +++ b/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore_Int { diff --git a/XMPCore/source/CompositeNodeImpl.cpp b/XMPCore/source/CompositeNodeImpl.cpp index 6d2ab91..d774e9f 100644 --- a/XMPCore/source/CompositeNodeImpl.cpp +++ b/XMPCore/source/CompositeNodeImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/CoreConfigurationManagerImpl.cpp b/XMPCore/source/CoreConfigurationManagerImpl.cpp index 59be746..d2a2088 100644 --- a/XMPCore/source/CoreConfigurationManagerImpl.cpp +++ b/XMPCore/source/CoreConfigurationManagerImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/CoreObjectFactoryImpl.cpp b/XMPCore/source/CoreObjectFactoryImpl.cpp index a6e4a65..e57cfad 100644 --- a/XMPCore/source/CoreObjectFactoryImpl.cpp +++ b/XMPCore/source/CoreObjectFactoryImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/DOMImplementationRegistryImpl.cpp b/XMPCore/source/DOMImplementationRegistryImpl.cpp index 8c562d7..6e3f84c 100644 --- a/XMPCore/source/DOMImplementationRegistryImpl.cpp +++ b/XMPCore/source/DOMImplementationRegistryImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/DOMParserImpl.cpp b/XMPCore/source/DOMParserImpl.cpp index 0c0faaf..099f73b 100644 --- a/XMPCore/source/DOMParserImpl.cpp +++ b/XMPCore/source/DOMParserImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/DOMSerializerImpl.cpp b/XMPCore/source/DOMSerializerImpl.cpp index 6a5c4c9..a9c5b15 100644 --- a/XMPCore/source/DOMSerializerImpl.cpp +++ b/XMPCore/source/DOMSerializerImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/ExpatAdapter.cpp b/XMPCore/source/ExpatAdapter.cpp index 0c8d085..92ad80c 100644 --- a/XMPCore/source/ExpatAdapter.cpp +++ b/XMPCore/source/ExpatAdapter.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2005 Adobe +// Copyright 2020 Adobe // 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! @@ -148,7 +146,7 @@ void ExpatAdapter::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 diff --git a/XMPCore/source/IArrayNode_I.cpp b/XMPCore/source/IArrayNode_I.cpp index a1ef5ab..11622dd 100644 --- a/XMPCore/source/IArrayNode_I.cpp +++ b/XMPCore/source/IArrayNode_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/ICompositeNode_I.cpp b/XMPCore/source/ICompositeNode_I.cpp index 5a6f62b..e6a233c 100644 --- a/XMPCore/source/ICompositeNode_I.cpp +++ b/XMPCore/source/ICompositeNode_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/ICoreConfigurationManager_I.cpp b/XMPCore/source/ICoreConfigurationManager_I.cpp index ace4cb0..59e3866 100644 --- a/XMPCore/source/ICoreConfigurationManager_I.cpp +++ b/XMPCore/source/ICoreConfigurationManager_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/ICoreObjectFactory_I.cpp b/XMPCore/source/ICoreObjectFactory_I.cpp index a6483f8..35a726a 100644 --- a/XMPCore/source/ICoreObjectFactory_I.cpp +++ b/XMPCore/source/ICoreObjectFactory_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/IDOMImplementationRegistry_I.cpp b/XMPCore/source/IDOMImplementationRegistry_I.cpp index 688eb9e..9cc510d 100644 --- a/XMPCore/source/IDOMImplementationRegistry_I.cpp +++ b/XMPCore/source/IDOMImplementationRegistry_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/IDOMParser_I.cpp b/XMPCore/source/IDOMParser_I.cpp index 85d7c6d..39ecd2a 100644 --- a/XMPCore/source/IDOMParser_I.cpp +++ b/XMPCore/source/IDOMParser_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/IDOMSerializer_I.cpp b/XMPCore/source/IDOMSerializer_I.cpp index a1fa0f1..3f05fbf 100644 --- a/XMPCore/source/IDOMSerializer_I.cpp +++ b/XMPCore/source/IDOMSerializer_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/IMetadataConverterUtils_I.cpp b/XMPCore/source/IMetadataConverterUtils_I.cpp index b53a6b8..df280ad 100644 --- a/XMPCore/source/IMetadataConverterUtils_I.cpp +++ b/XMPCore/source/IMetadataConverterUtils_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/IMetadataConverterUtils_I.h" diff --git a/XMPCore/source/IMetadata_I.cpp b/XMPCore/source/IMetadata_I.cpp index 29e3e06..1702e24 100644 --- a/XMPCore/source/IMetadata_I.cpp +++ b/XMPCore/source/IMetadata_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/INameSpacePrefixMap_I.cpp b/XMPCore/source/INameSpacePrefixMap_I.cpp index ce24246..8aff4b4 100644 --- a/XMPCore/source/INameSpacePrefixMap_I.cpp +++ b/XMPCore/source/INameSpacePrefixMap_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/INodeIterator_I.cpp b/XMPCore/source/INodeIterator_I.cpp index a8170cc..1209415 100644 --- a/XMPCore/source/INodeIterator_I.cpp +++ b/XMPCore/source/INodeIterator_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/INode_I.cpp b/XMPCore/source/INode_I.cpp index b933aa0..ac0f29b 100644 --- a/XMPCore/source/INode_I.cpp +++ b/XMPCore/source/INode_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/IPathSegment_I.cpp b/XMPCore/source/IPathSegment_I.cpp index 92d7138..40e5715 100644 --- a/XMPCore/source/IPathSegment_I.cpp +++ b/XMPCore/source/IPathSegment_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/IPath_I.cpp b/XMPCore/source/IPath_I.cpp index 6906daf..01717a1 100644 --- a/XMPCore/source/IPath_I.cpp +++ b/XMPCore/source/IPath_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/ISimpleNode_I.cpp b/XMPCore/source/ISimpleNode_I.cpp index 88d6f95..6e88612 100644 --- a/XMPCore/source/ISimpleNode_I.cpp +++ b/XMPCore/source/ISimpleNode_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/IStructureNode_I.cpp b/XMPCore/source/IStructureNode_I.cpp index 12fcb4c..3eee8b1 100644 --- a/XMPCore/source/IStructureNode_I.cpp +++ b/XMPCore/source/IStructureNode_I.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/MetadataConverterUtilsImpl.cpp b/XMPCore/source/MetadataConverterUtilsImpl.cpp index 88eca9e..afbe926 100644 --- a/XMPCore/source/MetadataConverterUtilsImpl.cpp +++ b/XMPCore/source/MetadataConverterUtilsImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 <sstream> diff --git a/XMPCore/source/MetadataImpl.cpp b/XMPCore/source/MetadataImpl.cpp index 61f0c61..ca8d964 100644 --- a/XMPCore/source/MetadataImpl.cpp +++ b/XMPCore/source/MetadataImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/NameSpacePrefixMapImpl.cpp b/XMPCore/source/NameSpacePrefixMapImpl.cpp index fc68d12..3bf58a2 100644 --- a/XMPCore/source/NameSpacePrefixMapImpl.cpp +++ b/XMPCore/source/NameSpacePrefixMapImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/NodeImpl.cpp b/XMPCore/source/NodeImpl.cpp index be93781..38fa1c7 100644 --- a/XMPCore/source/NodeImpl.cpp +++ b/XMPCore/source/NodeImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/ParseRDF.cpp b/XMPCore/source/ParseRDF.cpp index e04a342..d7c9a6e 100644 --- a/XMPCore/source/ParseRDF.cpp +++ b/XMPCore/source/ParseRDF.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/PathImpl.cpp b/XMPCore/source/PathImpl.cpp index 13691a5..b9eefaf 100644 --- a/XMPCore/source/PathImpl.cpp +++ b/XMPCore/source/PathImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/PathSegmentImpl.cpp b/XMPCore/source/PathSegmentImpl.cpp index e5eadfd..7e9f192 100644 --- a/XMPCore/source/PathSegmentImpl.cpp +++ b/XMPCore/source/PathSegmentImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/RDFDOMParserImpl.cpp b/XMPCore/source/RDFDOMParserImpl.cpp index 6b5f46e..e0ebecb 100644 --- a/XMPCore/source/RDFDOMParserImpl.cpp +++ b/XMPCore/source/RDFDOMParserImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/RDFDOMSerializerImpl.cpp b/XMPCore/source/RDFDOMSerializerImpl.cpp index 5db97ce..fa1751f 100644 --- a/XMPCore/source/RDFDOMSerializerImpl.cpp +++ b/XMPCore/source/RDFDOMSerializerImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/SimpleNodeImpl.cpp b/XMPCore/source/SimpleNodeImpl.cpp index 7fc1f21..7404f26 100644 --- a/XMPCore/source/SimpleNodeImpl.cpp +++ b/XMPCore/source/SimpleNodeImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/StructureNodeImpl.cpp b/XMPCore/source/StructureNodeImpl.cpp index 5474e4a..f3ce0c1 100644 --- a/XMPCore/source/StructureNodeImpl.cpp +++ b/XMPCore/source/StructureNodeImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/WXMPIterator.cpp b/XMPCore/source/WXMPIterator.cpp index 4770f16..0da4173 100644 --- a/XMPCore/source/WXMPIterator.cpp +++ b/XMPCore/source/WXMPIterator.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/WXMPMeta.cpp b/XMPCore/source/WXMPMeta.cpp index 3aad6c8..963fa09 100644 --- a/XMPCore/source/WXMPMeta.cpp +++ b/XMPCore/source/WXMPMeta.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/WXMPUtils.cpp b/XMPCore/source/WXMPUtils.cpp index fbfb164..8032cb1 100644 --- a/XMPCore/source/WXMPUtils.cpp +++ b/XMPCore/source/WXMPUtils.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= // *** Should change "type * inParam" to "type & inParam" diff --git a/XMPCore/source/XMPCore_Impl.cpp b/XMPCore/source/XMPCore_Impl.cpp index 485d41d..8683c57 100644 --- a/XMPCore/source/XMPCore_Impl.cpp +++ b/XMPCore/source/XMPCore_Impl.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPCore_Impl.hpp b/XMPCore/source/XMPCore_Impl.hpp index de16989..9a1c311 100644 --- a/XMPCore/source/XMPCore_Impl.hpp +++ b/XMPCore/source/XMPCore_Impl.hpp @@ -2,13 +2,11 @@ #define __XMPCore_Impl_hpp__ 1 // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPIterator.cpp b/XMPCore/source/XMPIterator.cpp index 52febdb..cff3602 100644 --- a/XMPCore/source/XMPIterator.cpp +++ b/XMPCore/source/XMPIterator.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPIterator.hpp b/XMPCore/source/XMPIterator.hpp index 4f6695a..7c335e7 100644 --- a/XMPCore/source/XMPIterator.hpp +++ b/XMPCore/source/XMPIterator.hpp @@ -2,13 +2,11 @@ #define __XMPIterator_hpp__ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPIterator2.cpp b/XMPCore/source/XMPIterator2.cpp index 2ea583b..478f6b9 100644 --- a/XMPCore/source/XMPIterator2.cpp +++ b/XMPCore/source/XMPIterator2.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPIterator2.hpp b/XMPCore/source/XMPIterator2.hpp index 92d73c3..6617419 100644 --- a/XMPCore/source/XMPIterator2.hpp +++ b/XMPCore/source/XMPIterator2.hpp @@ -2,13 +2,11 @@ #define __XMPIterator2_hpp__ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPMeta-GetSet.cpp b/XMPCore/source/XMPMeta-GetSet.cpp index a73eab1..e8a1f37 100644 --- a/XMPCore/source/XMPMeta-GetSet.cpp +++ b/XMPCore/source/XMPMeta-GetSet.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPMeta-Parse.cpp b/XMPCore/source/XMPMeta-Parse.cpp index 52b4618..ef1d07d 100644 --- a/XMPCore/source/XMPMeta-Parse.cpp +++ b/XMPCore/source/XMPMeta-Parse.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPMeta-Serialize.cpp b/XMPCore/source/XMPMeta-Serialize.cpp index ba03521..5d5eb80 100644 --- a/XMPCore/source/XMPMeta-Serialize.cpp +++ b/XMPCore/source/XMPMeta-Serialize.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/XMPCore/source/XMPMeta.cpp b/XMPCore/source/XMPMeta.cpp index a8e6e75..39b9931 100644 --- a/XMPCore/source/XMPMeta.cpp +++ b/XMPCore/source/XMPMeta.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPMeta.hpp b/XMPCore/source/XMPMeta.hpp index 48c9c91..f5c96c8 100644 --- a/XMPCore/source/XMPMeta.hpp +++ b/XMPCore/source/XMPMeta.hpp @@ -2,13 +2,11 @@ #define __XMPMeta_hpp__ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPMeta2-GetSet.cpp b/XMPCore/source/XMPMeta2-GetSet.cpp index 797e0ce..ae95199 100644 --- a/XMPCore/source/XMPMeta2-GetSet.cpp +++ b/XMPCore/source/XMPMeta2-GetSet.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPUtils-FileInfo.cpp b/XMPCore/source/XMPUtils-FileInfo.cpp index a2a9f99..6d5fd26 100644 --- a/XMPCore/source/XMPUtils-FileInfo.cpp +++ b/XMPCore/source/XMPUtils-FileInfo.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPUtils.cpp b/XMPCore/source/XMPUtils.cpp index 11f4775..a6e97e9 100644 --- a/XMPCore/source/XMPUtils.cpp +++ b/XMPCore/source/XMPUtils.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPUtils.hpp b/XMPCore/source/XMPUtils.hpp index 341598d..3e68501 100644 --- a/XMPCore/source/XMPUtils.hpp +++ b/XMPCore/source/XMPUtils.hpp @@ -2,13 +2,11 @@ #define __XMPUtils_hpp__ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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/XMPCore/source/XMPUtils2.cpp b/XMPCore/source/XMPUtils2.cpp index 96598f3..61c3f8e 100644 --- a/XMPCore/source/XMPUtils2.cpp +++ b/XMPCore/source/XMPUtils2.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/build/CMakeLists.txt b/XMPFiles/build/CMakeLists.txt index 399a461..8bb59e3 100644 --- a/XMPFiles/build/CMakeLists.txt +++ b/XMPFiles/build/CMakeLists.txt @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp index df78092..f22ae10 100644 --- a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..f30b29f 100644 --- a/XMPFiles/source/FileHandlers/AIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/AIFF_Handler.hpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..f638d92 100644 --- a/XMPFiles/source/FileHandlers/ASF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/ASF_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..c5c233d 100644 --- a/XMPFiles/source/FileHandlers/ASF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/ASF_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..761066c 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..d182fb0 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..021646a 100644 --- a/XMPFiles/source/FileHandlers/Basic_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Basic_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..ddf52ad 100644 --- a/XMPFiles/source/FileHandlers/Basic_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Basic_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..793fba0 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..064a3a8 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.hpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..fec3e38 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..1ac3a5f 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..afa32c8 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..580c8a5 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.hpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..fb05248 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..47ee601 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..4bf3bf1 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..eb07c4d 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..11dfcd6 100644 --- a/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2005 Adobe +// Copyright 2020 Adobe // 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..3a1382f 100644 --- a/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2005 Adobe +// Copyright 2020 Adobe // 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..2d48a45 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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.hpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp index a55aa1e..761eef4 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..7721dd9 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..ca64c82 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.hpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..a66bd52 100644 --- a/XMPFiles/source/FileHandlers/PNG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PNG_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..ad00eea 100644 --- a/XMPFiles/source/FileHandlers/PNG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PNG_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..10cb984 100644 --- a/XMPFiles/source/FileHandlers/PSD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PSD_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..c94b73b 100644 --- a/XMPFiles/source/FileHandlers/PSD_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PSD_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..709b53c 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..0e2d79e 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..aeb6db2 100644 --- a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..1433e2d 100644 --- a/XMPFiles/source/FileHandlers/RIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/RIFF_Handler.hpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..9eb1248 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..9e00629 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.hpp @@ -3,17 +3,15 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..eb718c2 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..2b36004 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..d6f23ef 100644 --- a/XMPFiles/source/FileHandlers/Scanner_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Scanner_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..1a3c95b 100644 --- a/XMPFiles/source/FileHandlers/Scanner_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Scanner_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..50f2d3a 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..d942c11 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..f6028e1 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..188a7f5 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..e3b1fbb 100644 --- a/XMPFiles/source/FileHandlers/Trivial_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Trivial_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..744edec 100644 --- a/XMPFiles/source/FileHandlers/Trivial_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Trivial_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..7156509 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..2de62a8 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..91df66b 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..8bd80e6 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.hpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.hpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..bdd92bd 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..28394ff 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..5563898 100644 --- a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..537d6b3 100644 --- a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..9fdf4d4 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..82c1c72 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..14b68f4 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..2594f2a 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..fa20799 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..0adf0bd 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..a1a77be 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..8fdb44d 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..b16a558 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..4c0e4fd 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..83b2ed1 100644 --- a/XMPFiles/source/FormatSupport/ASF_Support.cpp +++ b/XMPFiles/source/FormatSupport/ASF_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..8a888d7 100644 --- a/XMPFiles/source/FormatSupport/ASF_Support.hpp +++ b/XMPFiles/source/FormatSupport/ASF_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..ef65449 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.cpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..a9d961b 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.hpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..1c8e261 100644 --- a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp +++ b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..a55acda 100644 --- a/XMPFiles/source/FormatSupport/IFF/Chunk.h +++ b/XMPFiles/source/FormatSupport/IFF/Chunk.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..c3c8aa5 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp +++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..4806dab 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkController.h +++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..440dd46 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp +++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..5f167ef 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkPath.h +++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..9683c17 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp +++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..7d5acf2 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..6019009 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..6ebd121 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkData.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkData.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..cfa7a53 100644 --- a/XMPFiles/source/FormatSupport/IPTC_Support.cpp +++ b/XMPFiles/source/FormatSupport/IPTC_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..9e60208 100644 --- a/XMPFiles/source/FormatSupport/IPTC_Support.hpp +++ b/XMPFiles/source/FormatSupport/IPTC_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..b04162b 100644 --- a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp +++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..6a2638a 100644 --- a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp +++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..3ae5c5a 100644 --- a/XMPFiles/source/FormatSupport/META_Support.cpp +++ b/XMPFiles/source/FormatSupport/META_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2018 Adobe +// Copyright 2020 Adobe // 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..30b2cfe 100644 --- a/XMPFiles/source/FormatSupport/META_Support.hpp +++ b/XMPFiles/source/FormatSupport/META_Support.hpp @@ -2,13 +2,11 @@ #define __META_Support_hpp__ 1 // ================================================================================================= // Copyright Adobe -// Copyright 2018 Adobe +// Copyright 2020 Adobe // 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..b790c83 100644 --- a/XMPFiles/source/FormatSupport/MOOV_Support.cpp +++ b/XMPFiles/source/FormatSupport/MOOV_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..b5d7d2e 100644 --- a/XMPFiles/source/FormatSupport/MOOV_Support.hpp +++ b/XMPFiles/source/FormatSupport/MOOV_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..5c5307a 100644 --- a/XMPFiles/source/FormatSupport/P2_Support.cpp +++ b/XMPFiles/source/FormatSupport/P2_Support.cpp @@ -1,13 +1,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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..78f1302 100644 --- a/XMPFiles/source/FormatSupport/P2_Support.hpp +++ b/XMPFiles/source/FormatSupport/P2_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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..03b91e1 100644 --- a/XMPFiles/source/FormatSupport/PNG_Support.cpp +++ b/XMPFiles/source/FormatSupport/PNG_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..4f22a19 100644 --- a/XMPFiles/source/FormatSupport/PNG_Support.hpp +++ b/XMPFiles/source/FormatSupport/PNG_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..3899d74 100644 --- a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..8e1cabe 100644 --- a/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp +++ b/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..bc3267b 100644 --- a/XMPFiles/source/FormatSupport/PSIR_Support.hpp +++ b/XMPFiles/source/FormatSupport/PSIR_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..4c289d5 100644 --- a/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp +++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2013 Adobe +// Copyright 2020 Adobe // 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..ec0c907 100644 --- a/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp +++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2013 Adobe +// Copyright 2020 Adobe // 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..8e62804 100644 --- a/XMPFiles/source/FormatSupport/PostScript_Support.cpp +++ b/XMPFiles/source/FormatSupport/PostScript_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2012 Adobe +// Copyright 2020 Adobe // 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..c981dd7 100644 --- a/XMPFiles/source/FormatSupport/PostScript_Support.hpp +++ b/XMPFiles/source/FormatSupport/PostScript_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2012 Adobe +// Copyright 2020 Adobe // 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..828541b 100644 --- a/XMPFiles/source/FormatSupport/QuickTime_Support.cpp +++ b/XMPFiles/source/FormatSupport/QuickTime_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..ce33208 100644 --- a/XMPFiles/source/FormatSupport/QuickTime_Support.hpp +++ b/XMPFiles/source/FormatSupport/QuickTime_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..76c67b7 100644 --- a/XMPFiles/source/FormatSupport/RIFF.cpp +++ b/XMPFiles/source/FormatSupport/RIFF.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..acce3ce 100644 --- a/XMPFiles/source/FormatSupport/RIFF.hpp +++ b/XMPFiles/source/FormatSupport/RIFF.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..9704279 100644 --- a/XMPFiles/source/FormatSupport/RIFF_Support.cpp +++ b/XMPFiles/source/FormatSupport/RIFF_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..952c587 100644 --- a/XMPFiles/source/FormatSupport/RIFF_Support.hpp +++ b/XMPFiles/source/FormatSupport/RIFF_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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..b8c31cd 100644 --- a/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..c5924ea 100644 --- a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..d0fd7d8 100644 --- a/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp +++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..20d7d85 100644 --- a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..d14f343 100644 --- a/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp +++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..0f3f3a2 100644 --- a/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp +++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..b5000b6 100644 --- a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp +++ b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..9ec0b7d 100644 --- a/XMPFiles/source/FormatSupport/SVG_Adapter.hpp +++ b/XMPFiles/source/FormatSupport/SVG_Adapter.hpp @@ -2,17 +2,15 @@ #define __SVG_Adapter_hpp__ // ================================================================================================= -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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..d39a0e8 100644 --- a/XMPFiles/source/FormatSupport/SWF_Support.cpp +++ b/XMPFiles/source/FormatSupport/SWF_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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..a4e0421 100644 --- a/XMPFiles/source/FormatSupport/SWF_Support.hpp +++ b/XMPFiles/source/FormatSupport/SWF_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..03e6e73 100644 --- a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..4f0ed7e 100644 --- a/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..893217c 100644 --- a/XMPFiles/source/FormatSupport/TIFF_Support.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..b9d9436 100644 --- a/XMPFiles/source/FormatSupport/TIFF_Support.hpp +++ b/XMPFiles/source/FormatSupport/TIFF_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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..661c429 100644 --- a/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp +++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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..a96a8ae 100644 --- a/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp +++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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..8e71044 100644 --- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..255bf0e 100644 --- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..131c11f 100644 --- a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..1c17335 100644 --- a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..9aff46b 100644 --- a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..b3306eb 100644 --- a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..fdd43ac 100644 --- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..53518a9 100644 --- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..524abe2 100644 --- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..cccff88 100644 --- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..5b86679 100644 --- a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..4664b8d 100644 --- a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..d3b9183 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..35bcb04 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..614986a 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..2409163 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..9bdbb97 100644 --- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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..f21f2df 100644 --- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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..1113868 100644 --- a/XMPFiles/source/FormatSupport/XDCAM_Support.cpp +++ b/XMPFiles/source/FormatSupport/XDCAM_Support.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..1707456 100644 --- a/XMPFiles/source/FormatSupport/XDCAM_Support.hpp +++ b/XMPFiles/source/FormatSupport/XDCAM_Support.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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..4b85d64 100644 --- a/XMPFiles/source/FormatSupport/XMPScanner.cpp +++ b/XMPFiles/source/FormatSupport/XMPScanner.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..fc3f865 100644 --- a/XMPFiles/source/FormatSupport/XMPScanner.hpp +++ b/XMPFiles/source/FormatSupport/XMPScanner.hpp @@ -2,13 +2,11 @@ #define __XMPScanner_hpp__ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..f3d1e61 100644 --- a/XMPFiles/source/HandlerRegistry.cpp +++ b/XMPFiles/source/HandlerRegistry.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..682b2c6 100644 --- a/XMPFiles/source/HandlerRegistry.h +++ b/XMPFiles/source/HandlerRegistry.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..1a4b890 100644 --- a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp +++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..b37ff02 100644 --- a/XMPFiles/source/NativeMetadataSupport/IMetadata.h +++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..fe13900 100644 --- a/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp +++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..d0cc766 100644 --- a/XMPFiles/source/NativeMetadataSupport/IReconcile.h +++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..54e580c 100644 --- a/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp +++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..14d5097 100644 --- a/XMPFiles/source/NativeMetadataSupport/MetadataSet.h +++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..90e063e 100644 --- a/XMPFiles/source/NativeMetadataSupport/ValueObject.h +++ b/XMPFiles/source/NativeMetadataSupport/ValueObject.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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..9905bed 100644 --- a/XMPFiles/source/PluginHandler/FileHandler.h +++ b/XMPFiles/source/PluginHandler/FileHandler.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..2ae3dd7 100644 --- a/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp +++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..5a32974 100644 --- a/XMPFiles/source/PluginHandler/FileHandlerInstance.h +++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..20e2a71 100644 --- a/XMPFiles/source/PluginHandler/HostAPIImpl.cpp +++ b/XMPFiles/source/PluginHandler/HostAPIImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..573800a 100644 --- a/XMPFiles/source/PluginHandler/Module.cpp +++ b/XMPFiles/source/PluginHandler/Module.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..308572e 100644 --- a/XMPFiles/source/PluginHandler/Module.h +++ b/XMPFiles/source/PluginHandler/Module.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..76670be 100644 --- a/XMPFiles/source/PluginHandler/ModuleUtils.h +++ b/XMPFiles/source/PluginHandler/ModuleUtils.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..1767906 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..2f15584 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..749f19c 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..9fee92d 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..dff4d42 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.cpp +++ b/XMPFiles/source/PluginHandler/PluginManager.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..a3ae7e2 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.h +++ b/XMPFiles/source/PluginHandler/PluginManager.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..ac4d5c3 100644 --- a/XMPFiles/source/PluginHandler/XMPAtoms.cpp +++ b/XMPFiles/source/PluginHandler/XMPAtoms.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..ad151cf 100644 --- a/XMPFiles/source/PluginHandler/XMPAtoms.h +++ b/XMPFiles/source/PluginHandler/XMPAtoms.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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..6229648 100644 --- a/XMPFiles/source/WXMPFiles.cpp +++ b/XMPFiles/source/WXMPFiles.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..f3fdd9f 100644 --- a/XMPFiles/source/XMPFiles.cpp +++ b/XMPFiles/source/XMPFiles.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..84629a0 100644 --- a/XMPFiles/source/XMPFiles.hpp +++ b/XMPFiles/source/XMPFiles.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..47640b0 100644 --- a/XMPFiles/source/XMPFiles_Impl.cpp +++ b/XMPFiles/source/XMPFiles_Impl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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..6bdb5c6 100644 --- a/XMPFiles/source/XMPFiles_Impl.hpp +++ b/XMPFiles/source/XMPFiles_Impl.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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/XMPFilesPlugins/PDF_Handler/resource/win/CopyPDFL.bat b/XMPFilesPlugins/PDF_Handler/resource/win/CopyPDFL.bat index 8983a55..7e2fb3d 100755 --- a/XMPFilesPlugins/PDF_Handler/resource/win/CopyPDFL.bat +++ b/XMPFilesPlugins/PDF_Handler/resource/win/CopyPDFL.bat @@ -1,14 +1,14 @@ -@ECHO OFF
-@rem Copy the needed PDFL to the public folder.
-@rem Usage: CopyPDFL <mode> <platform>
-@rem <mode> is debug or release
-@rem <platform> is windows or windows_x64. defaults to "windows" (32-bit)
-
-set workingDir=%~dp0%
-set mode=%1
-if "%1" == "" set mode=release
-set platform=%2
-if "%2" == "" set platform=windows
-
-mkdir %workingDir%\..\..\..\public\%platform%\%mode%\PDF_Handler
-xcopy /y /r %workingDir%\..\..\third-party\MiniPDFL\libraries\%platform%\release\MiniPDFL.dll %workingDir%\..\..\..\public\%platform%\%mode%\PDF_Handler
+@ECHO OFF +@rem Copy the needed PDFL to the public folder. +@rem Usage: CopyPDFL <mode> <platform> +@rem <mode> is debug or release +@rem <platform> is windows or windows_x64. defaults to "windows" (32-bit) + +set workingDir=%~dp0% +set mode=%1 +if "%1" == "" set mode=release +set platform=%2 +if "%2" == "" set platform=windows + +mkdir %workingDir%\..\..\..\public\%platform%\%mode%\PDF_Handler +xcopy /y /r %workingDir%\..\..\third-party\MiniPDFL\libraries\%platform%\release\MiniPDFL.dll %workingDir%\..\..\..\public\%platform%\%mode%\PDF_Handler diff --git a/XMPFilesPlugins/PluginTemplate/build/CMakeLists.txt b/XMPFilesPlugins/PluginTemplate/build/CMakeLists.txt index f4e117c..d08a99a 100644 --- a/XMPFilesPlugins/PluginTemplate/build/CMakeLists.txt +++ b/XMPFilesPlugins/PluginTemplate/build/CMakeLists.txt @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_mac.sh b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_mac.sh index 9109296..ad44fc4 100755 --- a/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_mac.sh +++ b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_mac.sh @@ -1,7 +1,7 @@ #!/bin/bash # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_win.bat b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_win.bat index 540e181..787e9ef 100755 --- a/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_win.bat +++ b/XMPFilesPlugins/PluginTemplate/build/GeneratePluginTemplate_win.bat @@ -1,5 +1,5 @@ :: ================================================================================================= -:: Copyright 2013 Adobe Systems Incorporated +:: Copyright 2020 Adobe Systems Incorporated :: All Rights Reserved. :: :: NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/XMPFilesPlugins/PluginTemplate/build/README.txt b/XMPFilesPlugins/PluginTemplate/build/README.txt index da97723..74a347b 100644 --- a/XMPFilesPlugins/PluginTemplate/build/README.txt +++ b/XMPFilesPlugins/PluginTemplate/build/README.txt @@ -1,20 +1,20 @@ -Building Template Plugin Projects:
-
-Windows:
-
-1. Double Click GeneratePluginTemplate_win.bat" or run it through command prompt.
-2. Enter the type of project to create
-3. The project files will be created in vc15\windows or vc15\windows_x64 folder
-
-Mac:
-
-1. Run the shell script GeneratePluginTemplate_mac.sh.
-2. Enter the type of project to create
-3. The project files will be created in xcode\intel_64 folder
-
-Linux:
-
-1. Run the Makefile. This Makefile will call cmake to generate the makefile for all the template plugin projects. Also all the projects will be built automatically.
-2. All the template plugin project makefiles will be created in gcc folder.
-3. The template plugins will be built in ../../public folder.
-4. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well. Refer the ReadMe.txt present in <xmp-sdk>/build folder for more information around setting relevant gcc path on linux.
+Building Template Plugin Projects: + +Windows: + +1. Double Click GeneratePluginTemplate_win.bat" or run it through command prompt. +2. Enter the type of project to create +3. The project files will be created in vc15\windows or vc15\windows_x64 folder + +Mac: + +1. Run the shell script GeneratePluginTemplate_mac.sh. +2. Enter the type of project to create +3. The project files will be created in xcode\intel_64 folder + +Linux: + +1. Run the Makefile. This Makefile will call cmake to generate the makefile for all the template plugin projects. Also all the projects will be built automatically. +2. All the template plugin project makefiles will be created in gcc folder. +3. The template plugins will be built in ../../public folder. +4. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well. Refer the ReadMe.txt present in <xmp-sdk>/build folder for more information around setting relevant gcc path on linux. diff --git a/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp b/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp index 6d4e730..2b07907 100644 --- a/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp +++ b/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 "XMPFilesPlugins/api/source/PluginBase.h" diff --git a/XMPFilesPlugins/api/source/HostAPI.h b/XMPFilesPlugins/api/source/HostAPI.h index f0bf8fa..ad8e775 100644 --- a/XMPFilesPlugins/api/source/HostAPI.h +++ b/XMPFilesPlugins/api/source/HostAPI.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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/XMPFilesPlugins/api/source/HostAPIAccess.cpp b/XMPFilesPlugins/api/source/HostAPIAccess.cpp index f536beb..1c206a9 100644 --- a/XMPFilesPlugins/api/source/HostAPIAccess.cpp +++ b/XMPFilesPlugins/api/source/HostAPIAccess.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 "HostAPIAccess.h" diff --git a/XMPFilesPlugins/api/source/HostAPIAccess.h b/XMPFilesPlugins/api/source/HostAPIAccess.h index a88b562..d463919 100644 --- a/XMPFilesPlugins/api/source/HostAPIAccess.h +++ b/XMPFilesPlugins/api/source/HostAPIAccess.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 __HostAPIAccess_h__ diff --git a/XMPFilesPlugins/api/source/PluginAPIImpl.cpp b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp index e08b68e..785859f 100644 --- a/XMPFilesPlugins/api/source/PluginAPIImpl.cpp +++ b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 "HostAPIAccess.h" diff --git a/XMPFilesPlugins/api/source/PluginBase.cpp b/XMPFilesPlugins/api/source/PluginBase.cpp index 191b951..6c38df8 100644 --- a/XMPFilesPlugins/api/source/PluginBase.cpp +++ b/XMPFilesPlugins/api/source/PluginBase.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 "PluginBase.h" diff --git a/XMPFilesPlugins/api/source/PluginBase.h b/XMPFilesPlugins/api/source/PluginBase.h index 1f79668..b32dd03 100644 --- a/XMPFilesPlugins/api/source/PluginBase.h +++ b/XMPFilesPlugins/api/source/PluginBase.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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/XMPFilesPlugins/api/source/PluginConst.h b/XMPFilesPlugins/api/source/PluginConst.h index 45d2752..e77fba4 100644 --- a/XMPFilesPlugins/api/source/PluginConst.h +++ b/XMPFilesPlugins/api/source/PluginConst.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 __PLUGIN_CONST_H__ diff --git a/XMPFilesPlugins/api/source/PluginHandler.h b/XMPFilesPlugins/api/source/PluginHandler.h index eb64791..bd5df57 100644 --- a/XMPFilesPlugins/api/source/PluginHandler.h +++ b/XMPFilesPlugins/api/source/PluginHandler.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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/XMPFilesPlugins/api/source/PluginRegistry.cpp b/XMPFilesPlugins/api/source/PluginRegistry.cpp index a059600..fdfe75c 100644 --- a/XMPFilesPlugins/api/source/PluginRegistry.cpp +++ b/XMPFilesPlugins/api/source/PluginRegistry.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 "PluginRegistry.h" diff --git a/XMPFilesPlugins/api/source/PluginRegistry.h b/XMPFilesPlugins/api/source/PluginRegistry.h index df04bcb..d5549e5 100644 --- a/XMPFilesPlugins/api/source/PluginRegistry.h +++ b/XMPFilesPlugins/api/source/PluginRegistry.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2011 Adobe +// Copyright 2020 Adobe // 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 PLUGINREGISTRY_H diff --git a/XMPFilesPlugins/api/source/PluginUtils.cpp b/XMPFilesPlugins/api/source/PluginUtils.cpp index e720cb9..5c47cd7 100644 --- a/XMPFilesPlugins/api/source/PluginUtils.cpp +++ b/XMPFilesPlugins/api/source/PluginUtils.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMP_Const.h" diff --git a/XMPFilesPlugins/api/source/PluginUtils.h b/XMPFilesPlugins/api/source/PluginUtils.h index fc5453f..5e9c1b9 100644 --- a/XMPFilesPlugins/api/source/PluginUtils.h +++ b/XMPFilesPlugins/api/source/PluginUtils.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMP_Const.h" diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 81cda5b..1ab2aa6 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/GenerateAndBuildXMPToolkitSDK_android.sh b/build/GenerateAndBuildXMPToolkitSDK_android.sh index e66fc48..eab42b0 100755 --- a/build/GenerateAndBuildXMPToolkitSDK_android.sh +++ b/build/GenerateAndBuildXMPToolkitSDK_android.sh @@ -1,7 +1,7 @@ #!/bin/bash # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2019 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/GenerateXMPToolkitSDK_mac.sh b/build/GenerateXMPToolkitSDK_mac.sh index ee27d2f..2083030 100755 --- a/build/GenerateXMPToolkitSDK_mac.sh +++ b/build/GenerateXMPToolkitSDK_mac.sh @@ -1,7 +1,7 @@ #!/bin/bash # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/GenerateXMPToolkitSDK_win.bat b/build/GenerateXMPToolkitSDK_win.bat index 16fed83..f15d5b1 100755 --- a/build/GenerateXMPToolkitSDK_win.bat +++ b/build/GenerateXMPToolkitSDK_win.bat @@ -1,5 +1,5 @@ :: ================================================================================================= -:: Copyright 2013 Adobe Systems Incorporated +:: Copyright 2020 Adobe Systems Incorporated :: All Rights Reserved. :: :: NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/ProductConfig.cmake b/build/ProductConfig.cmake index 5a42bbc..f207c7d 100644 --- a/build/ProductConfig.cmake +++ b/build/ProductConfig.cmake @@ -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. +#// it. #// ================================================================================================= # ============================================================================== diff --git a/build/README.txt b/build/README.txt index 98775be..23a454b 100644 --- a/build/README.txt +++ b/build/README.txt @@ -1,55 +1,55 @@ -This README describes steps to generate project files on different platforms. These platform specific projects can then be used to build the XMPToolkit SDK. Before generating the projects the SDK developer needs to copy the dependencies to the proper locations. Refer to "Dependencies" section in the XMP Toolkit Programmer's Guide.
-
-
-WINDOWS 7 and above
-
-Options to generate Project files in Windows are of the form "Generate XMPSDKToolkit [Dynamic|static] [Win32|x64]". An option of "Dynamic" indicates that the generated project files will build a dll for the XMP SDK components. On the other hand the option of "Static" indicates that the generated project files will build a static lib for the XMP SDK components. Options for "Win32" or "x64" indicate that the generated project files will build the library for 32 bit or 64 bit applications respectively.
-
-1. Open the windows command prompt and change the current directory to <xmpsdk>/build.
-2. Run the batch file GenerateXMPToolkitSDK_win.bat. There will be two options(2 & 3) to build projects for different configurations, one option(4) to generate projects for all configurations and one option(1) to clean all the projects.
-3. After running the batch file (options 2 & 3),the vc14 projects(using cmake) will be generated at the location <xmpsdk>/build/vc14/<static|dynamic>/windows_x64>/XMPToolkitSDK64.sln.
-4. Open the Visual Studio solution file and build XMP Toolkit SDK for debug/release configuration.
-
-MAC OS X 10.9 and above
-
-Options to generate Project files in Mac are of the form "Generate XMPSDKToolkit [Dynamic|static] [64|iOS]". An option of "Dynamic" indicates that the generated project files will build a framework for the XMP SDK components. On the other hand the option of "Static" indicates that the generated project files will build a static lib for the XMP SDK components. Option for "64" indicate that the generated project files will build for 64 bit applications. The option of "iOS" will generate the project files that will build XMP Core and XMP Files library for iOS simulators and iOS devices.
-
-1. Open the Terminal on Mac and change the current directory to <xmpsdk>/build.
-2. Run the shell script GenerateXMPToolkitSDK_mac.sh. There will be three options(2-4) to build projects for different configurations, one option(5) to generate projects for all configurations and one option(1) to clean all the projects.
-3. After running the batch file (options 2-5),the xcode projects will be generated(using cmake) at the location <xmpsdk>/build/xcode/<static|dynamic>/<intel_64|ios>/<XMPToolkitSDK.xcodeproj|XMPToolkitSDK64.xcodeproj>.
-4. Open the xcodeproj file and build XMP Toolkit SDK for debug/release configuration.
-
-Note: When multiple Xcode versions are installed on a system, the developer has to use xcode-select command to specify the Xcode version that he/she wishes to use. This is done in two steps by fetching the current Xcode folder and changing it if required.
-
-1) Fetch the current Xcode folder
- $ xcode-select -print-path
-
-2) Change the Xcode Folder if required. For example if the new XCode path is /Applications/Xcode.app
- $ sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer
-
-Note: Presently a single scheme is created for each project. For building different configurations the Release or Debug configurations has to be selected using "Edit Scheme -> Run -> Release/Debug
-
-LINUX
-
-Options to generate makefiles in Linux are given in the form of a Makefile with different targets. The targets available are
-
-StaticAll: Generates the Makefiles for static libraries and builds them. Includes both Debug and Release libs.
-DynamicAll: Generates the Makefiles for shared libraries and builds them. Includes both Debug and Release libs.
-DebugAll: Generates the Makefiles for Debug libraries and builds them. Includes both static and dynamic libs.
-ReleaseAll: Generates the Makefiles for Release libraries and builds them. Includes both static and dynamic libs.
-
-1. Change the current directory to <xmpsdk>/build.
-2. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well.
-3. This <xmpsdk>/build folder contains a Makefile which has different targets to build and the default is to build all of them. The Makefile generates the makefiles(using cmake) to build the project and then calls these makefiles to build the target.
-
-
-
-Note: Generating gcc Makefiles to build the project requires the path to the gcc set in the CMake toolchain file for Linux i.e. <xmpsdk>/build/shared/ToolchainGCC.cmake. In this file modifications must be done by the developer to set the CMAKE_FIND_ROOT_PATH so that CMake picks the desired gcc compiler. He/She may also want to change the parameter XMP_ENABLE_SECURE_SETTINGS as per the configured gcc.
-
- a) If the gcc is configured with --enable-libssp (can be checked by executing gcc -v), he/she has to set the variable XMP_GCC_LIBPATH inside of file <xmpsdk>/build/ProductConfig.cmake to the path containing the static lib( libssp.a). In this case he/she can set the variable the XMP_ENABLE_SECURE_SETTINGS on.
-
-b) If the gcc is configured with --disable-libssp, he/she has to set the variable XMP_ENABLE_SECURE_SETTINGS off.
-
-=================================================================================================================================================
-
-Note: The projects for different platforms are generated using CMake. CMake generates projects with absolute paths so they cannot be copied from one place to other. If the project is to be moved, then the whole tree has to be copied to the new location and CMake should be invoked again.
+This README describes steps to generate project files on different platforms. These platform specific projects can then be used to build the XMPToolkit SDK. Before generating the projects the SDK developer needs to copy the dependencies to the proper locations. Refer to "Dependencies" section in the XMP Toolkit Programmer's Guide. + + +WINDOWS 7 and above + +Options to generate Project files in Windows are of the form "Generate XMPSDKToolkit [Dynamic|static] [Win32|x64]". An option of "Dynamic" indicates that the generated project files will build a dll for the XMP SDK components. On the other hand the option of "Static" indicates that the generated project files will build a static lib for the XMP SDK components. Options for "Win32" or "x64" indicate that the generated project files will build the library for 32 bit or 64 bit applications respectively. + +1. Open the windows command prompt and change the current directory to <xmpsdk>/build. +2. Run the batch file GenerateXMPToolkitSDK_win.bat. There will be two options(2 & 3) to build projects for different configurations, one option(4) to generate projects for all configurations and one option(1) to clean all the projects. +3. After running the batch file (options 2 & 3),the vc14 projects(using cmake) will be generated at the location <xmpsdk>/build/vc14/<static|dynamic>/windows_x64>/XMPToolkitSDK64.sln. +4. Open the Visual Studio solution file and build XMP Toolkit SDK for debug/release configuration. + +MAC OS X 10.9 and above + +Options to generate Project files in Mac are of the form "Generate XMPSDKToolkit [Dynamic|static] [64|iOS]". An option of "Dynamic" indicates that the generated project files will build a framework for the XMP SDK components. On the other hand the option of "Static" indicates that the generated project files will build a static lib for the XMP SDK components. Option for "64" indicate that the generated project files will build for 64 bit applications. The option of "iOS" will generate the project files that will build XMP Core and XMP Files library for iOS simulators and iOS devices. + +1. Open the Terminal on Mac and change the current directory to <xmpsdk>/build. +2. Run the shell script GenerateXMPToolkitSDK_mac.sh. There will be three options(2-4) to build projects for different configurations, one option(5) to generate projects for all configurations and one option(1) to clean all the projects. +3. After running the batch file (options 2-5),the xcode projects will be generated(using cmake) at the location <xmpsdk>/build/xcode/<static|dynamic>/<intel_64|ios>/<XMPToolkitSDK.xcodeproj|XMPToolkitSDK64.xcodeproj>. +4. Open the xcodeproj file and build XMP Toolkit SDK for debug/release configuration. + +Note: When multiple Xcode versions are installed on a system, the developer has to use xcode-select command to specify the Xcode version that he/she wishes to use. This is done in two steps by fetching the current Xcode folder and changing it if required. + +1) Fetch the current Xcode folder + $ xcode-select -print-path + +2) Change the Xcode Folder if required. For example if the new XCode path is /Applications/Xcode.app + $ sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer + +Note: Presently a single scheme is created for each project. For building different configurations the Release or Debug configurations has to be selected using "Edit Scheme -> Run -> Release/Debug + +LINUX + +Options to generate makefiles in Linux are given in the form of a Makefile with different targets. The targets available are + +StaticAll: Generates the Makefiles for static libraries and builds them. Includes both Debug and Release libs. +DynamicAll: Generates the Makefiles for shared libraries and builds them. Includes both Debug and Release libs. +DebugAll: Generates the Makefiles for Debug libraries and builds them. Includes both static and dynamic libs. +ReleaseAll: Generates the Makefiles for Release libraries and builds them. Includes both static and dynamic libs. + +1. Change the current directory to <xmpsdk>/build. +2. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well. +3. This <xmpsdk>/build folder contains a Makefile which has different targets to build and the default is to build all of them. The Makefile generates the makefiles(using cmake) to build the project and then calls these makefiles to build the target. + + + +Note: Generating gcc Makefiles to build the project requires the path to the gcc set in the CMake toolchain file for Linux i.e. <xmpsdk>/build/shared/ToolchainGCC.cmake. In this file modifications must be done by the developer to set the CMAKE_FIND_ROOT_PATH so that CMake picks the desired gcc compiler. He/She may also want to change the parameter XMP_ENABLE_SECURE_SETTINGS as per the configured gcc. + + a) If the gcc is configured with --enable-libssp (can be checked by executing gcc -v), he/she has to set the variable XMP_GCC_LIBPATH inside of file <xmpsdk>/build/ProductConfig.cmake to the path containing the static lib( libssp.a). In this case he/she can set the variable the XMP_ENABLE_SECURE_SETTINGS on. + +b) If the gcc is configured with --disable-libssp, he/she has to set the variable XMP_ENABLE_SECURE_SETTINGS off. + +================================================================================================================================================= + +Note: The projects for different platforms are generated using CMake. CMake generates projects with absolute paths so they cannot be copied from one place to other. If the project is to be moved, then the whole tree has to be copied to the new location and CMake should be invoked again. diff --git a/build/XMP_BuildInfo.h b/build/XMP_BuildInfo.h index 1271062..8bfbf75 100644 --- a/build/XMP_BuildInfo.h +++ b/build/XMP_BuildInfo.h @@ -3,13 +3,11 @@ /* // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/build/XMP_Config.cmake b/build/XMP_Config.cmake index bd91f91..e76e43e 100644 --- a/build/XMP_Config.cmake +++ b/build/XMP_Config.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/XMP_ConfigCommon.cmake b/build/XMP_ConfigCommon.cmake index c101725..c7c26bd 100644 --- a/build/XMP_ConfigCommon.cmake +++ b/build/XMP_ConfigCommon.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/cmake.bat b/build/cmake.bat index de802bd..8cda435 100755 --- a/build/cmake.bat +++ b/build/cmake.bat @@ -1,5 +1,5 @@ :: ================================================================================================= -:: Copyright 2013 Adobe Systems Incorporated +:: Copyright 2020 Adobe Systems Incorporated :: All Rights Reserved. :: :: NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/cmake_all.bat b/build/cmake_all.bat index a79b43c..f79cf2d 100755 --- a/build/cmake_all.bat +++ b/build/cmake_all.bat @@ -1,5 +1,5 @@ :: ================================================================================================= -:: Copyright 2013 Adobe Systems Incorporated +:: Copyright 2020 Adobe Systems Incorporated :: All Rights Reserved. :: :: NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/CMakeUtils.bat b/build/shared/CMakeUtils.bat index d272400..8f7ea31 100755 --- a/build/shared/CMakeUtils.bat +++ b/build/shared/CMakeUtils.bat @@ -1,5 +1,5 @@ :: ================================================================================================= -:: Copyright 2013 Adobe Systems Incorporated +:: Copyright 2020 Adobe Systems Incorporated :: All Rights Reserved. :: :: NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/CMakeUtils.sh b/build/shared/CMakeUtils.sh index 9bb8d81..c135a13 100644 --- a/build/shared/CMakeUtils.sh +++ b/build/shared/CMakeUtils.sh @@ -1,7 +1,7 @@ #!/bin/bash # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/SharedConfig.cmake b/build/shared/SharedConfig.cmake index c7e5fdc..87d74a8 100644 --- a/build/shared/SharedConfig.cmake +++ b/build/shared/SharedConfig.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/SharedConfig_Android.cmake b/build/shared/SharedConfig_Android.cmake index e5ed95c..8eb23e6 100644 --- a/build/shared/SharedConfig_Android.cmake +++ b/build/shared/SharedConfig_Android.cmake @@ -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. +#// it. #// ================================================================================================= # ============================================================================== diff --git a/build/shared/SharedConfig_Common.cmake b/build/shared/SharedConfig_Common.cmake index 6a34588..993c6b3 100644 --- a/build/shared/SharedConfig_Common.cmake +++ b/build/shared/SharedConfig_Common.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/SharedConfig_Ios.cmake b/build/shared/SharedConfig_Ios.cmake index 0cd9744..3f63ea0 100644 --- a/build/shared/SharedConfig_Ios.cmake +++ b/build/shared/SharedConfig_Ios.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/SharedConfig_Linux.cmake b/build/shared/SharedConfig_Linux.cmake index e2bcdab..a005776 100644 --- a/build/shared/SharedConfig_Linux.cmake +++ b/build/shared/SharedConfig_Linux.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/SharedConfig_Mac.cmake b/build/shared/SharedConfig_Mac.cmake index cd8eda0..1dd565b 100644 --- a/build/shared/SharedConfig_Mac.cmake +++ b/build/shared/SharedConfig_Mac.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/SharedConfig_Win.cmake b/build/shared/SharedConfig_Win.cmake index 8c59f93..0a626d3 100644 --- a/build/shared/SharedConfig_Win.cmake +++ b/build/shared/SharedConfig_Win.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/ToolchainGCC.cmake b/build/shared/ToolchainGCC.cmake index 4c7f671..4012020 100644 --- a/build/shared/ToolchainGCC.cmake +++ b/build/shared/ToolchainGCC.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/ToolchainLLVM.cmake b/build/shared/ToolchainLLVM.cmake index c3d5051..c4391cb 100644 --- a/build/shared/ToolchainLLVM.cmake +++ b/build/shared/ToolchainLLVM.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/build/shared/Toolchain_ios.cmake b/build/shared/Toolchain_ios.cmake index 550ef01..7efd84e 100644 --- a/build/shared/Toolchain_ios.cmake +++ b/build/shared/Toolchain_ios.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/public/include/TXMPFiles.hpp b/public/include/TXMPFiles.hpp index 8a3cbb9..c288216 100644 --- a/public/include/TXMPFiles.hpp +++ b/public/include/TXMPFiles.hpp @@ -7,13 +7,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/public/include/TXMPIterator.hpp b/public/include/TXMPIterator.hpp index ccc8e69..8f2cc53 100644 --- a/public/include/TXMPIterator.hpp +++ b/public/include/TXMPIterator.hpp @@ -7,13 +7,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/public/include/TXMPMeta.hpp b/public/include/TXMPMeta.hpp index 12a9214..471883b 100644 --- a/public/include/TXMPMeta.hpp +++ b/public/include/TXMPMeta.hpp @@ -12,13 +12,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/public/include/TXMPUtils.hpp b/public/include/TXMPUtils.hpp index aed1196..30f4f77 100644 --- a/public/include/TXMPUtils.hpp +++ b/public/include/TXMPUtils.hpp @@ -7,13 +7,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/public/include/XMP.hpp b/public/include/XMP.hpp index cf543a2..24355ff 100644 --- a/public/include/XMP.hpp +++ b/public/include/XMP.hpp @@ -2,13 +2,11 @@ #define __XMP_hpp__ 1 // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h index 9ee42d8..2552b7a 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h @@ -7,13 +7,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h index 1a9e64b..fd2c23b 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h @@ -2,13 +2,11 @@ #define __ISharedObject_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h index 54b56b1..2ba98e0 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h @@ -5,13 +5,11 @@ // // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h index c7bd606..37846c9 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/IConfigurationManager.h b/public/include/XMPCommon/Interfaces/IConfigurationManager.h index 5a38baf..cee4029 100644 --- a/public/include/XMPCommon/Interfaces/IConfigurationManager.h +++ b/public/include/XMPCommon/Interfaces/IConfigurationManager.h @@ -6,13 +6,11 @@ // // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCommon/Interfaces/IError.h b/public/include/XMPCommon/Interfaces/IError.h index 8df342a..ebdcb15 100644 --- a/public/include/XMPCommon/Interfaces/IError.h +++ b/public/include/XMPCommon/Interfaces/IError.h @@ -3,13 +3,11 @@ #define __IError_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h" diff --git a/public/include/XMPCommon/Interfaces/IErrorNotifier.h b/public/include/XMPCommon/Interfaces/IErrorNotifier.h index 0e3520f..d1d732c 100644 --- a/public/include/XMPCommon/Interfaces/IErrorNotifier.h +++ b/public/include/XMPCommon/Interfaces/IErrorNotifier.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/IMemoryAllocator.h b/public/include/XMPCommon/Interfaces/IMemoryAllocator.h index 893604c..29e2bf6 100644 --- a/public/include/XMPCommon/Interfaces/IMemoryAllocator.h +++ b/public/include/XMPCommon/Interfaces/IMemoryAllocator.h @@ -2,13 +2,11 @@ #define IMemoryAllocator_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/BaseInterfaces/IVersionable.h" diff --git a/public/include/XMPCommon/Interfaces/IObjectFactory.h b/public/include/XMPCommon/Interfaces/IObjectFactory.h index ced1802..951300e 100644 --- a/public/include/XMPCommon/Interfaces/IObjectFactory.h +++ b/public/include/XMPCommon/Interfaces/IObjectFactory.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/IUTF8String.h b/public/include/XMPCommon/Interfaces/IUTF8String.h index 4530641..30a7b6d 100644 --- a/public/include/XMPCommon/Interfaces/IUTF8String.h +++ b/public/include/XMPCommon/Interfaces/IUTF8String.h @@ -2,13 +2,11 @@ #define __IUTF8String_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h" diff --git a/public/include/XMPCommon/Utilities/TWrapperFunctions.h b/public/include/XMPCommon/Utilities/TWrapperFunctions.h index 43f8612..e3accac 100644 --- a/public/include/XMPCommon/Utilities/TWrapperFunctions.h +++ b/public/include/XMPCommon/Utilities/TWrapperFunctions.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IError.h" diff --git a/public/include/XMPCommon/Utilities/TWrapperFunctions2.h b/public/include/XMPCommon/Utilities/TWrapperFunctions2.h index 06ec99c..405cafa 100644 --- a/public/include/XMPCommon/Utilities/TWrapperFunctions2.h +++ b/public/include/XMPCommon/Utilities/TWrapperFunctions2.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= //! \cond XMP_INTERNAL_DOCUMENTATION diff --git a/public/include/XMPCommon/XMPCommonDefines.h b/public/include/XMPCommon/XMPCommonDefines.h index 823f1b4..937b421 100644 --- a/public/include/XMPCommon/XMPCommonDefines.h +++ b/public/include/XMPCommon/XMPCommonDefines.h @@ -1,13 +1,11 @@ #ifndef __XMPCommonDefines_h__ #define __XMPCommonDefines_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCommon/XMPCommonErrorCodes.h b/public/include/XMPCommon/XMPCommonErrorCodes.h index e1d41b9..86319dc 100644 --- a/public/include/XMPCommon/XMPCommonErrorCodes.h +++ b/public/include/XMPCommon/XMPCommonErrorCodes.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines.h" diff --git a/public/include/XMPCommon/XMPCommonFwdDeclarations.h b/public/include/XMPCommon/XMPCommonFwdDeclarations.h index a39f0c3..b390afb 100644 --- a/public/include/XMPCommon/XMPCommonFwdDeclarations.h +++ b/public/include/XMPCommon/XMPCommonFwdDeclarations.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/XMPCommonDefines.h" diff --git a/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h b/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h index 6264144..68e673f 100644 --- a/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h +++ b/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCommon/source/IConfigurable.cpp b/public/include/XMPCommon/source/IConfigurable.cpp index 6d932b5..6d9854c 100644 --- a/public/include/XMPCommon/source/IConfigurable.cpp +++ b/public/include/XMPCommon/source/IConfigurable.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h" diff --git a/public/include/XMPCommon/source/IConfigurationManager.cpp b/public/include/XMPCommon/source/IConfigurationManager.cpp index edafeb3..c855872 100644 --- a/public/include/XMPCommon/source/IConfigurationManager.cpp +++ b/public/include/XMPCommon/source/IConfigurationManager.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define FRIEND_CLASS_DECLARATION() friend class IConfigurationManagerProxy; diff --git a/public/include/XMPCommon/source/IError.cpp b/public/include/XMPCommon/source/IError.cpp index 68e425d..d08783e 100644 --- a/public/include/XMPCommon/source/IError.cpp +++ b/public/include/XMPCommon/source/IError.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define FRIEND_CLASS_DECLARATION() friend class IErrorProxy; diff --git a/public/include/XMPCommon/source/IErrorNotifier.cpp b/public/include/XMPCommon/source/IErrorNotifier.cpp index abd8867..8834a29 100644 --- a/public/include/XMPCommon/source/IErrorNotifier.cpp +++ b/public/include/XMPCommon/source/IErrorNotifier.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCommon/Interfaces/IErrorNotifier.h" diff --git a/public/include/XMPCommon/source/IUTF8String.cpp b/public/include/XMPCommon/source/IUTF8String.cpp index 0aace28..99b07ac 100644 --- a/public/include/XMPCommon/source/IUTF8String.cpp +++ b/public/include/XMPCommon/source/IUTF8String.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= #define FRIEND_CLASS_DECLARATION() friend class IUTF8StringProxy; diff --git a/public/include/XMPCore/Interfaces/IArrayNode.h b/public/include/XMPCore/Interfaces/IArrayNode.h index f340e68..cdc9f5a 100644 --- a/public/include/XMPCore/Interfaces/IArrayNode.h +++ b/public/include/XMPCore/Interfaces/IArrayNode.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCore/Interfaces/IClientDOMParser.h b/public/include/XMPCore/Interfaces/IClientDOMParser.h index dc67641..8122d12 100644 --- a/public/include/XMPCore/Interfaces/IClientDOMParser.h +++ b/public/include/XMPCore/Interfaces/IClientDOMParser.h @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IClientDOMSerializer.h b/public/include/XMPCore/Interfaces/IClientDOMSerializer.h index 49219c0..ac80c61 100644 --- a/public/include/XMPCore/Interfaces/IClientDOMSerializer.h +++ b/public/include/XMPCore/Interfaces/IClientDOMSerializer.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/ICompositeNode.h b/public/include/XMPCore/Interfaces/ICompositeNode.h index 67c0205..375ff26 100644 --- a/public/include/XMPCore/Interfaces/ICompositeNode.h +++ b/public/include/XMPCore/Interfaces/ICompositeNode.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/INode.h" diff --git a/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h b/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h index b75d9bc..cbdc077 100644 --- a/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h +++ b/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/ICoreObjectFactory.h b/public/include/XMPCore/Interfaces/ICoreObjectFactory.h index cdd0602..7a0ccc1 100644 --- a/public/include/XMPCore/Interfaces/ICoreObjectFactory.h +++ b/public/include/XMPCore/Interfaces/ICoreObjectFactory.h @@ -2,13 +2,11 @@ #define ICoreObjectFactory_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h b/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h index be084f7..2e9d50f 100644 --- a/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h +++ b/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IDOMParser.h b/public/include/XMPCore/Interfaces/IDOMParser.h index a852791..806a93b 100644 --- a/public/include/XMPCore/Interfaces/IDOMParser.h +++ b/public/include/XMPCore/Interfaces/IDOMParser.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IDOMSerializer.h b/public/include/XMPCore/Interfaces/IDOMSerializer.h index bea92cd..9ec2e8b 100644 --- a/public/include/XMPCore/Interfaces/IDOMSerializer.h +++ b/public/include/XMPCore/Interfaces/IDOMSerializer.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IMetadata.h b/public/include/XMPCore/Interfaces/IMetadata.h index 6ce098f..de89555 100644 --- a/public/include/XMPCore/Interfaces/IMetadata.h +++ b/public/include/XMPCore/Interfaces/IMetadata.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/IStructureNode.h" diff --git a/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h b/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h index acfc559..7aec7fd 100644 --- a/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h +++ b/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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> #define TXMP_STRING_TYPE std::string diff --git a/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h b/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h index fe4651e..82e7a11 100644 --- a/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h +++ b/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/INode.h b/public/include/XMPCore/Interfaces/INode.h index 516a944..5421d9a 100644 --- a/public/include/XMPCore/Interfaces/INode.h +++ b/public/include/XMPCore/Interfaces/INode.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/INodeIterator.h b/public/include/XMPCore/Interfaces/INodeIterator.h index 10c60d8..fd4058c 100644 --- a/public/include/XMPCore/Interfaces/INodeIterator.h +++ b/public/include/XMPCore/Interfaces/INodeIterator.h @@ -4,13 +4,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IPath.h b/public/include/XMPCore/Interfaces/IPath.h index 774bc46..fc9d80f 100644 --- a/public/include/XMPCore/Interfaces/IPath.h +++ b/public/include/XMPCore/Interfaces/IPath.h @@ -2,13 +2,11 @@ #define __IPath_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IPathSegment.h b/public/include/XMPCore/Interfaces/IPathSegment.h index 5cd0591..afdae03 100644 --- a/public/include/XMPCore/Interfaces/IPathSegment.h +++ b/public/include/XMPCore/Interfaces/IPathSegment.h @@ -2,13 +2,11 @@ #define __IPathSegment_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/ISimpleNode.h b/public/include/XMPCore/Interfaces/ISimpleNode.h index 6bc731e..f1ec405 100644 --- a/public/include/XMPCore/Interfaces/ISimpleNode.h +++ b/public/include/XMPCore/Interfaces/ISimpleNode.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/INode.h" diff --git a/public/include/XMPCore/Interfaces/IStructureNode.h b/public/include/XMPCore/Interfaces/IStructureNode.h index 47ebd4d..a5755bb 100644 --- a/public/include/XMPCore/Interfaces/IStructureNode.h +++ b/public/include/XMPCore/Interfaces/IStructureNode.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/ICompositeNode.h" diff --git a/public/include/XMPCore/XMPCoreDefines.h b/public/include/XMPCore/XMPCoreDefines.h index 00c22a4..df3cf7e 100644 --- a/public/include/XMPCore/XMPCoreDefines.h +++ b/public/include/XMPCore/XMPCoreDefines.h @@ -2,13 +2,11 @@ #define XMPCoreDefines_h__ 1 // ================================================================================================= -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCore/XMPCoreErrorCodes.h b/public/include/XMPCore/XMPCoreErrorCodes.h index 2ea8f22..6e8322d 100644 --- a/public/include/XMPCore/XMPCoreErrorCodes.h +++ b/public/include/XMPCore/XMPCoreErrorCodes.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/XMPCoreDefines.h" diff --git a/public/include/XMPCore/XMPCoreFwdDeclarations.h b/public/include/XMPCore/XMPCoreFwdDeclarations.h index 90a326f..1b67ef2 100644 --- a/public/include/XMPCore/XMPCoreFwdDeclarations.h +++ b/public/include/XMPCore/XMPCoreFwdDeclarations.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2014 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h b/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h index d00d602..0a42d53 100644 --- a/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h +++ b/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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/public/include/XMPCore/source/IArrayNode.cpp b/public/include/XMPCore/source/IArrayNode.cpp index 46a719a..23c07dc 100644 --- a/public/include/XMPCore/source/IArrayNode.cpp +++ b/public/include/XMPCore/source/IArrayNode.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IClientDOMParser.cpp b/public/include/XMPCore/source/IClientDOMParser.cpp index deac0d1..e5766e7 100644 --- a/public/include/XMPCore/source/IClientDOMParser.cpp +++ b/public/include/XMPCore/source/IClientDOMParser.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/IClientDOMParser.h" diff --git a/public/include/XMPCore/source/IClientDOMSerializer.cpp b/public/include/XMPCore/source/IClientDOMSerializer.cpp index 769e90a..dd55e32 100644 --- a/public/include/XMPCore/source/IClientDOMSerializer.cpp +++ b/public/include/XMPCore/source/IClientDOMSerializer.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/IClientDOMSerializer.h" diff --git a/public/include/XMPCore/source/ICompositeNode.cpp b/public/include/XMPCore/source/ICompositeNode.cpp index d11c2a8..dbe7084 100644 --- a/public/include/XMPCore/source/ICompositeNode.cpp +++ b/public/include/XMPCore/source/ICompositeNode.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/ICoreConfigurationManager.cpp b/public/include/XMPCore/source/ICoreConfigurationManager.cpp index a61d8de..e18dbec 100644 --- a/public/include/XMPCore/source/ICoreConfigurationManager.cpp +++ b/public/include/XMPCore/source/ICoreConfigurationManager.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/ICoreObjectFactory.cpp b/public/include/XMPCore/source/ICoreObjectFactory.cpp index 95b372f..bb2e176 100644 --- a/public/include/XMPCore/source/ICoreObjectFactory.cpp +++ b/public/include/XMPCore/source/ICoreObjectFactory.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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 "XMPCore/Interfaces/ICoreObjectFactory.h" diff --git a/public/include/XMPCore/source/IDOMImplementationRegistry.cpp b/public/include/XMPCore/source/IDOMImplementationRegistry.cpp index 9fc436c..bfa3e4f 100644 --- a/public/include/XMPCore/source/IDOMImplementationRegistry.cpp +++ b/public/include/XMPCore/source/IDOMImplementationRegistry.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IDOMParser.cpp b/public/include/XMPCore/source/IDOMParser.cpp index 78f4c36..75d2ea4 100644 --- a/public/include/XMPCore/source/IDOMParser.cpp +++ b/public/include/XMPCore/source/IDOMParser.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IDOMSerializer.cpp b/public/include/XMPCore/source/IDOMSerializer.cpp index f76161a..04239fa 100644 --- a/public/include/XMPCore/source/IDOMSerializer.cpp +++ b/public/include/XMPCore/source/IDOMSerializer.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IMetadata.cpp b/public/include/XMPCore/source/IMetadata.cpp index 83e9cd7..da9e055 100644 --- a/public/include/XMPCore/source/IMetadata.cpp +++ b/public/include/XMPCore/source/IMetadata.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IMetadataConverterUtils.cpp b/public/include/XMPCore/source/IMetadataConverterUtils.cpp index 5c98715..a784341 100644 --- a/public/include/XMPCore/source/IMetadataConverterUtils.cpp +++ b/public/include/XMPCore/source/IMetadataConverterUtils.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/INameSpacePrefixMap.cpp b/public/include/XMPCore/source/INameSpacePrefixMap.cpp index 59db914..d9ce1bc 100644 --- a/public/include/XMPCore/source/INameSpacePrefixMap.cpp +++ b/public/include/XMPCore/source/INameSpacePrefixMap.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/INode.cpp b/public/include/XMPCore/source/INode.cpp index 114d2ee..a1e1b42 100644 --- a/public/include/XMPCore/source/INode.cpp +++ b/public/include/XMPCore/source/INode.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/INodeIterator.cpp b/public/include/XMPCore/source/INodeIterator.cpp index 6cae09e..f9d3fb2 100644 --- a/public/include/XMPCore/source/INodeIterator.cpp +++ b/public/include/XMPCore/source/INodeIterator.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IPath.cpp b/public/include/XMPCore/source/IPath.cpp index ed42b82..bd190b1 100644 --- a/public/include/XMPCore/source/IPath.cpp +++ b/public/include/XMPCore/source/IPath.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IPathSegment.cpp b/public/include/XMPCore/source/IPathSegment.cpp index c6b89f9..4fd7008 100644 --- a/public/include/XMPCore/source/IPathSegment.cpp +++ b/public/include/XMPCore/source/IPathSegment.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/ISimpleNode.cpp b/public/include/XMPCore/source/ISimpleNode.cpp index 81bf3b7..0c96a90 100644 --- a/public/include/XMPCore/source/ISimpleNode.cpp +++ b/public/include/XMPCore/source/ISimpleNode.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IStructureNode.cpp b/public/include/XMPCore/source/IStructureNode.cpp index 0869001..6bf866c 100644 --- a/public/include/XMPCore/source/IStructureNode.cpp +++ b/public/include/XMPCore/source/IStructureNode.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2015 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMP_Const.h b/public/include/XMP_Const.h index 2e60bb9..5a3f430 100644 --- a/public/include/XMP_Const.h +++ b/public/include/XMP_Const.h @@ -2,13 +2,11 @@ #define __XMP_Const_h__ 1 // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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 "XMP_Environment.h" diff --git a/public/include/XMP_Environment.h b/public/include/XMP_Environment.h index a635cc6..69fb136 100644 --- a/public/include/XMP_Environment.h +++ b/public/include/XMP_Environment.h @@ -11,13 +11,11 @@ // ================================================================================================= // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/public/include/XMP_IO.hpp b/public/include/XMP_IO.hpp index 5dcfd76..554544b 100644 --- a/public/include/XMP_IO.hpp +++ b/public/include/XMP_IO.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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 "XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/public/include/XMP_Version.h b/public/include/XMP_Version.h index 622658a..2068a2d 100644 --- a/public/include/XMP_Version.h +++ b/public/include/XMP_Version.h @@ -7,13 +7,11 @@ /* // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/public/include/client-glue/WXMPFiles.hpp b/public/include/client-glue/WXMPFiles.hpp index 4575e48..7da8da6 100644 --- a/public/include/client-glue/WXMPFiles.hpp +++ b/public/include/client-glue/WXMPFiles.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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 "client-glue/WXMP_Common.hpp" diff --git a/public/include/client-glue/WXMPIterator.hpp b/public/include/client-glue/WXMPIterator.hpp index b0e7624..2d77402 100644 --- a/public/include/client-glue/WXMPIterator.hpp +++ b/public/include/client-glue/WXMPIterator.hpp @@ -2,13 +2,11 @@ #define __WXMPIterator_hpp__ 1 // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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 "client-glue/WXMP_Common.hpp" diff --git a/public/include/client-glue/WXMPMeta.hpp b/public/include/client-glue/WXMPMeta.hpp index f507bd7..0a3c51b 100644 --- a/public/include/client-glue/WXMPMeta.hpp +++ b/public/include/client-glue/WXMPMeta.hpp @@ -2,13 +2,11 @@ #define __WXMPMeta_hpp__ 1 // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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 "client-glue/WXMP_Common.hpp" diff --git a/public/include/client-glue/WXMPUtils.hpp b/public/include/client-glue/WXMPUtils.hpp index 34db833..a456e47 100644 --- a/public/include/client-glue/WXMPUtils.hpp +++ b/public/include/client-glue/WXMPUtils.hpp @@ -2,13 +2,11 @@ #define __WXMPUtils_hpp__ 1 // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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 "client-glue/WXMP_Common.hpp" diff --git a/public/include/client-glue/WXMP_Common.hpp b/public/include/client-glue/WXMP_Common.hpp index da48ad5..7c138b3 100644 --- a/public/include/client-glue/WXMP_Common.hpp +++ b/public/include/client-glue/WXMP_Common.hpp @@ -2,13 +2,11 @@ #define __WXMP_Common_hpp__ 1 // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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 XMP_Inline diff --git a/samples/build/GenerateSamples_mac.sh b/samples/build/GenerateSamples_mac.sh index 43d6640..01217db 100755 --- a/samples/build/GenerateSamples_mac.sh +++ b/samples/build/GenerateSamples_mac.sh @@ -1,7 +1,7 @@ #!/bin/bash # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/build/GenerateSamples_win.bat b/samples/build/GenerateSamples_win.bat index 84fd0ab..304d6de 100755 --- a/samples/build/GenerateSamples_win.bat +++ b/samples/build/GenerateSamples_win.bat @@ -1,5 +1,5 @@ :: ================================================================================================= -:: Copyright 2013 Adobe Systems Incorporated +:: Copyright 2020 Adobe Systems Incorporated :: All Rights Reserved. :: :: NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/build/cmake/CMakeLists.txt b/samples/build/cmake/CMakeLists.txt index 431e064..93f44dc 100644 --- a/samples/build/cmake/CMakeLists.txt +++ b/samples/build/cmake/CMakeLists.txt @@ -1,33 +1,33 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) endif(ANDROID) project(${PROJECT_NAME}64) -
-#This projects relative path to XMP Root
-set ( XMP_THIS_PROJECT_RELATIVEPATH "../../../")
-#setting the root for XMP SDK
-if(NOT DEFINED XMP_ROOT)
- set(XMP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/${XMP_THIS_PROJECT_RELATIVEPATH})
-endif()
-
-if(NOT DEFINED COMMON_BUILD_SHARED_DIR)
- set(COMMON_BUILD_SHARED_DIR ${XMP_ROOT}/build/shared)
-endif()
-
-set(USE_BUILDMODE_LIBNAME 0)
-
+ +#This projects relative path to XMP Root +set ( XMP_THIS_PROJECT_RELATIVEPATH "../../../") +#setting the root for XMP SDK +if(NOT DEFINED XMP_ROOT) + set(XMP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/${XMP_THIS_PROJECT_RELATIVEPATH}) +endif() + +if(NOT DEFINED COMMON_BUILD_SHARED_DIR) + set(COMMON_BUILD_SHARED_DIR ${XMP_ROOT}/build/shared) +endif() + +set(USE_BUILDMODE_LIBNAME 0) + include(CMakeListsCommonSDK.txt)
\ No newline at end of file diff --git a/samples/build/cmake/CMakeListsCommonSDK.txt b/samples/build/cmake/CMakeListsCommonSDK.txt index ff964d4..f3b6d14 100644 --- a/samples/build/cmake/CMakeListsCommonSDK.txt +++ b/samples/build/cmake/CMakeListsCommonSDK.txt @@ -1,77 +1,77 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configurations" FORCE)
-#This projects relative path to XMP Root
-
-# Set the project name according to target
-if(CMAKE_CL_64)
- set(IS64BIT "TRUE")
- set (POSTFIX "_x64")
- project(XMP_Samples_64)
- message (INFO ":64 Target is chosen")
-else(CMAKE_CL_64)
- set(IS64BIT "FALSE")
- project(XMP_Samples)
- message (INFO ":32 bit target is chosen")
-endif(CMAKE_CL_64)
-
-set(TESTXMP_VERSION 1.0)
-
-# setting static flag for correct compiler flag through shared config
-if(STATIC)
-set (XMP_BUILD_STATIC 1)
-else(STATIC)
-set (XMP_BUILD_STATIC 0)
-endif(STATIC)
-
-# ==============================================================================
-# load shared config
-# ==============================================================================
-include(SharedConfigSDK.cmake)
-
-# common path defines
-# setup project specific paths
-set( PROJECT_ROOT ${PROJECT_SOURCE_DIR})
-set( SAMPLE_SOURCE_ROOT ${PROJECT_ROOT}/../../source/)
-set( XMP_ROOT ${PROJECT_ROOT}/../../.. )
-set( PUBLIC_INCLUDE ${XMP_ROOT}/public/include)
-
-# Output of test executables
-set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/target/${PLATFORM_FOLDER}/)
-
-# Add the Samples to the project
-# message (INFO ":Add CustomSchema sample")
- add_subdirectory(${PROJECT_ROOT}/CustomSchema ${PROJECT_ROOT}/CustomSchema/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/CustomSchemaNewDOM ${PROJECT_ROOT}/CustomSchemaNewDOM/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/DumpFile ${PROJECT_ROOT}/DumpFile/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/DumpMainXMP ${PROJECT_ROOT}/DumpMainXMP/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/DumpScannedXMP ${PROJECT_ROOT}/DumpScannedXMP/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/ModifyingXMP ${PROJECT_ROOT}/ModifyingXMP/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/ModifyingXMPNewDOM ${PROJECT_ROOT}/ModifyingXMPNewDOM/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/ReadingXMP ${PROJECT_ROOT}/ReadingXMP/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/ReadingXMPNewDOM ${PROJECT_ROOT}/ReadingXMPNewDOM/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/XMPCommand ${PROJECT_ROOT}/XMPCommand/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/XMPCoreCoverage ${PROJECT_ROOT}/XMPCoreCoverage/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/XMPFilesCoverage ${PROJECT_ROOT}/XMPFilesCoverage/build${POSTFIX})
- add_subdirectory(${PROJECT_ROOT}/XMPIterations ${PROJECT_ROOT}/XMPIterations/build${POSTFIX})
-
-message (STATUS "===========================================================================")
-message (STATUS " ${PROJECT_NAME} ")
-message (STATUS "===========================================================================")
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configurations" FORCE) +#This projects relative path to XMP Root + +# Set the project name according to target +if(CMAKE_CL_64) + set(IS64BIT "TRUE") + set (POSTFIX "_x64") + project(XMP_Samples_64) + message (INFO ":64 Target is chosen") +else(CMAKE_CL_64) + set(IS64BIT "FALSE") + project(XMP_Samples) + message (INFO ":32 bit target is chosen") +endif(CMAKE_CL_64) + +set(TESTXMP_VERSION 1.0) + +# setting static flag for correct compiler flag through shared config +if(STATIC) +set (XMP_BUILD_STATIC 1) +else(STATIC) +set (XMP_BUILD_STATIC 0) +endif(STATIC) + +# ============================================================================== +# load shared config +# ============================================================================== +include(SharedConfigSDK.cmake) + +# common path defines +# setup project specific paths +set( PROJECT_ROOT ${PROJECT_SOURCE_DIR}) +set( SAMPLE_SOURCE_ROOT ${PROJECT_ROOT}/../../source/) +set( XMP_ROOT ${PROJECT_ROOT}/../../.. ) +set( PUBLIC_INCLUDE ${XMP_ROOT}/public/include) + +# Output of test executables +set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/target/${PLATFORM_FOLDER}/) + +# Add the Samples to the project +# message (INFO ":Add CustomSchema sample") + add_subdirectory(${PROJECT_ROOT}/CustomSchema ${PROJECT_ROOT}/CustomSchema/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/CustomSchemaNewDOM ${PROJECT_ROOT}/CustomSchemaNewDOM/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/DumpFile ${PROJECT_ROOT}/DumpFile/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/DumpMainXMP ${PROJECT_ROOT}/DumpMainXMP/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/DumpScannedXMP ${PROJECT_ROOT}/DumpScannedXMP/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/ModifyingXMP ${PROJECT_ROOT}/ModifyingXMP/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/ModifyingXMPNewDOM ${PROJECT_ROOT}/ModifyingXMPNewDOM/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/ReadingXMP ${PROJECT_ROOT}/ReadingXMP/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/ReadingXMPNewDOM ${PROJECT_ROOT}/ReadingXMPNewDOM/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/XMPCommand ${PROJECT_ROOT}/XMPCommand/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/XMPCoreCoverage ${PROJECT_ROOT}/XMPCoreCoverage/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/XMPFilesCoverage ${PROJECT_ROOT}/XMPFilesCoverage/build${POSTFIX}) + add_subdirectory(${PROJECT_ROOT}/XMPIterations ${PROJECT_ROOT}/XMPIterations/build${POSTFIX}) + +message (STATUS "===========================================================================") +message (STATUS " ${PROJECT_NAME} ") +message (STATUS "===========================================================================") + + diff --git a/samples/build/cmake/CustomSchema/CMakeLists.txt b/samples/build/cmake/CustomSchema/CMakeLists.txt index 7de7988..a020c52 100644 --- a/samples/build/cmake/CustomSchema/CMakeLists.txt +++ b/samples/build/cmake/CustomSchema/CMakeLists.txt @@ -1,87 +1,87 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (CustomSchema)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchema.cpp )
-source_group("Source Files" FILES ${SOURCE_FILES})
-include_directories( ${XMP_ROOT} )
-include_directories( ${PUBLIC_INCLUDE} )
-add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-
-#message (STATUS "Output Folder -> ${OUTPUT_DIR}")
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (CustomSchema) + +# ============================================================================== +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + +file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchema.cpp ) +source_group("Source Files" FILES ${SOURCE_FILES}) +include_directories( ${XMP_ROOT} ) +include_directories( ${PUBLIC_INCLUDE} ) +add_executable(${PROJECT_NAME} ${SOURCE_FILES}) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) + +#message (STATUS "Output Folder -> ${OUTPUT_DIR}") +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + diff --git a/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt b/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt index 70b7724..b13fd20 100644 --- a/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt +++ b/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt @@ -1,94 +1,94 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (CustomSchemaNewDOM)
-
-# ==============================================================================
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-if(STATIC)
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp )
- source_group("Source Files" FILES ${SOURCE_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-else(STATIC)
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp )
- file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
- file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
- source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
-endif(STATIC)
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/)
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-
-#message (STATUS "Output Folder -> ${OUTPUT_DIR}")
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (CustomSchemaNewDOM) + +# ============================================================================== +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +if(STATIC) + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp ) + source_group("Source Files" FILES ${SOURCE_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES}) +else(STATIC) + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp ) + file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp) + file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES}) + source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES}) +endif(STATIC) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) + +#message (STATUS "Output Folder -> ${OUTPUT_DIR}") +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + diff --git a/samples/build/cmake/DumpFile/CMakeLists.txt b/samples/build/cmake/DumpFile/CMakeLists.txt index f412eec..15cf32e 100644 --- a/samples/build/cmake/DumpFile/CMakeLists.txt +++ b/samples/build/cmake/DumpFile/CMakeLists.txt @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/build/cmake/DumpFile/CMakeListsCommon.txt b/samples/build/cmake/DumpFile/CMakeListsCommon.txt index 66ba46b..f05c9db 100644 --- a/samples/build/cmake/DumpFile/CMakeListsCommon.txt +++ b/samples/build/cmake/DumpFile/CMakeListsCommon.txt @@ -1,75 +1,75 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-
-source_group("Source Files" FILES ${SOURCE_FILES})
-source_group("Common Files" FILES ${COMMON_FILES})
-include_directories( ${XMP_ROOT} )
-include_directories( ${PUBLIC_INCLUDE} )
-
-add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES})
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + + +source_group("Source Files" FILES ${SOURCE_FILES}) +source_group("Common Files" FILES ${COMMON_FILES}) +include_directories( ${XMP_ROOT} ) +include_directories( ${PUBLIC_INCLUDE} ) + +add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES}) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) + +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + diff --git a/samples/build/cmake/DumpMainXMP/CMakeLists.txt b/samples/build/cmake/DumpMainXMP/CMakeLists.txt index bdb6352..b35d6dd 100644 --- a/samples/build/cmake/DumpMainXMP/CMakeLists.txt +++ b/samples/build/cmake/DumpMainXMP/CMakeLists.txt @@ -1,85 +1,85 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project ( DumpMainXMP )
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpMainXMP.cpp )
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project ( DumpMainXMP ) + +# ============================================================================== +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpMainXMP.cpp ) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES}) +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/DumpScannedXMP/CMakeLists.txt b/samples/build/cmake/DumpScannedXMP/CMakeLists.txt index bbdf1f3..7788590 100644 --- a/samples/build/cmake/DumpScannedXMP/CMakeLists.txt +++ b/samples/build/cmake/DumpScannedXMP/CMakeLists.txt @@ -1,87 +1,87 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (DumpScannedXMP)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpScannedXMP.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (DumpScannedXMP) + +# ============================================================================== +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpScannedXMP.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/ModifyingXMP/CMakeLists.txt b/samples/build/cmake/ModifyingXMP/CMakeLists.txt index 26d1e09..2a2a3fc 100644 --- a/samples/build/cmake/ModifyingXMP/CMakeLists.txt +++ b/samples/build/cmake/ModifyingXMP/CMakeLists.txt @@ -1,88 +1,88 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ModifyingXMP)
-
-# ==============================================================================
-
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMP.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (ModifyingXMP) + +# ============================================================================== + +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMP.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) + +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt b/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt index 93e7f50..6b326c1 100644 --- a/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt +++ b/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt @@ -1,94 +1,94 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ModifyingXMPNewDOM)
-
-# ==============================================================================
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-if(STATIC)
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-else(STATIC)
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp)
- file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
- file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
- source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
-endif(STATIC)
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (ModifyingXMPNewDOM) + +# ============================================================================== +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +if(STATIC) + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) +else(STATIC) + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp) + file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp) + file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES}) + source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES}) +endif(STATIC) +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) + + +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/ReadingXMP/CMakeLists.txt b/samples/build/cmake/ReadingXMP/CMakeLists.txt index cb5ec36..4b56cde 100644 --- a/samples/build/cmake/ReadingXMP/CMakeLists.txt +++ b/samples/build/cmake/ReadingXMP/CMakeLists.txt @@ -1,88 +1,88 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ReadingXMP)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMP.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (ReadingXMP) + +# ============================================================================== +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMP.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) + + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) + +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt b/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt index d506981..d9660f3 100644 --- a/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt +++ b/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt @@ -1,95 +1,95 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ReadingXMPNewDOM)
-
-# ==============================================================================
-
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-if(STATIC)
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-else(STATIC)
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp)
- file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
- file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
- source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
-endif(STATIC)
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#adding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (ReadingXMPNewDOM) + +# ============================================================================== + +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +if(STATIC) + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) +else(STATIC) + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp) + file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp) + file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES}) + source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES}) +endif(STATIC) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#adding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/SharedConfigSDK.cmake b/samples/build/cmake/SharedConfigSDK.cmake index bf968b7..eb0a21a 100644 --- a/samples/build/cmake/SharedConfigSDK.cmake +++ b/samples/build/cmake/SharedConfigSDK.cmake @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/build/cmake/XMPCommand/CMakeLists.txt b/samples/build/cmake/XMPCommand/CMakeLists.txt index b869d6d..edb9652 100644 --- a/samples/build/cmake/XMPCommand/CMakeLists.txt +++ b/samples/build/cmake/XMPCommand/CMakeLists.txt @@ -1,6 +1,6 @@ # ================================================================================================= # ADOBE SYSTEMS INCORPORATED -# Copyright 2013 Adobe Systems Incorporated +# Copyright 2020 Adobe Systems Incorporated # All Rights Reserved # # NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/build/cmake/XMPCommand/CMakeListsCommon.txt b/samples/build/cmake/XMPCommand/CMakeListsCommon.txt index 478519d..73ae91d 100644 --- a/samples/build/cmake/XMPCommand/CMakeListsCommon.txt +++ b/samples/build/cmake/XMPCommand/CMakeListsCommon.txt @@ -1,80 +1,80 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPCommand)
-
-
-source_group("Source Files" FILES ${SOURCE_FILES})
-source_group("Common Files" FILES ${COMMON_FILES})
-include_directories( ${XMP_ROOT} )
-include_directories( ${PUBLIC_INCLUDE} )
-
-add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES})
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (XMPCommand) + + +source_group("Source Files" FILES ${SOURCE_FILES}) +source_group("Common Files" FILES ${COMMON_FILES}) +include_directories( ${XMP_ROOT} ) +include_directories( ${PUBLIC_INCLUDE} ) + +add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES}) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt b/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt index 321dc1c..08c4686 100644 --- a/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt +++ b/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt @@ -1,85 +1,85 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPCoreCoverage)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPCoreCoverage.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (XMPCoreCoverage) + +# ============================================================================== +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPCoreCoverage.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt b/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt index 749300a..1bd8a5a 100644 --- a/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt +++ b/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt @@ -1,85 +1,85 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPFilesCoverage)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPFilesCoverage.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (XMPFilesCoverage) + +# ============================================================================== +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPFilesCoverage.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/cmake/XMPIterations/CMakeLists.txt b/samples/build/cmake/XMPIterations/CMakeLists.txt index 61f177c..0fc0db5 100644 --- a/samples/build/cmake/XMPIterations/CMakeLists.txt +++ b/samples/build/cmake/XMPIterations/CMakeLists.txt @@ -1,86 +1,86 @@ -# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# 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.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
- cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
- cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPIterations)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
- file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPIterations.cpp)
- source_group("Source Files" FILES ${SOURCE_FILES})
- source_group("Common Files" FILES ${COMMON_FILES})
- include_directories( ${XMP_ROOT} )
- include_directories( ${PUBLIC_INCLUDE} )
- add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME )
- set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- endif(UNIX)
-else(STATIC)
- if(UNIX)
- if(APPLE) #For Mac
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- else(APPLE) #For Linux
- SetPlatformLinkFlags(${PROJECT_NAME} "" "")
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
- endif(APPLE)
- else(UNIX) #For Windows
- target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)
- set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ )
- set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
- add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
- endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# ================================================================================================= +# ADOBE SYSTEMS INCORPORATED +# Copyright 2020 Adobe Systems Incorporated +# 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. +# ================================================================================================= + +# define minimum cmake version +# For Android always build with make 3.6 +if(ANDROID) + cmake_minimum_required(VERSION 3.5.2) +else(ANDROID) + cmake_minimum_required(VERSION 3.15.5) +endif(ANDROID) + +# ============================================================================== +# Adding Project Name +# ============================================================================== +project (XMPIterations) + +# ============================================================================== +if(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=1) +else(STATIC) +add_definitions(-DENABLE_CPP_DOM_MODEL=0) +endif(STATIC) + + file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPIterations.cpp) + source_group("Source Files" FILES ${SOURCE_FILES}) + source_group("Common Files" FILES ${COMMON_FILES}) + include_directories( ${XMP_ROOT} ) + include_directories( ${PUBLIC_INCLUDE} ) + add_executable(${PROJECT_NAME} ${SOURCE_FILES} ) + +#setting up XMP_BUILDMODE_DIR variable +SetupInternalBuildDirectory() +set (BUILD_MODE_LIBNAME "") +if (USE_BUILDMODE_LIBNAME ) + set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR}) +endif() +#addding XMP libs and setting output path +if(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + endif(UNIX) +else(STATIC) + if(UNIX) + if(APPLE) #For Mac + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB}) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + else(APPLE) #For Linux + SetPlatformLinkFlags(${PROJECT_NAME} "" "") + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} ) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} ) + endif(APPLE) + else(UNIX) #For Windows + target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib) + set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) + set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR}) + add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} ) + endif(UNIX) +endif(STATIC) +#adding Cocoa for Mac +ADD_FRAMEWORK(Cocoa ${PROJECT_NAME}) + + + diff --git a/samples/build/readme.txt b/samples/build/readme.txt index 98c4aad..5583b74 100644 --- a/samples/build/readme.txt +++ b/samples/build/readme.txt @@ -1,20 +1,20 @@ -Building Sample Projects:
-
-Windows:
-
-1. Double Click "GenerateSamples_win.bat" or run it through command prompt.
-2. Enter the type of project to create
-3. The project files will be created in vc14\windows or vc14\windows_x64 folder
-
-Mac:
-
-1. Run the shell script GenerateSamples_mac.sh.
-2. Enter the type of project to create
-3. The project files will be created in xcode\intel_64 folder
-
-Linux:
-
-1. Run the Makefile. This Makefile will call cmake to generate the makefile for all the samples. Also all the sample will be build automatically.
-2. All the sample projects makefiles will be created in gcc folder.
-3. All the sample will be built in ../target folder.
-4. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well.
+Building Sample Projects: + +Windows: + +1. Double Click "GenerateSamples_win.bat" or run it through command prompt. +2. Enter the type of project to create +3. The project files will be created in vc14\windows or vc14\windows_x64 folder + +Mac: + +1. Run the shell script GenerateSamples_mac.sh. +2. Enter the type of project to create +3. The project files will be created in xcode\intel_64 folder + +Linux: + +1. Run the Makefile. This Makefile will call cmake to generate the makefile for all the samples. Also all the sample will be build automatically. +2. All the sample projects makefiles will be created in gcc folder. +3. All the sample will be built in ../target folder. +4. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well. diff --git a/samples/source/CustomSchema.cpp b/samples/source/CustomSchema.cpp index 9994cbd..68782fa 100644 --- a/samples/source/CustomSchema.cpp +++ b/samples/source/CustomSchema.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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/samples/source/CustomSchemaNewDOM.cpp b/samples/source/CustomSchemaNewDOM.cpp index c1428ad..8c53bf9 100644 --- a/samples/source/CustomSchemaNewDOM.cpp +++ b/samples/source/CustomSchemaNewDOM.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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/samples/source/DumpMainXMP.cpp b/samples/source/DumpMainXMP.cpp index bf21274..698efac 100644 --- a/samples/source/DumpMainXMP.cpp +++ b/samples/source/DumpMainXMP.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/samples/source/DumpScannedXMP.cpp b/samples/source/DumpScannedXMP.cpp index 9d7e65e..c09d47f 100644 --- a/samples/source/DumpScannedXMP.cpp +++ b/samples/source/DumpScannedXMP.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/samples/source/ModifyingXMP.cpp b/samples/source/ModifyingXMP.cpp index df5c86f..691d30e 100644 --- a/samples/source/ModifyingXMP.cpp +++ b/samples/source/ModifyingXMP.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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/samples/source/ModifyingXMPNewDOM.cpp b/samples/source/ModifyingXMPNewDOM.cpp index 73f5fb3..f75a20a 100644 --- a/samples/source/ModifyingXMPNewDOM.cpp +++ b/samples/source/ModifyingXMPNewDOM.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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/samples/source/ReadingXMP.cpp b/samples/source/ReadingXMP.cpp index c312535..a0e0430 100644 --- a/samples/source/ReadingXMP.cpp +++ b/samples/source/ReadingXMP.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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/samples/source/ReadingXMPNewDOM.cpp b/samples/source/ReadingXMPNewDOM.cpp index 99d636a..072d9fd 100644 --- a/samples/source/ReadingXMPNewDOM.cpp +++ b/samples/source/ReadingXMPNewDOM.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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/samples/source/XMPCoreCoverage.cpp b/samples/source/XMPCoreCoverage.cpp index 291bd27..7381dd4 100644 --- a/samples/source/XMPCoreCoverage.cpp +++ b/samples/source/XMPCoreCoverage.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp index 216369f..f8c8178 100644 --- a/samples/source/XMPFilesCoverage.cpp +++ b/samples/source/XMPFilesCoverage.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2002 Adobe +// Copyright 2020 Adobe // 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/samples/source/XMPIterations.cpp b/samples/source/XMPIterations.cpp index 2ad2182..bada8a1 100644 --- a/samples/source/XMPIterations.cpp +++ b/samples/source/XMPIterations.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2008 Adobe +// Copyright 2020 Adobe // 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/samples/source/common/DumpFile.cpp b/samples/source/common/DumpFile.cpp index dba55dd..6c1639b 100644 --- a/samples/source/common/DumpFile.cpp +++ b/samples/source/common/DumpFile.cpp @@ -1,5 +1,5 @@ // ================================================================================================= -// Copyright 2008 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/LargeFileAccess.cpp b/samples/source/common/LargeFileAccess.cpp index 4940721..17fbb17 100644 --- a/samples/source/common/LargeFileAccess.cpp +++ b/samples/source/common/LargeFileAccess.cpp @@ -1,6 +1,6 @@ // ================================================================================================= // ADOBE SYSTEMS INCORPORATED -// Copyright 2008 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/LargeFileAccess.hpp b/samples/source/common/LargeFileAccess.hpp index 157d263..e87661d 100644 --- a/samples/source/common/LargeFileAccess.hpp +++ b/samples/source/common/LargeFileAccess.hpp @@ -2,7 +2,7 @@ #define __LargeFileAccess_hpp__ 1 // ================================================================================================= -// Copyright 2008 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/Log.cpp b/samples/source/common/Log.cpp index b39ecd1..81dafbd 100644 --- a/samples/source/common/Log.cpp +++ b/samples/source/common/Log.cpp @@ -1,5 +1,5 @@ // ================================================================================================= -// Copyright 2008 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/Log.h b/samples/source/common/Log.h index e6e0a49..b482b28 100644 --- a/samples/source/common/Log.h +++ b/samples/source/common/Log.h @@ -1,5 +1,5 @@ // ================================================================================================= -// Copyright 2008 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/TagTree.cpp b/samples/source/common/TagTree.cpp index 5b6cc75..452ca8e 100644 --- a/samples/source/common/TagTree.cpp +++ b/samples/source/common/TagTree.cpp @@ -1,5 +1,5 @@ // ================================================================================================= -// Copyright 2008 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/TagTree.h b/samples/source/common/TagTree.h index 9bd46d3..e2fb3af 100644 --- a/samples/source/common/TagTree.h +++ b/samples/source/common/TagTree.h @@ -1,5 +1,5 @@ // ================================================================================================= -// Copyright 2008 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/XMPScanner.cpp b/samples/source/common/XMPScanner.cpp index 5678571..4637d2a 100644 --- a/samples/source/common/XMPScanner.cpp +++ b/samples/source/common/XMPScanner.cpp @@ -1,5 +1,5 @@ // ================================================================================================= -// Copyright 2004 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/XMPScanner.hpp b/samples/source/common/XMPScanner.hpp index 1479d2d..1affe22 100644 --- a/samples/source/common/XMPScanner.hpp +++ b/samples/source/common/XMPScanner.hpp @@ -2,7 +2,7 @@ #define __XMPScanner_hpp__ // ================================================================================================= -// Copyright 2004 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/common/globals.h b/samples/source/common/globals.h index 0de8124..977e97a 100644 --- a/samples/source/common/globals.h +++ b/samples/source/common/globals.h @@ -1,5 +1,5 @@ // ================================================================================================= -// Copyright 2007 Adobe Systems Incorporated +// Copyright 2020 Adobe Systems Incorporated // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms diff --git a/samples/source/dumpfile/main.cpp b/samples/source/dumpfile/main.cpp index 847f2d7..313ee51 100644 --- a/samples/source/dumpfile/main.cpp +++ b/samples/source/dumpfile/main.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2003 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= // // @@ -60,7 +58,7 @@ void printUsageShort() { Log::info(""); Log::info("%s [ -help | -version | [-keys|-tree|-list] [-nocomments] <path> ]",EXENAME); Log::info(""); - Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved."); + Log::info("Copyright 2020 Adobe Systems Incorporated. All Rights Reserved."); Log::info(""); } @@ -73,7 +71,7 @@ void printUsageLong() { Log::info(""); Log::info("%s [ -help | -version | [-keys|-tree|-list] [-nocomments] <path> ]",EXENAME); Log::info(""); - Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved."); + Log::info("Copyright 2020 Adobe Systems Incorporated. All Rights Reserved."); Log::info("NOTICE: Adobe permits you to use, modify, and distribute this file in"); Log::info(" accordance with the terms of the Adobe license agreement"); Log::info(" accompanying it."); diff --git a/samples/source/xmpcommand/Actions.cpp b/samples/source/xmpcommand/Actions.cpp index c8848f5..48e44be 100644 --- a/samples/source/xmpcommand/Actions.cpp +++ b/samples/source/xmpcommand/Actions.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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. // ================================================================================================= // actions.cpp|h diff --git a/samples/source/xmpcommand/Actions.h b/samples/source/xmpcommand/Actions.h index f820f70..c6dc0f6 100644 --- a/samples/source/xmpcommand/Actions.h +++ b/samples/source/xmpcommand/Actions.h @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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 __ACTIONS_h__ diff --git a/samples/source/xmpcommand/PrintUsage.cpp b/samples/source/xmpcommand/PrintUsage.cpp index 833721f..7d1392f 100644 --- a/samples/source/xmpcommand/PrintUsage.cpp +++ b/samples/source/xmpcommand/PrintUsage.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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 "samples/source/common/globals.h" @@ -26,7 +24,7 @@ namespace XMPQE { Log::info("%s [switch [switch]...] action mediafile",exename); Log::info(""); Log::info("This command uses the XMPFiles component of the Adobe XMP toolkit. "); - Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved."); + Log::info("Copyright 2020 Adobe Systems Incorporated. All Rights Reserved."); Log::info(""); } @@ -37,7 +35,7 @@ namespace XMPQE { Log::info(" Print descriptions of all available switches, including examples"); Log::info("%s [switch [switch]...] action mediafile",exename); Log::info("This command uses the XMPFiles component of the Adobe XMP toolkit. "); - Log::info("Copyright 2008 Adobe Systems Incorporated. All Rights Reserved."); + Log::info("Copyright 2020 Adobe Systems Incorporated. All Rights Reserved."); Log::info("NOTICE: Adobe permits you to use, modify, and distribute this file in"); Log::info(" accordance with the terms of the Adobe license agreement"); Log::info(" accompanying it."); diff --git a/samples/source/xmpcommand/PrintUsage.h b/samples/source/xmpcommand/PrintUsage.h index 4d5b7a6..cdc16da 100644 --- a/samples/source/xmpcommand/PrintUsage.h +++ b/samples/source/xmpcommand/PrintUsage.h @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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 __XMPQE_PRINT_USAGE_h__ diff --git a/samples/source/xmpcommand/XMPCommand.cpp b/samples/source/xmpcommand/XMPCommand.cpp index 5ab4fdb..9c60b8b 100644 --- a/samples/source/xmpcommand/XMPCommand.cpp +++ b/samples/source/xmpcommand/XMPCommand.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2005 Adobe +// Copyright 2020 Adobe // 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/source/Endian.h b/source/Endian.h index c4fe9d9..a78501d 100644 --- a/source/Endian.h +++ b/source/Endian.h @@ -1,13 +1,11 @@ /************************************************************************** * * Copyright Adobe -* Copyright 2010 Adobe +* Copyright 2020 Adobe * 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. +* accordance with the terms of the Adobe license agreement accompanying it. * **************************************************************************/ diff --git a/source/EndianUtils.hpp b/source/EndianUtils.hpp index 19d0224..d3b24aa 100644 --- a/source/EndianUtils.hpp +++ b/source/EndianUtils.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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/source/ExpatAdapter.hpp b/source/ExpatAdapter.hpp index 33c9858..08ecf2d 100644 --- a/source/ExpatAdapter.hpp +++ b/source/ExpatAdapter.hpp @@ -2,13 +2,11 @@ #define __ExpatAdapter_hpp__ // ================================================================================================= -// Copyright 2005 Adobe +// Copyright 2020 Adobe // 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/source/Host_IO-POSIX.cpp b/source/Host_IO-POSIX.cpp index 435ca09..52f8fe0 100644 --- a/source/Host_IO-POSIX.cpp +++ b/source/Host_IO-POSIX.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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/source/Host_IO-Win.cpp b/source/Host_IO-Win.cpp index fd642a5..cc8e331 100644 --- a/source/Host_IO-Win.cpp +++ b/source/Host_IO-Win.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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/source/Host_IO.hpp b/source/Host_IO.hpp index 3e4bdb5..ef5f836 100644 --- a/source/Host_IO.hpp +++ b/source/Host_IO.hpp @@ -2,13 +2,11 @@ #define __Host_IO_hpp__ 1 // ================================================================================================= -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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/source/IOUtils.cpp b/source/IOUtils.cpp index 0e0b66e..99b4fb4 100644 --- a/source/IOUtils.cpp +++ b/source/IOUtils.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2013 Adobe +// Copyright 2020 Adobe // 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 "source/IOUtils.hpp" diff --git a/source/IOUtils.hpp b/source/IOUtils.hpp index ad635c1..9ed8651 100644 --- a/source/IOUtils.hpp +++ b/source/IOUtils.hpp @@ -2,13 +2,11 @@ #define __IOUtils_hpp__ 1 // ================================================================================================= -// Copyright 2013 Adobe +// Copyright 2020 Adobe // 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/source/PerfUtils.cpp b/source/PerfUtils.cpp index f792f73..4e3d9c8 100644 --- a/source/PerfUtils.cpp +++ b/source/PerfUtils.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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/source/PerfUtils.hpp b/source/PerfUtils.hpp index 051e10b..c99d39f 100644 --- a/source/PerfUtils.hpp +++ b/source/PerfUtils.hpp @@ -2,13 +2,11 @@ #define __PerfUtils_hpp__ 1 // ================================================================================================= -// Copyright 2006 Adobe +// Copyright 2020 Adobe // 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/source/SafeStringAPIs.cpp b/source/SafeStringAPIs.cpp index d6c7a40..3626193 100644 --- a/source/SafeStringAPIs.cpp +++ b/source/SafeStringAPIs.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. +// it. // ================================================================================================= #include <stddef.h> /* Include standard ANSI C stuff: size_t, NULL etc */ diff --git a/source/SafeStringAPIs.h b/source/SafeStringAPIs.h index cc7aaad..1f02c75 100644 --- a/source/SafeStringAPIs.h +++ b/source/SafeStringAPIs.h @@ -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. +// it. // ================================================================================================= //Safe String APIs Version 1.0 diff --git a/source/SafeTypes.h b/source/SafeTypes.h index 2a591a1..32f39ee 100644 --- a/source/SafeTypes.h +++ b/source/SafeTypes.h @@ -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. +// it. // ================================================================================================= //SafeTypes Version 1.0 diff --git a/source/SuppressSAL.h b/source/SuppressSAL.h index 2fe7e1a..f27647f 100644 --- a/source/SuppressSAL.h +++ b/source/SuppressSAL.h @@ -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. +// it. // ================================================================================================= //SuppressSAL.h Version 1.0 diff --git a/source/UnicodeConversions.cpp b/source/UnicodeConversions.cpp index 9e3bb41..42fb7f7 100644 --- a/source/UnicodeConversions.cpp +++ b/source/UnicodeConversions.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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_Const.h" diff --git a/source/UnicodeConversions.hpp b/source/UnicodeConversions.hpp index 8d902fa..7953d46 100644 --- a/source/UnicodeConversions.hpp +++ b/source/UnicodeConversions.hpp @@ -2,13 +2,11 @@ #define __UnicodeConversions_h__ // ================================================================================================= -// Copyright 2004 Adobe +// Copyright 2020 Adobe // 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> diff --git a/source/XIO.cpp b/source/XIO.cpp index aa72091..ead1099 100644 --- a/source/XIO.cpp +++ b/source/XIO.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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/source/XIO.hpp b/source/XIO.hpp index 1d94158..5d107e9 100644 --- a/source/XIO.hpp +++ b/source/XIO.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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/source/XMLParserAdapter.hpp b/source/XMLParserAdapter.hpp index ef18732..fbb9782 100644 --- a/source/XMLParserAdapter.hpp +++ b/source/XMLParserAdapter.hpp @@ -2,13 +2,11 @@ #define __XMLParserAdapter_hpp__ // ================================================================================================= -// Copyright 2005 Adobe +// Copyright 2020 Adobe // 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/source/XML_Node.cpp b/source/XML_Node.cpp index c5b6fe4..51e29ec 100644 --- a/source/XML_Node.cpp +++ b/source/XML_Node.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2007 Adobe +// Copyright 2020 Adobe // 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/source/XMPFiles_IO.cpp b/source/XMPFiles_IO.cpp index 43c22cf..d3ff16c 100644 --- a/source/XMPFiles_IO.cpp +++ b/source/XMPFiles_IO.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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/source/XMPFiles_IO.hpp b/source/XMPFiles_IO.hpp index b44ce16..ef72048 100644 --- a/source/XMPFiles_IO.hpp +++ b/source/XMPFiles_IO.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2010 Adobe +// Copyright 2020 Adobe // 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/source/XMP_LibUtils.cpp b/source/XMP_LibUtils.cpp index 0ea5393..18a8f8c 100644 --- a/source/XMP_LibUtils.cpp +++ b/source/XMP_LibUtils.cpp @@ -1,11 +1,9 @@ // ================================================================================================= -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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/source/XMP_LibUtils.hpp b/source/XMP_LibUtils.hpp index 2deee13..7e61b4e 100644 --- a/source/XMP_LibUtils.hpp +++ b/source/XMP_LibUtils.hpp @@ -2,13 +2,11 @@ #define __XMP_LibUtils_hpp__ 1 // ================================================================================================= -// Copyright 2009 Adobe +// Copyright 2020 Adobe // 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/source/XMP_ProgressTracker.cpp b/source/XMP_ProgressTracker.cpp index 0a66d55..702e15b 100644 --- a/source/XMP_ProgressTracker.cpp +++ b/source/XMP_ProgressTracker.cpp @@ -1,12 +1,10 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2012 Adobe +// Copyright 2020 Adobe // 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/source/XMP_ProgressTracker.hpp b/source/XMP_ProgressTracker.hpp index 862fb64..6b19116 100644 --- a/source/XMP_ProgressTracker.hpp +++ b/source/XMP_ProgressTracker.hpp @@ -3,13 +3,11 @@ // ================================================================================================= // Copyright Adobe -// Copyright 2012 Adobe +// Copyright 2020 Adobe // 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/third-party/expat/ReadMe.txt b/third-party/expat/ReadMe.txt index 37766c3..a7c1cbb 100644 --- a/third-party/expat/ReadMe.txt +++ b/third-party/expat/ReadMe.txt @@ -1,76 +1,76 @@ -The XMP Toolkit needs an external XML parser. The source from Adobe is written to use Expat,
-
-although adapters for other parsers can easily be written. The most recent version of Expat used
-
-with XMP is 2.1.0. To use Expat:
-
-
-
-1. Obtain a copy of the Expat distribution. One good place is SourceForge:
-
- http://sourceforge.net/projects/expat/files/expat/2.1.0/
-
-
-
-2. Place Expat's lib directory within .../third-party/expat. I.e. as a sibling of this file.
-
-
-
-For Expat version 2.0.0 the contents of .../third-party/expat/lib are:
-
-
-
- amigaconfig.h
-
- ascii.h
-
- asciitab.h
-
- expat.dsp
-
- expat.h
-
- expatw.dsp
-
- expatw_static.dsp
-
- expat_external.h
-
- expat_static.dsp
-
- iasciitab.h
-
- internal.h
-
- latin1tab.h
-
- libexpat.def
-
- libexpatw.def
-
- macconfig.h
-
- Makefile.MPW
-
- nametab.h
-
- utf8tab.h
-
- winconfig.h
-
- xmlparse.c
-
- xmlrole.c
-
- xmlrole.h
-
- xmltok.c
-
- xmltok.h
-
- xmltok_impl.c
-
- xmltok_impl.h
-
- xmltok_ns.c
-
+The XMP Toolkit needs an external XML parser. The source from Adobe is written to use Expat, + +although adapters for other parsers can easily be written. The most recent version of Expat used + +with XMP is 2.1.0. To use Expat: + + + +1. Obtain a copy of the Expat distribution. One good place is SourceForge: + + http://sourceforge.net/projects/expat/files/expat/2.1.0/ + + + +2. Place Expat's lib directory within .../third-party/expat. I.e. as a sibling of this file. + + + +For Expat version 2.0.0 the contents of .../third-party/expat/lib are: + + + + amigaconfig.h + + ascii.h + + asciitab.h + + expat.dsp + + expat.h + + expatw.dsp + + expatw_static.dsp + + expat_external.h + + expat_static.dsp + + iasciitab.h + + internal.h + + latin1tab.h + + libexpat.def + + libexpatw.def + + macconfig.h + + Makefile.MPW + + nametab.h + + utf8tab.h + + winconfig.h + + xmlparse.c + + xmlrole.c + + xmlrole.h + + xmltok.c + + xmltok.h + + xmltok_impl.c + + xmltok_impl.h + + xmltok_ns.c + diff --git a/third-party/zlib/ReadMe.txt b/third-party/zlib/ReadMe.txt index e610fce..84e9172 100755 --- a/third-party/zlib/ReadMe.txt +++ b/third-party/zlib/ReadMe.txt @@ -1,13 +1,37 @@ -The XMP Toolkit SDK needs zlib.
-This release uses zlib Version 1.2.8
-
-
-
To get zlib:
-
-
1. Obtain a copy of the zlib source code (not the compiled dll)
- from http://www.zlib.net/
- (download links at the time of writing were at the bottom)
-
-
-
2. Place all top-level .c and .h files of the tar/zip you downloaded
- directly in .../third-party/zlib
+The XMP Toolkit SDK needs zlib. +This release uses zlib Version 1.2.8 + + + + + + +To get zlib: + + + + + +1. Obtain a copy of the zlib source code (not the compiled dll) + + + from http://www.zlib.net/ + + + (download links at the time of writing were at the bottom) + + + + + + +2. Place all top-level .c and .h files of the tar/zip you downloaded + + + directly in .../third-party/zlib + + + + + + diff --git a/tools/android/ReadMe.txt b/tools/android/ReadMe.txt index 280e871..68cbd6b 100644 --- a/tools/android/ReadMe.txt +++ b/tools/android/ReadMe.txt @@ -1,20 +1,20 @@ -The XMP Toolkit uses an open-source system to manage the build process.
-You must obtain and install Android tools that are required for the build process for Android binaries of the XMP toolkit SDK.
-
-1. CMake distribution can be installed from the Android Studio SDK Manager. Alternatively, obtain a copy of the CMake distribution for your platform (version 3.6.4111459) from:
-https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip
-
-2. Ninja executable comes with the CMake distribution - <cmakeroot>/bin/ninja.
-
-
-3. Install NDK (version 19c) from the Android Studio SDK Manager. Another option is to download directly from:
-https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip
-
-
-XMP Toolkit places Ndk-bundle , ninja, and cmake of android in this folder or a symbolic link can be created for the same in this folder
-
-sudo ln -s /Users/..../Library/Android/sdk/cmake/3.6.4111459/bin/cmake ../tools/android/
-sudo ln -s /Users/..../Library/Android/sdk/ndk-bundle ../tools/android/
-sudo ln -s /Users/..../Library/Android/sdk/cmake/3.6.4111459/bin/ninja ../tools/android/
+The XMP Toolkit uses an open-source system to manage the build process. +You must obtain and install Android tools that are required for the build process for Android binaries of the XMP toolkit SDK. + +1. CMake distribution can be installed from the Android Studio SDK Manager. Alternatively, obtain a copy of the CMake distribution for your platform (version 3.6.4111459) from: +https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip + +2. Ninja executable comes with the CMake distribution - <cmakeroot>/bin/ninja. + + +3. Install NDK (version 19c) from the Android Studio SDK Manager. Another option is to download directly from: +https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip + + +XMP Toolkit places Ndk-bundle , ninja, and cmake of android in this folder or a symbolic link can be created for the same in this folder + +sudo ln -s /Users/..../Library/Android/sdk/cmake/3.6.4111459/bin/cmake ../tools/android/ +sudo ln -s /Users/..../Library/Android/sdk/ndk-bundle ../tools/android/ +sudo ln -s /Users/..../Library/Android/sdk/cmake/3.6.4111459/bin/ninja ../tools/android/ Note : In case you are not using symbolic links to cmake, CMake binary needs cmake share folder parallel to its parent folder i.e. at tools/
\ No newline at end of file diff --git a/tools/cmake/ReadMe.txt b/tools/cmake/ReadMe.txt index 7c0b864..1ee0fb9 100644 --- a/tools/cmake/ReadMe.txt +++ b/tools/cmake/ReadMe.txt @@ -1,15 +1,15 @@ -The XMP Toolkit uses an open-source system to manage the build process. XMP Toolkit places cmake configuration files (CMakeLists.txt) in the source directories which is used to generate the standard build files.These generated build files can then be used to build the Toolkit.
-
-To use CMake:
-
-1. The minimum version of CMake required for this release is 3.15.5
-
-Download the following recommended CMake distribution zipped package from the following links corresponding to the current platform (Windows, Mac, or Linux)
-Windows ---- https://cmake.org/files/v3.15/cmake-3.15.5-win32-x86.zip
-Mac OSX ---- https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz
-Linux ---- https://cmake.org/files/v3.15/cmake-3.15.5-Linux-x86_64.tar.gz
-
-2. For Windows and Linux copy the folders /bin and /share into <xmpsdk>/tools/cmake/
- For Mac:
- a) Create the folder <xmpsdk>/tools/cmake/bin
- b) Rename and copy the app to this location <xmpsdk>/tools/cmake/bin/cmake.app
+The XMP Toolkit uses an open-source system to manage the build process. XMP Toolkit places cmake configuration files (CMakeLists.txt) in the source directories which is used to generate the standard build files.These generated build files can then be used to build the Toolkit. + +To use CMake: + +1. The minimum version of CMake required for this release is 3.15.5 + +Download the following recommended CMake distribution zipped package from the following links corresponding to the current platform (Windows, Mac, or Linux) +Windows ---- https://cmake.org/files/v3.15/cmake-3.15.5-win32-x86.zip +Mac OSX ---- https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz +Linux ---- https://cmake.org/files/v3.15/cmake-3.15.5-Linux-x86_64.tar.gz + +2. For Windows and Linux copy the folders /bin and /share into <xmpsdk>/tools/cmake/ + For Mac: + a) Create the folder <xmpsdk>/tools/cmake/bin + b) Rename and copy the app to this location <xmpsdk>/tools/cmake/bin/cmake.app |