diff options
| author | Hubert Figuière <hub@figuiere.net> | 2021-09-01 10:11:07 -0400 |
|---|---|---|
| committer | Hubert Figuière <hub@figuiere.net> | 2021-09-01 10:11:07 -0400 |
| commit | 77a3fe7096f8ebf301e2bfe1e6dc023b4ff6dc48 (patch) | |
| tree | 8b72662eb2d26ea7594db6d57616cff367632494 | |
| parent | 6a002707a50fc7b10001b5d627fd2528ca64ce5f (diff) | |
| parent | f2340cff26eff425ccd2dbf082378dfc62816feb (diff) | |
Merge tag 'v2021.08' into adobe-sdk-git
476 files changed, 2005 insertions, 2867 deletions
@@ -65,7 +65,7 @@ metadata formats. Contributions are welcomed! Read the [Contributing Guide](https://github.com/adobe/XMP-Toolkit-SDK/blob/master/CONTRIBUTING.md) for more information. ## Licensing -This project is BSD licensed. See [LICENSE](https://github.com/adobe/XMP-Toolkit-SDK/blob/master/BSD-License.txt) for more information. +This project is BSD licensed. See [LICENSE](https://github.com/adobe/XMP-Toolkit-SDK/blob/main/LICENSE) for more information. ## Report Issues/Bugs You can report the issues in the issues section of the github repo. diff --git a/XMPCommon/BaseClasses/MemoryManagedObject.h b/XMPCommon/BaseClasses/MemoryManagedObject.h index 18f9bfd..8488ff5 100644 --- a/XMPCommon/BaseClasses/MemoryManagedObject.h +++ b/XMPCommon/BaseClasses/MemoryManagedObject.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/BaseClasses/TSingleton.h b/XMPCommon/BaseClasses/TSingleton.h index 543d484..9a14c93 100644 --- a/XMPCommon/BaseClasses/TSingleton.h +++ b/XMPCommon/BaseClasses/TSingleton.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/ImplHeaders/ConfigurableImpl.h b/XMPCommon/ImplHeaders/ConfigurableImpl.h index f7ee1df..f13c6d9 100644 --- a/XMPCommon/ImplHeaders/ConfigurableImpl.h +++ b/XMPCommon/ImplHeaders/ConfigurableImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h b/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h index b5cbdff..bf30bd1 100644 --- a/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h +++ b/XMPCommon/ImplHeaders/ConfigurationManagerImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h b/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h index e960f78..c083f8b 100644 --- a/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h +++ b/XMPCommon/ImplHeaders/DefaultErrorNotifierImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IErrorNotifier_I.h" diff --git a/XMPCommon/ImplHeaders/ErrorImpl.h b/XMPCommon/ImplHeaders/ErrorImpl.h index 10e55f2..abc2656 100644 --- a/XMPCommon/ImplHeaders/ErrorImpl.h +++ b/XMPCommon/ImplHeaders/ErrorImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h b/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h index 7d70665..65baf51 100644 --- a/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h +++ b/XMPCommon/ImplHeaders/ErrorNotifierWrapperImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h b/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h index 38e60e8..32c5acb 100644 --- a/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h +++ b/XMPCommon/ImplHeaders/MemoryAllocatorWrapperImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IMemoryAllocator.h" diff --git a/XMPCommon/ImplHeaders/SharedMutexImpl.h b/XMPCommon/ImplHeaders/SharedMutexImpl.h index 1fb5f11..c9d1b05 100644 --- a/XMPCommon/ImplHeaders/SharedMutexImpl.h +++ b/XMPCommon/ImplHeaders/SharedMutexImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/SharedObjectImpl.h b/XMPCommon/ImplHeaders/SharedObjectImpl.h index 613fde9..9a697e4 100644 --- a/XMPCommon/ImplHeaders/SharedObjectImpl.h +++ b/XMPCommon/ImplHeaders/SharedObjectImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h" diff --git a/XMPCommon/ImplHeaders/ThreadSafeImpl.h b/XMPCommon/ImplHeaders/ThreadSafeImpl.h index cb522b8..7d3c205 100644 --- a/XMPCommon/ImplHeaders/ThreadSafeImpl.h +++ b/XMPCommon/ImplHeaders/ThreadSafeImpl.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/ImplHeaders/UTF8StringImpl.h b/XMPCommon/ImplHeaders/UTF8StringImpl.h index c43d986..1de31c3 100644 --- a/XMPCommon/ImplHeaders/UTF8StringImpl.h +++ b/XMPCommon/ImplHeaders/UTF8StringImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h b/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h index 658bda2..3b3940c 100644 --- a/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h +++ b/XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h b/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h index 94f6d95..102ec32 100644 --- a/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h +++ b/XMPCommon/Interfaces/BaseInterfaces/ISharedObject_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h b/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h index 73c8619..7d1574f 100644 --- a/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h +++ b/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IConfigurationManager_I.h b/XMPCommon/Interfaces/IConfigurationManager_I.h index fa577d7..149af57 100644 --- a/XMPCommon/Interfaces/IConfigurationManager_I.h +++ b/XMPCommon/Interfaces/IConfigurationManager_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IErrorNotifier_I.h b/XMPCommon/Interfaces/IErrorNotifier_I.h index 40f91d4..887a95c 100644 --- a/XMPCommon/Interfaces/IErrorNotifier_I.h +++ b/XMPCommon/Interfaces/IErrorNotifier_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IError_I.h b/XMPCommon/Interfaces/IError_I.h index 9021605..221a324 100644 --- a/XMPCommon/Interfaces/IError_I.h +++ b/XMPCommon/Interfaces/IError_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCommon/Interfaces/IMemoryAllocator_I.h b/XMPCommon/Interfaces/IMemoryAllocator_I.h index 843714e..5b881c7 100644 --- a/XMPCommon/Interfaces/IMemoryAllocator_I.h +++ b/XMPCommon/Interfaces/IMemoryAllocator_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/ISharedMutex.h b/XMPCommon/Interfaces/ISharedMutex.h index 7353ae3..858754f 100644 --- a/XMPCommon/Interfaces/ISharedMutex.h +++ b/XMPCommon/Interfaces/ISharedMutex.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Interfaces/IUTF8String_I.h b/XMPCommon/Interfaces/IUTF8String_I.h index cb3f43e..745a9ef 100644 --- a/XMPCommon/Interfaces/IUTF8String_I.h +++ b/XMPCommon/Interfaces/IUTF8String_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Utilities/AutoSharedLock.h b/XMPCommon/Utilities/AutoSharedLock.h index 4be0b26..daf59bd 100644 --- a/XMPCommon/Utilities/AutoSharedLock.h +++ b/XMPCommon/Utilities/AutoSharedLock.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Utilities/IUTF8StringComparator.h b/XMPCommon/Utilities/IUTF8StringComparator.h index e964e78..22ba1ba 100644 --- a/XMPCommon/Utilities/IUTF8StringComparator.h +++ b/XMPCommon/Utilities/IUTF8StringComparator.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/Utilities/TAllocator.h b/XMPCommon/Utilities/TAllocator.h index 8842671..3d618b8 100644 --- a/XMPCommon/Utilities/TAllocator.h +++ b/XMPCommon/Utilities/TAllocator.h @@ -6,9 +6,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/Utilities/TAtomicTypes.h b/XMPCommon/Utilities/TAtomicTypes.h index c8bdf4a..80df64c 100644 --- a/XMPCommon/Utilities/TAtomicTypes.h +++ b/XMPCommon/Utilities/TAtomicTypes.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCommon/Utilities/TAtomicTypes_Android.h b/XMPCommon/Utilities/TAtomicTypes_Android.h index 66a4d32..d5f8bb5 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Android.h +++ b/XMPCommon/Utilities/TAtomicTypes_Android.h @@ -8,9 +8,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if XMP_AndroidBuild diff --git a/XMPCommon/Utilities/TAtomicTypes_Linux.h b/XMPCommon/Utilities/TAtomicTypes_Linux.h index 134216a..78ffd2c 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Linux.h +++ b/XMPCommon/Utilities/TAtomicTypes_Linux.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if XMP_UNIXBuild diff --git a/XMPCommon/Utilities/TAtomicTypes_Mac.h b/XMPCommon/Utilities/TAtomicTypes_Mac.h index 409b11f..2ab45e6 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Mac.h +++ b/XMPCommon/Utilities/TAtomicTypes_Mac.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if XMP_MacBuild || XMP_iOSBuild diff --git a/XMPCommon/Utilities/TAtomicTypes_Win.h b/XMPCommon/Utilities/TAtomicTypes_Win.h index 1bddd2c..3158e76 100644 --- a/XMPCommon/Utilities/TAtomicTypes_Win.h +++ b/XMPCommon/Utilities/TAtomicTypes_Win.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if XMP_WinBuild diff --git a/XMPCommon/Utilities/TSmartPointers_I.h b/XMPCommon/Utilities/TSmartPointers_I.h index 4b1e9d3..6c9f7c1 100644 --- a/XMPCommon/Utilities/TSmartPointers_I.h +++ b/XMPCommon/Utilities/TSmartPointers_I.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/Utilities/UTF8String.h b/XMPCommon/Utilities/UTF8String.h index ec73e70..fe6526b 100644 --- a/XMPCommon/Utilities/UTF8String.h +++ b/XMPCommon/Utilities/UTF8String.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string> diff --git a/XMPCommon/XMPCommonDefines_I.h b/XMPCommon/XMPCommonDefines_I.h index d344856..22039f1 100644 --- a/XMPCommon/XMPCommonDefines_I.h +++ b/XMPCommon/XMPCommonDefines_I.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines.h" diff --git a/XMPCommon/XMPCommonErrorCodes_I.h b/XMPCommon/XMPCommonErrorCodes_I.h index 691ed6b..40b2ae2 100644 --- a/XMPCommon/XMPCommonErrorCodes_I.h +++ b/XMPCommon/XMPCommonErrorCodes_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/XMPCommonFwdDeclarations_I.h b/XMPCommon/XMPCommonFwdDeclarations_I.h index 381b85c..4788953 100644 --- a/XMPCommon/XMPCommonFwdDeclarations_I.h +++ b/XMPCommon/XMPCommonFwdDeclarations_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/XMPCommon_I.h b/XMPCommon/XMPCommon_I.h index 1aa3fad..9649675 100644 --- a/XMPCommon/XMPCommon_I.h +++ b/XMPCommon/XMPCommon_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines_I.h" diff --git a/XMPCommon/source/AutoSharedLock.cpp b/XMPCommon/source/AutoSharedLock.cpp index 5f7ec91..37c7c75 100644 --- a/XMPCommon/source/AutoSharedLock.cpp +++ b/XMPCommon/source/AutoSharedLock.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Utilities/AutoSharedLock.h" diff --git a/XMPCommon/source/ConfigurableImpl.cpp b/XMPCommon/source/ConfigurableImpl.cpp index 0ef3a69..edc0ff3 100644 --- a/XMPCommon/source/ConfigurableImpl.cpp +++ b/XMPCommon/source/ConfigurableImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/ConfigurationManagerImpl.cpp b/XMPCommon/source/ConfigurationManagerImpl.cpp index 188e399..1febce1 100644 --- a/XMPCommon/source/ConfigurationManagerImpl.cpp +++ b/XMPCommon/source/ConfigurationManagerImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/DefaultErrorNotifierImpl.cpp b/XMPCommon/source/DefaultErrorNotifierImpl.cpp index 245f2d5..55218c4 100644 --- a/XMPCommon/source/DefaultErrorNotifierImpl.cpp +++ b/XMPCommon/source/DefaultErrorNotifierImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCommon/source/ErrorImpl.cpp b/XMPCommon/source/ErrorImpl.cpp index 804bef5..c6f18eb 100644 --- a/XMPCommon/source/ErrorImpl.cpp +++ b/XMPCommon/source/ErrorImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/ErrorNotifierWrapperImpl.cpp b/XMPCommon/source/ErrorNotifierWrapperImpl.cpp index 5847850..18767e4 100644 --- a/XMPCommon/source/ErrorNotifierWrapperImpl.cpp +++ b/XMPCommon/source/ErrorNotifierWrapperImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations_I.h" diff --git a/XMPCommon/source/IConfigurable_I.cpp b/XMPCommon/source/IConfigurable_I.cpp index 23f06c6..525a991 100644 --- a/XMPCommon/source/IConfigurable_I.cpp +++ b/XMPCommon/source/IConfigurable_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/BaseInterfaces/IConfigurable_I.h" diff --git a/XMPCommon/source/IConfigurationManager_I.cpp b/XMPCommon/source/IConfigurationManager_I.cpp index 98ea66d..9a9ebcd 100644 --- a/XMPCommon/source/IConfigurationManager_I.cpp +++ b/XMPCommon/source/IConfigurationManager_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IConfigurationManager_I.h" diff --git a/XMPCommon/source/IErrorNotifier_I.cpp b/XMPCommon/source/IErrorNotifier_I.cpp index e986307..53f77ec 100644 --- a/XMPCommon/source/IErrorNotifier_I.cpp +++ b/XMPCommon/source/IErrorNotifier_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IErrorNotifier_I.h" diff --git a/XMPCommon/source/IError_I.cpp b/XMPCommon/source/IError_I.cpp index 6f44edf..8c3cd41 100644 --- a/XMPCommon/source/IError_I.cpp +++ b/XMPCommon/source/IError_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IError_I.h" diff --git a/XMPCommon/source/IMemoryAllocator_I.cpp b/XMPCommon/source/IMemoryAllocator_I.cpp index 6dac79e..d37c155 100644 --- a/XMPCommon/source/IMemoryAllocator_I.cpp +++ b/XMPCommon/source/IMemoryAllocator_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IMemoryAllocator_I.h" diff --git a/XMPCommon/source/IUTF8StringComparator.cpp b/XMPCommon/source/IUTF8StringComparator.cpp index 8e83f61..d4398c8 100644 --- a/XMPCommon/source/IUTF8StringComparator.cpp +++ b/XMPCommon/source/IUTF8StringComparator.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Utilities/IUTF8StringComparator.h" diff --git a/XMPCommon/source/IUTF8String_I.cpp b/XMPCommon/source/IUTF8String_I.cpp index 8ef2e82..2a4e630 100644 --- a/XMPCommon/source/IUTF8String_I.cpp +++ b/XMPCommon/source/IUTF8String_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IUTF8String_I.h" diff --git a/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp b/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp index 8ffc33c..011749d 100644 --- a/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp +++ b/XMPCommon/source/MemoryAllocatorWrapperImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/MemoryManagedObject.cpp b/XMPCommon/source/MemoryManagedObject.cpp index 7f3d453..37a2835 100644 --- a/XMPCommon/source/MemoryManagedObject.cpp +++ b/XMPCommon/source/MemoryManagedObject.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCommon/source/SharedMutexImpl.cpp b/XMPCommon/source/SharedMutexImpl.cpp index 96a6979..508b678 100644 --- a/XMPCommon/source/SharedMutexImpl.cpp +++ b/XMPCommon/source/SharedMutexImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/SharedObjectImpl.cpp b/XMPCommon/source/SharedObjectImpl.cpp index 19262f4..ffb78b9 100644 --- a/XMPCommon/source/SharedObjectImpl.cpp +++ b/XMPCommon/source/SharedObjectImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/ThreadSafeImpl.cpp b/XMPCommon/source/ThreadSafeImpl.cpp index f760f63..bfaf480 100644 --- a/XMPCommon/source/ThreadSafeImpl.cpp +++ b/XMPCommon/source/ThreadSafeImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCommon/source/UTF8StringImpl.cpp b/XMPCommon/source/UTF8StringImpl.cpp index e36df2e..1425dd4 100644 --- a/XMPCommon/source/UTF8StringImpl.cpp +++ b/XMPCommon/source/UTF8StringImpl.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. // ================================================================================================= #include <algorithm> diff --git a/XMPCommon/source/XMPCommon.cpp b/XMPCommon/source/XMPCommon.cpp index c227ee3..87524d2 100644 --- a/XMPCommon/source/XMPCommon.cpp +++ b/XMPCommon/source/XMPCommon.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommon_I.h" diff --git a/XMPCore/ImplHeaders/ArrayNodeImpl.h b/XMPCore/ImplHeaders/ArrayNodeImpl.h index 226953e..9c99459 100644 --- a/XMPCore/ImplHeaders/ArrayNodeImpl.h +++ b/XMPCore/ImplHeaders/ArrayNodeImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h b/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h index eac03ba..cf66574 100644 --- a/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h +++ b/XMPCore/ImplHeaders/ClientDOMParserWrapperImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h b/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h index 44c7f1a..c03bfcd 100644 --- a/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h +++ b/XMPCore/ImplHeaders/ClientDOMSerializerWrapperImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/CompositeNodeImpl.h b/XMPCore/ImplHeaders/CompositeNodeImpl.h index 7e98288..4fbcd43 100644 --- a/XMPCore/ImplHeaders/CompositeNodeImpl.h +++ b/XMPCore/ImplHeaders/CompositeNodeImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h b/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h index 43c91f1..0fd0c9b 100644 --- a/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h +++ b/XMPCore/ImplHeaders/CoreConfigurationManagerImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h b/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h index d23737c..4759655 100644 --- a/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h +++ b/XMPCore/ImplHeaders/CoreObjectFactoryImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h b/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h index 8adf861..67c77fc 100644 --- a/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h +++ b/XMPCore/ImplHeaders/DOMImplementationRegistryImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/DOMParserImpl.h b/XMPCore/ImplHeaders/DOMParserImpl.h index a6e668f..e323ec8 100644 --- a/XMPCore/ImplHeaders/DOMParserImpl.h +++ b/XMPCore/ImplHeaders/DOMParserImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/DOMSerializerImpl.h b/XMPCore/ImplHeaders/DOMSerializerImpl.h index d8dfe3a..f332e16 100644 --- a/XMPCore/ImplHeaders/DOMSerializerImpl.h +++ b/XMPCore/ImplHeaders/DOMSerializerImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h b/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h index 88f50a5..5a486a6 100644 --- a/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h +++ b/XMPCore/ImplHeaders/MetadataConverterUtilsImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/MetadataImpl.h b/XMPCore/ImplHeaders/MetadataImpl.h index bfa73b4..6fcb650 100644 --- a/XMPCore/ImplHeaders/MetadataImpl.h +++ b/XMPCore/ImplHeaders/MetadataImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h b/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h index de6bfc9..a4893c8 100644 --- a/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h +++ b/XMPCore/ImplHeaders/NameSpacePrefixMapImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/NodeImpl.h b/XMPCore/ImplHeaders/NodeImpl.h index 7699fd1..018883e 100644 --- a/XMPCore/ImplHeaders/NodeImpl.h +++ b/XMPCore/ImplHeaders/NodeImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/PathImpl.h b/XMPCore/ImplHeaders/PathImpl.h index efe58a2..e643116 100644 --- a/XMPCore/ImplHeaders/PathImpl.h +++ b/XMPCore/ImplHeaders/PathImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/PathSegmentImpl.h b/XMPCore/ImplHeaders/PathSegmentImpl.h index f2fae98..1a81187 100644 --- a/XMPCore/ImplHeaders/PathSegmentImpl.h +++ b/XMPCore/ImplHeaders/PathSegmentImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/RDFDOMParserImpl.h b/XMPCore/ImplHeaders/RDFDOMParserImpl.h index 1f7b829..cdcc7e7 100644 --- a/XMPCore/ImplHeaders/RDFDOMParserImpl.h +++ b/XMPCore/ImplHeaders/RDFDOMParserImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h b/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h index 2d89a5a..d0e701a 100644 --- a/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h +++ b/XMPCore/ImplHeaders/RDFDOMSerializerImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/SimpleNodeImpl.h b/XMPCore/ImplHeaders/SimpleNodeImpl.h index a720031..4fa4749 100644 --- a/XMPCore/ImplHeaders/SimpleNodeImpl.h +++ b/XMPCore/ImplHeaders/SimpleNodeImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/ImplHeaders/StructureNodeImpl.h b/XMPCore/ImplHeaders/StructureNodeImpl.h index 0e27819..7efff1b 100644 --- a/XMPCore/ImplHeaders/StructureNodeImpl.h +++ b/XMPCore/ImplHeaders/StructureNodeImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/ImplHeaders/TNodeIteratorImpl.h b/XMPCore/ImplHeaders/TNodeIteratorImpl.h index ce9f400..58deaae 100644 --- a/XMPCore/ImplHeaders/TNodeIteratorImpl.h +++ b/XMPCore/ImplHeaders/TNodeIteratorImpl.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if !(IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED) diff --git a/XMPCore/Interfaces/IArrayNode_I.h b/XMPCore/Interfaces/IArrayNode_I.h index fd846a3..9504e5d 100644 --- a/XMPCore/Interfaces/IArrayNode_I.h +++ b/XMPCore/Interfaces/IArrayNode_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/ICompositeNode_I.h b/XMPCore/Interfaces/ICompositeNode_I.h index 7d84d9a..d2fa9f7 100644 --- a/XMPCore/Interfaces/ICompositeNode_I.h +++ b/XMPCore/Interfaces/ICompositeNode_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/ICoreConfigurationManager_I.h b/XMPCore/Interfaces/ICoreConfigurationManager_I.h index 30ab5e4..b1a3c11 100644 --- a/XMPCore/Interfaces/ICoreConfigurationManager_I.h +++ b/XMPCore/Interfaces/ICoreConfigurationManager_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/ICoreObjectFactory_I.h b/XMPCore/Interfaces/ICoreObjectFactory_I.h index c495f80..7ac4dcb 100644 --- a/XMPCore/Interfaces/ICoreObjectFactory_I.h +++ b/XMPCore/Interfaces/ICoreObjectFactory_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IDOMImplementationRegistry_I.h b/XMPCore/Interfaces/IDOMImplementationRegistry_I.h index 5678eed..3ea5320 100644 --- a/XMPCore/Interfaces/IDOMImplementationRegistry_I.h +++ b/XMPCore/Interfaces/IDOMImplementationRegistry_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IDOMParser_I.h b/XMPCore/Interfaces/IDOMParser_I.h index d43a379..41d2b45 100644 --- a/XMPCore/Interfaces/IDOMParser_I.h +++ b/XMPCore/Interfaces/IDOMParser_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IDOMSerializer_I.h b/XMPCore/Interfaces/IDOMSerializer_I.h index f4be443..a991e12 100644 --- a/XMPCore/Interfaces/IDOMSerializer_I.h +++ b/XMPCore/Interfaces/IDOMSerializer_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IMetadataConverterUtils_I.h b/XMPCore/Interfaces/IMetadataConverterUtils_I.h index 14a34c0..79dd227 100644 --- a/XMPCore/Interfaces/IMetadataConverterUtils_I.h +++ b/XMPCore/Interfaces/IMetadataConverterUtils_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IMetadata_I.h b/XMPCore/Interfaces/IMetadata_I.h index 74e44fb..0f4a327 100644 --- a/XMPCore/Interfaces/IMetadata_I.h +++ b/XMPCore/Interfaces/IMetadata_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/INameSpacePrefixMap_I.h b/XMPCore/Interfaces/INameSpacePrefixMap_I.h index 6201aad..9ac2296 100644 --- a/XMPCore/Interfaces/INameSpacePrefixMap_I.h +++ b/XMPCore/Interfaces/INameSpacePrefixMap_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/INodeIterator_I.h b/XMPCore/Interfaces/INodeIterator_I.h index 20b69c4..3d227e3 100644 --- a/XMPCore/Interfaces/INodeIterator_I.h +++ b/XMPCore/Interfaces/INodeIterator_I.h @@ -8,9 +8,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/INode_I.h b/XMPCore/Interfaces/INode_I.h index bf0bfd1..c215f2a 100644 --- a/XMPCore/Interfaces/INode_I.h +++ b/XMPCore/Interfaces/INode_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IPathSegment_I.h b/XMPCore/Interfaces/IPathSegment_I.h index b0e1f25..bb6ccd9 100644 --- a/XMPCore/Interfaces/IPathSegment_I.h +++ b/XMPCore/Interfaces/IPathSegment_I.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IPath_I.h b/XMPCore/Interfaces/IPath_I.h index 9c284f4..24cf86f 100644 --- a/XMPCore/Interfaces/IPath_I.h +++ b/XMPCore/Interfaces/IPath_I.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/ISimpleNode_I.h b/XMPCore/Interfaces/ISimpleNode_I.h index b699d73..d4e8cab 100644 --- a/XMPCore/Interfaces/ISimpleNode_I.h +++ b/XMPCore/Interfaces/ISimpleNode_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IStructureNode_I.h b/XMPCore/Interfaces/IStructureNode_I.h index 93dfd02..76a4c2f 100644 --- a/XMPCore/Interfaces/IStructureNode_I.h +++ b/XMPCore/Interfaces/IStructureNode_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/Interfaces/IXMPLanguageAlternative_I.h b/XMPCore/Interfaces/IXMPLanguageAlternative_I.h index 66aa23f..38130c7 100644 --- a/XMPCore/Interfaces/IXMPLanguageAlternative_I.h +++ b/XMPCore/Interfaces/IXMPLanguageAlternative_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCore_Defines.h" diff --git a/XMPCore/XMPCoreDefines_I.h b/XMPCore/XMPCoreDefines_I.h index 3a29ba5..1e48490 100644 --- a/XMPCore/XMPCoreDefines_I.h +++ b/XMPCore/XMPCoreDefines_I.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/XMPCore/XMPCoreFwdDeclarations_I.h b/XMPCore/XMPCoreFwdDeclarations_I.h index 59635e5..1c1c442 100644 --- a/XMPCore/XMPCoreFwdDeclarations_I.h +++ b/XMPCore/XMPCoreFwdDeclarations_I.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreDefines_I.h" diff --git a/XMPCore/source/ArrayNodeImpl.cpp b/XMPCore/source/ArrayNodeImpl.cpp index f8bf938..30895c0 100644 --- a/XMPCore/source/ArrayNodeImpl.cpp +++ b/XMPCore/source/ArrayNodeImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/ClientDOMParserWrapperImpl.cpp b/XMPCore/source/ClientDOMParserWrapperImpl.cpp index ab5c46a..d2cf43c 100644 --- a/XMPCore/source/ClientDOMParserWrapperImpl.cpp +++ b/XMPCore/source/ClientDOMParserWrapperImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore_Int { diff --git a/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp b/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp index 38da828..4c30633 100644 --- a/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp +++ b/XMPCore/source/ClientDOMSerializerWrapperImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore_Int { diff --git a/XMPCore/source/CompositeNodeImpl.cpp b/XMPCore/source/CompositeNodeImpl.cpp index 6d2ab91..b017757 100644 --- a/XMPCore/source/CompositeNodeImpl.cpp +++ b/XMPCore/source/CompositeNodeImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/CoreConfigurationManagerImpl.cpp b/XMPCore/source/CoreConfigurationManagerImpl.cpp index 59be746..59f35bf 100644 --- a/XMPCore/source/CoreConfigurationManagerImpl.cpp +++ b/XMPCore/source/CoreConfigurationManagerImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/CoreObjectFactoryImpl.cpp b/XMPCore/source/CoreObjectFactoryImpl.cpp index a6e4a65..8d9cbfa 100644 --- a/XMPCore/source/CoreObjectFactoryImpl.cpp +++ b/XMPCore/source/CoreObjectFactoryImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/DOMImplementationRegistryImpl.cpp b/XMPCore/source/DOMImplementationRegistryImpl.cpp index 8c562d7..878bbcf 100644 --- a/XMPCore/source/DOMImplementationRegistryImpl.cpp +++ b/XMPCore/source/DOMImplementationRegistryImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/DOMParserImpl.cpp b/XMPCore/source/DOMParserImpl.cpp index 0c0faaf..25e845f 100644 --- a/XMPCore/source/DOMParserImpl.cpp +++ b/XMPCore/source/DOMParserImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/DOMSerializerImpl.cpp b/XMPCore/source/DOMSerializerImpl.cpp index 6a5c4c9..fa11f69 100644 --- a/XMPCore/source/DOMSerializerImpl.cpp +++ b/XMPCore/source/DOMSerializerImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/ExpatAdapter.cpp b/XMPCore/source/ExpatAdapter.cpp index 0c8d085..4e86bd0 100644 --- a/XMPCore/source/ExpatAdapter.cpp +++ b/XMPCore/source/ExpatAdapter.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. // ================================================================================================= #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..5ba64b3 100644 --- a/XMPCore/source/IArrayNode_I.cpp +++ b/XMPCore/source/IArrayNode_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/ICompositeNode_I.cpp b/XMPCore/source/ICompositeNode_I.cpp index 5a6f62b..8a03c03 100644 --- a/XMPCore/source/ICompositeNode_I.cpp +++ b/XMPCore/source/ICompositeNode_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/ICoreConfigurationManager_I.cpp b/XMPCore/source/ICoreConfigurationManager_I.cpp index ace4cb0..5c194fc 100644 --- a/XMPCore/source/ICoreConfigurationManager_I.cpp +++ b/XMPCore/source/ICoreConfigurationManager_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/ICoreObjectFactory_I.cpp b/XMPCore/source/ICoreObjectFactory_I.cpp index a6483f8..c0e0c7c 100644 --- a/XMPCore/source/ICoreObjectFactory_I.cpp +++ b/XMPCore/source/ICoreObjectFactory_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/IDOMImplementationRegistry_I.cpp b/XMPCore/source/IDOMImplementationRegistry_I.cpp index 688eb9e..3608433 100644 --- a/XMPCore/source/IDOMImplementationRegistry_I.cpp +++ b/XMPCore/source/IDOMImplementationRegistry_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/IDOMParser_I.cpp b/XMPCore/source/IDOMParser_I.cpp index 85d7c6d..1eaeb56 100644 --- a/XMPCore/source/IDOMParser_I.cpp +++ b/XMPCore/source/IDOMParser_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/IDOMSerializer_I.cpp b/XMPCore/source/IDOMSerializer_I.cpp index a1fa0f1..187b948 100644 --- a/XMPCore/source/IDOMSerializer_I.cpp +++ b/XMPCore/source/IDOMSerializer_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/IMetadataConverterUtils_I.cpp b/XMPCore/source/IMetadataConverterUtils_I.cpp index b53a6b8..15cddc2 100644 --- a/XMPCore/source/IMetadataConverterUtils_I.cpp +++ b/XMPCore/source/IMetadataConverterUtils_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/IMetadataConverterUtils_I.h" diff --git a/XMPCore/source/IMetadata_I.cpp b/XMPCore/source/IMetadata_I.cpp index 29e3e06..0509d52 100644 --- a/XMPCore/source/IMetadata_I.cpp +++ b/XMPCore/source/IMetadata_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/INameSpacePrefixMap_I.cpp b/XMPCore/source/INameSpacePrefixMap_I.cpp index ce24246..3fff888 100644 --- a/XMPCore/source/INameSpacePrefixMap_I.cpp +++ b/XMPCore/source/INameSpacePrefixMap_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/INodeIterator_I.cpp b/XMPCore/source/INodeIterator_I.cpp index a8170cc..c4452b6 100644 --- a/XMPCore/source/INodeIterator_I.cpp +++ b/XMPCore/source/INodeIterator_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/INode_I.cpp b/XMPCore/source/INode_I.cpp index b933aa0..59f1879 100644 --- a/XMPCore/source/INode_I.cpp +++ b/XMPCore/source/INode_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/IPathSegment_I.cpp b/XMPCore/source/IPathSegment_I.cpp index 92d7138..cf82a97 100644 --- a/XMPCore/source/IPathSegment_I.cpp +++ b/XMPCore/source/IPathSegment_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/IPath_I.cpp b/XMPCore/source/IPath_I.cpp index 6906daf..111dd9c 100644 --- a/XMPCore/source/IPath_I.cpp +++ b/XMPCore/source/IPath_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/ISimpleNode_I.cpp b/XMPCore/source/ISimpleNode_I.cpp index 88d6f95..7332f7b 100644 --- a/XMPCore/source/ISimpleNode_I.cpp +++ b/XMPCore/source/ISimpleNode_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/IStructureNode_I.cpp b/XMPCore/source/IStructureNode_I.cpp index 12fcb4c..9d36154 100644 --- a/XMPCore/source/IStructureNode_I.cpp +++ b/XMPCore/source/IStructureNode_I.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/MetadataConverterUtilsImpl.cpp b/XMPCore/source/MetadataConverterUtilsImpl.cpp index 88eca9e..d5a785c 100644 --- a/XMPCore/source/MetadataConverterUtilsImpl.cpp +++ b/XMPCore/source/MetadataConverterUtilsImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <sstream> diff --git a/XMPCore/source/MetadataImpl.cpp b/XMPCore/source/MetadataImpl.cpp index 61f0c61..24cb44c 100644 --- a/XMPCore/source/MetadataImpl.cpp +++ b/XMPCore/source/MetadataImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/NameSpacePrefixMapImpl.cpp b/XMPCore/source/NameSpacePrefixMapImpl.cpp index fc68d12..8798bca 100644 --- a/XMPCore/source/NameSpacePrefixMapImpl.cpp +++ b/XMPCore/source/NameSpacePrefixMapImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/NodeImpl.cpp b/XMPCore/source/NodeImpl.cpp index be93781..4b07bac 100644 --- a/XMPCore/source/NodeImpl.cpp +++ b/XMPCore/source/NodeImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/ParseRDF.cpp b/XMPCore/source/ParseRDF.cpp index e04a342..61a393f 100644 --- a/XMPCore/source/ParseRDF.cpp +++ b/XMPCore/source/ParseRDF.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. // ================================================================================================= #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..a28addb 100644 --- a/XMPCore/source/PathImpl.cpp +++ b/XMPCore/source/PathImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/PathSegmentImpl.cpp b/XMPCore/source/PathSegmentImpl.cpp index e5eadfd..ec87160 100644 --- a/XMPCore/source/PathSegmentImpl.cpp +++ b/XMPCore/source/PathSegmentImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/RDFDOMParserImpl.cpp b/XMPCore/source/RDFDOMParserImpl.cpp index 6b5f46e..df6161c 100644 --- a/XMPCore/source/RDFDOMParserImpl.cpp +++ b/XMPCore/source/RDFDOMParserImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/RDFDOMSerializerImpl.cpp b/XMPCore/source/RDFDOMSerializerImpl.cpp index 5db97ce..5f16824 100644 --- a/XMPCore/source/RDFDOMSerializerImpl.cpp +++ b/XMPCore/source/RDFDOMSerializerImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/SimpleNodeImpl.cpp b/XMPCore/source/SimpleNodeImpl.cpp index 7fc1f21..57d866c 100644 --- a/XMPCore/source/SimpleNodeImpl.cpp +++ b/XMPCore/source/SimpleNodeImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/StructureNodeImpl.cpp b/XMPCore/source/StructureNodeImpl.cpp index 5474e4a..3c91ced 100644 --- a/XMPCore/source/StructureNodeImpl.cpp +++ b/XMPCore/source/StructureNodeImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #define IMPLEMENTATION_HEADERS_CAN_BE_INCLUDED 1 diff --git a/XMPCore/source/WXMPIterator.cpp b/XMPCore/source/WXMPIterator.cpp index 4770f16..e39f408 100644 --- a/XMPCore/source/WXMPIterator.cpp +++ b/XMPCore/source/WXMPIterator.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. // ================================================================================================= #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..79bbb5d 100644 --- a/XMPCore/source/WXMPMeta.cpp +++ b/XMPCore/source/WXMPMeta.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. // ================================================================================================= #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..267a3cb 100644 --- a/XMPCore/source/WXMPUtils.cpp +++ b/XMPCore/source/WXMPUtils.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. // ================================================================================================= // *** Should change "type * inParam" to "type & inParam" diff --git a/XMPCore/source/XMPCore_Impl.cpp b/XMPCore/source/XMPCore_Impl.cpp index 485d41d..20f446c 100644 --- a/XMPCore/source/XMPCore_Impl.cpp +++ b/XMPCore/source/XMPCore_Impl.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. // ================================================================================================= #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..860cfc4 100644 --- a/XMPCore/source/XMPCore_Impl.hpp +++ b/XMPCore/source/XMPCore_Impl.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! diff --git a/XMPCore/source/XMPIterator.cpp b/XMPCore/source/XMPIterator.cpp index 52febdb..f01e4b4 100644 --- a/XMPCore/source/XMPIterator.cpp +++ b/XMPCore/source/XMPIterator.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. // ================================================================================================= #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..de68667 100644 --- a/XMPCore/source/XMPIterator.hpp +++ b/XMPCore/source/XMPIterator.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/XMPCore/source/XMPIterator2.cpp b/XMPCore/source/XMPIterator2.cpp index 2ea583b..1094365 100644 --- a/XMPCore/source/XMPIterator2.cpp +++ b/XMPCore/source/XMPIterator2.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. // ================================================================================================= diff --git a/XMPCore/source/XMPIterator2.hpp b/XMPCore/source/XMPIterator2.hpp index 92d73c3..616da55 100644 --- a/XMPCore/source/XMPIterator2.hpp +++ b/XMPCore/source/XMPIterator2.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPCore/source/XMPMeta-GetSet.cpp b/XMPCore/source/XMPMeta-GetSet.cpp index a73eab1..52a5898 100644 --- a/XMPCore/source/XMPMeta-GetSet.cpp +++ b/XMPCore/source/XMPMeta-GetSet.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-Parse.cpp b/XMPCore/source/XMPMeta-Parse.cpp index 52b4618..7f5a667 100644 --- a/XMPCore/source/XMPMeta-Parse.cpp +++ b/XMPCore/source/XMPMeta-Parse.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-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..215b9aa 100644 --- a/XMPCore/source/XMPMeta.cpp +++ b/XMPCore/source/XMPMeta.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.hpp b/XMPCore/source/XMPMeta.hpp index 48c9c91..48f5c54 100644 --- a/XMPCore/source/XMPMeta.hpp +++ b/XMPCore/source/XMPMeta.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/XMPCore/source/XMPMeta2-GetSet.cpp b/XMPCore/source/XMPMeta2-GetSet.cpp index 797e0ce..299cfad 100644 --- a/XMPCore/source/XMPMeta2-GetSet.cpp +++ b/XMPCore/source/XMPMeta2-GetSet.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/XMPUtils-FileInfo.cpp b/XMPCore/source/XMPUtils-FileInfo.cpp index a2a9f99..dad0e6d 100644 --- a/XMPCore/source/XMPUtils-FileInfo.cpp +++ b/XMPCore/source/XMPUtils-FileInfo.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. // ================================================================================================= #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..6a4b894 100644 --- a/XMPCore/source/XMPUtils.cpp +++ b/XMPCore/source/XMPUtils.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. // ================================================================================================= #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..ee7962f 100644 --- a/XMPCore/source/XMPUtils.hpp +++ b/XMPCore/source/XMPUtils.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/XMPCore/source/XMPUtils2.cpp b/XMPCore/source/XMPUtils2.cpp index 96598f3..a03c81a 100644 --- a/XMPCore/source/XMPUtils2.cpp +++ b/XMPCore/source/XMPUtils2.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include! diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp index df78092..5e14abc 100644 --- a/XMPFiles/source/FileHandlers/AIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AIFF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/AIFF_Handler.hpp b/XMPFiles/source/FileHandlers/AIFF_Handler.hpp index 86975c7..330303f 100644 --- a/XMPFiles/source/FileHandlers/AIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/AIFF_Handler.hpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __AIFF_Handler_hpp__ diff --git a/XMPFiles/source/FileHandlers/ASF_Handler.cpp b/XMPFiles/source/FileHandlers/ASF_Handler.cpp index cc659ae..ebc52d5 100644 --- a/XMPFiles/source/FileHandlers/ASF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/ASF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/ASF_Handler.hpp b/XMPFiles/source/FileHandlers/ASF_Handler.hpp index c72a00b..d8826f2 100644 --- a/XMPFiles/source/FileHandlers/ASF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/ASF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/XMPFiles_Impl.hpp" diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp index 37712e7..58b4b1f 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp b/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp index cc66340..6e9ee0e 100644 --- a/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp +++ b/XMPFiles/source/FileHandlers/AVCHD_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/Basic_Handler.cpp b/XMPFiles/source/FileHandlers/Basic_Handler.cpp index f5008c3..dd1a12d 100644 --- a/XMPFiles/source/FileHandlers/Basic_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Basic_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Basic_Handler.hpp b/XMPFiles/source/FileHandlers/Basic_Handler.hpp index c9fbe05..ecd9ea0 100644 --- a/XMPFiles/source/FileHandlers/Basic_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Basic_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.cpp b/XMPFiles/source/FileHandlers/FLV_Handler.cpp index 8581df4..9f748ab 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/FLV_Handler.hpp b/XMPFiles/source/FileHandlers/FLV_Handler.hpp index e0c11d2..0687627 100644 --- a/XMPFiles/source/FileHandlers/FLV_Handler.hpp +++ b/XMPFiles/source/FileHandlers/FLV_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.cpp b/XMPFiles/source/FileHandlers/GIF_Handler.cpp index 14931b5..64ecbe2 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of GIF file metadata, according to GIF89a Specification. // https://www.w3.org/Graphics/GIF/spec-gif89a.txt diff --git a/XMPFiles/source/FileHandlers/GIF_Handler.hpp b/XMPFiles/source/FileHandlers/GIF_Handler.hpp index 0be49d0..4e11ab4 100644 --- a/XMPFiles/source/FileHandlers/GIF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/GIF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of GIF file metadata, according to GIF89a Specification. // https://www.w3.org/Graphics/GIF/spec-gif89a.txt diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp index b0edb47..90cb4c9 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.cpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/InDesign_Handler.hpp b/XMPFiles/source/FileHandlers/InDesign_Handler.hpp index addcece..e91a600 100644 --- a/XMPFiles/source/FileHandlers/InDesign_Handler.hpp +++ b/XMPFiles/source/FileHandlers/InDesign_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp index ed8a4f4..9012ecb 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/JPEG_Handler.hpp b/XMPFiles/source/FileHandlers/JPEG_Handler.hpp index fe58b5c..7c0e513 100644 --- a/XMPFiles/source/FileHandlers/JPEG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/JPEG_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.cpp b/XMPFiles/source/FileHandlers/MP3_Handler.cpp index aa80f1c..6c942a7 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.hpp b/XMPFiles/source/FileHandlers/MP3_Handler.hpp index e2e7e07..fc37eec 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp index 66545ef..1de5a59 100644 --- a/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #if XMP_WinBuild diff --git a/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp b/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp index 73da950..231f625 100644 --- a/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MPEG2_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp index b7fe357..ca9d935 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. @@ -2107,46 +2105,48 @@ void MPEG4_MetaHandler::ProcessXMP() // Import the non-XMP items. Do the imports in reverse priority order, last import wins! - MOOV_Manager::BoxInfo mvhdInfo; - MOOV_Manager::BoxRef mvhdRef = this->moovMgr.GetBox ( "moov/mvhd", &mvhdInfo ); - bool mvhdFound = ((mvhdRef != 0) && (mvhdInfo.contentSize != 0)); + if ( !xmpOnly ) { + MOOV_Manager::BoxInfo mvhdInfo; + MOOV_Manager::BoxRef mvhdRef = this->moovMgr.GetBox ( "moov/mvhd", &mvhdInfo ); + bool mvhdFound = ((mvhdRef != 0) && (mvhdInfo.contentSize != 0)); + + MOOV_Manager::BoxInfo udtaInfo; + MOOV_Manager::BoxRef udtaRef = this->moovMgr.GetBox ( "moov/udta", &udtaInfo ); + std::vector<MOOV_Manager::BoxInfo> cprtBoxes; + if ( udtaRef != 0 ) { + for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) { + MOOV_Manager::BoxInfo currInfo; + MOOV_Manager::BoxRef currRef = this->moovMgr.GetNthChild ( udtaRef, i, &currInfo ); + if ( currRef == 0 ) break; // Sanity check, should not happen. + if ( currInfo.boxType != ISOMedia::k_cprt ) continue; + cprtBoxes.push_back ( currInfo ); + } + } + bool cprtFound = (! cprtBoxes.empty()); - MOOV_Manager::BoxInfo udtaInfo; - MOOV_Manager::BoxRef udtaRef = this->moovMgr.GetBox ( "moov/udta", &udtaInfo ); - std::vector<MOOV_Manager::BoxInfo> cprtBoxes; - if ( udtaRef != 0 ) { - for ( XMP_Uns32 i = 0; i < udtaInfo.childCount; ++i ) { - MOOV_Manager::BoxInfo currInfo; - MOOV_Manager::BoxRef currRef = this->moovMgr.GetNthChild ( udtaRef, i, &currInfo ); - if ( currRef == 0 ) break; // Sanity check, should not happen. - if ( currInfo.boxType != ISOMedia::k_cprt ) continue; - cprtBoxes.push_back ( currInfo ); - } - } - bool cprtFound = (! cprtBoxes.empty()); - - bool tradQTFound = this->tradQTMgr.ParseCachedBoxes ( this->moovMgr ); + bool tradQTFound = this->tradQTMgr.ParseCachedBoxes ( this->moovMgr ); - bool tmcdFound = this->ParseTimecodeTrack(); + bool tmcdFound = this->ParseTimecodeTrack(); - if ( this->fileMode == MOOV_Manager::kFileIsNormalISO ) { + if ( this->fileMode == MOOV_Manager::kFileIsNormalISO ) { - if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); - if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); - if ( tmcdFound ) this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); - } else { // This is a QuickTime file, either traditional or modern. + if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); + if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); + if ( tmcdFound ) this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); + } else { // This is a QuickTime file, either traditional or modern. - if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); - if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); - if ( tmcdFound | tradQTFound ) { - // Some of the timecode items are in the .../udta/... set but handled by ImportTimecodeItems. - this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); - } + if ( mvhdFound ) this->containsXMP |= ImportMVHDItems ( mvhdInfo, &this->xmpObj ); + if ( cprtFound ) this->containsXMP |= ImportISOCopyrights ( cprtBoxes, &this->xmpObj ); + if ( tmcdFound | tradQTFound ) { + // Some of the timecode items are in the .../udta/... set but handled by ImportTimecodeItems. + this->containsXMP |= ImportTimecodeItems ( this->tmcdInfo, this->tradQTMgr, &this->xmpObj ); + } - this->containsXMP |= ImportCr8rItems ( this->moovMgr, &this->xmpObj ); + this->containsXMP |= ImportCr8rItems ( this->moovMgr, &this->xmpObj ); + } } - + } // MPEG4_MetaHandler::ProcessXMP // ================================================================================================= diff --git a/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp index a55aa1e..913597f 100644 --- a/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp +++ b/XMPFiles/source/FileHandlers/MPEG4_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/XMPFiles_Impl.hpp" diff --git a/XMPFiles/source/FileHandlers/P2_Handler.cpp b/XMPFiles/source/FileHandlers/P2_Handler.cpp index d4e6190..580fc5e 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.cpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/P2_Handler.hpp b/XMPFiles/source/FileHandlers/P2_Handler.hpp index ba07325..9a32527 100644 --- a/XMPFiles/source/FileHandlers/P2_Handler.hpp +++ b/XMPFiles/source/FileHandlers/P2_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/PNG_Handler.cpp b/XMPFiles/source/FileHandlers/PNG_Handler.cpp index 78544e1..ac47831 100644 --- a/XMPFiles/source/FileHandlers/PNG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PNG_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/PNG_Handler.hpp b/XMPFiles/source/FileHandlers/PNG_Handler.hpp index b43f398..30622f1 100644 --- a/XMPFiles/source/FileHandlers/PNG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PNG_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.cpp b/XMPFiles/source/FileHandlers/PSD_Handler.cpp index e17a65a..cdca139 100644 --- a/XMPFiles/source/FileHandlers/PSD_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PSD_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/PSD_Handler.hpp b/XMPFiles/source/FileHandlers/PSD_Handler.hpp index cf90fd8..1d43cba 100644 --- a/XMPFiles/source/FileHandlers/PSD_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PSD_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/TIFF_Support.hpp" diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp index 32b82ba..bc55dfa 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.cpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/PostScript_Handler.hpp b/XMPFiles/source/FileHandlers/PostScript_Handler.hpp index ca8a93e..596313f 100644 --- a/XMPFiles/source/FileHandlers/PostScript_Handler.hpp +++ b/XMPFiles/source/FileHandlers/PostScript_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp index 4c075b1..e21c9b6 100644 --- a/XMPFiles/source/FileHandlers/RIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/RIFF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/RIFF_Handler.hpp b/XMPFiles/source/FileHandlers/RIFF_Handler.hpp index b067855..7a1fc5f 100644 --- a/XMPFiles/source/FileHandlers/RIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/RIFF_Handler.hpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __RIFF_Handler_hpp__ #define __RIFF_Handler_hpp__ 1 diff --git a/XMPFiles/source/FileHandlers/SVG_Handler.cpp b/XMPFiles/source/FileHandlers/SVG_Handler.cpp index b090823..029c8ad 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" @@ -390,6 +388,8 @@ bool SVG_CheckFormat( XMP_FileFormat format, if ( svgChecker == 0 ) return false; + svgChecker->SetErrorCallback(&parent->errorCallback); + bool isSVG = false; bool isCompressed = false; diff --git a/XMPFiles/source/FileHandlers/SVG_Handler.hpp b/XMPFiles/source/FileHandlers/SVG_Handler.hpp index f5681b0..f42857a 100644 --- a/XMPFiles/source/FileHandlers/SVG_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SVG_Handler.hpp @@ -7,13 +7,11 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" -// Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, +// Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, // Institut National de Recherche en Informatique et en Automatique, Keio University). // All Rights Reserved . http://www.w3.org/Consortium/Legal // diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.cpp b/XMPFiles/source/FileHandlers/SWF_Handler.cpp index 8ca52de..711b907 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/SWF_Handler.hpp b/XMPFiles/source/FileHandlers/SWF_Handler.hpp index 0feb43f..9efb7b0 100644 --- a/XMPFiles/source/FileHandlers/SWF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SWF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Scanner_Handler.cpp b/XMPFiles/source/FileHandlers/Scanner_Handler.cpp index cb34ef1..a3b68cc 100644 --- a/XMPFiles/source/FileHandlers/Scanner_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Scanner_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Scanner_Handler.hpp b/XMPFiles/source/FileHandlers/Scanner_Handler.hpp index aea311f..2bdae43 100644 --- a/XMPFiles/source/FileHandlers/Scanner_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Scanner_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FileHandlers/Trivial_Handler.hpp" diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp index 3e0faf8..e4a7162 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp b/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp index 73378b9..6efbc73 100644 --- a/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp +++ b/XMPFiles/source/FileHandlers/SonyHDV_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp index bea3a8c..0960b07 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/TIFF_Handler.hpp b/XMPFiles/source/FileHandlers/TIFF_Handler.hpp index c310dd5..4326427 100644 --- a/XMPFiles/source/FileHandlers/TIFF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/TIFF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/TIFF_Support.hpp" diff --git a/XMPFiles/source/FileHandlers/Trivial_Handler.cpp b/XMPFiles/source/FileHandlers/Trivial_Handler.cpp index 19efa09..3507beb 100644 --- a/XMPFiles/source/FileHandlers/Trivial_Handler.cpp +++ b/XMPFiles/source/FileHandlers/Trivial_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/Trivial_Handler.hpp b/XMPFiles/source/FileHandlers/Trivial_Handler.hpp index 321034a..41a50cc 100644 --- a/XMPFiles/source/FileHandlers/Trivial_Handler.hpp +++ b/XMPFiles/source/FileHandlers/Trivial_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/XMPFiles_Impl.hpp" diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.cpp b/XMPFiles/source/FileHandlers/UCF_Handler.cpp index ee03e24..561c5b3 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.cpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // =============================================================================================== #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/UCF_Handler.hpp b/XMPFiles/source/FileHandlers/UCF_Handler.hpp index 0177112..f20a9b2 100644 --- a/XMPFiles/source/FileHandlers/UCF_Handler.hpp +++ b/XMPFiles/source/FileHandlers/UCF_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp index 9a55eb3..d3fb97c 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.cpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/WAVE_Handler.hpp b/XMPFiles/source/FileHandlers/WAVE_Handler.hpp index 7c35ec6..d516acb 100644 --- a/XMPFiles/source/FileHandlers/WAVE_Handler.hpp +++ b/XMPFiles/source/FileHandlers/WAVE_Handler.hpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __WAVE_Handler_hpp__ diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp index 25434c0..430ddf7 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp index e5eb716..e60f98b 100644 --- a/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMEX_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp index eb085ff..a70d76a 100644 --- a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp index cacf559..1d20393 100644 --- a/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMFAM_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp index 9e60e74..08aceb9 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp index 957e965..4b7872d 100644 --- a/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAMSAM_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp index 9a39e4b..df26ec9 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp index 3bbfd0c..d0b4436 100644 --- a/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp +++ b/XMPFiles/source/FileHandlers/XDCAM_Handler.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp index 3851ad8..4e7b864 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h index 03a65c0..3476ef9 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFBehavior.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _AIFFBEHAVIOR_h_ diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp index f1c54e2..55f29f5 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h index bc6c227..e284e4d 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _AIFFMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp index 57ddb47..3f95a16 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h index f4a65e7..9866853 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _AIFFReconcile_h_ diff --git a/XMPFiles/source/FormatSupport/ASF_Support.cpp b/XMPFiles/source/FormatSupport/ASF_Support.cpp index a6a0fef..bfde554 100644 --- a/XMPFiles/source/FormatSupport/ASF_Support.cpp +++ b/XMPFiles/source/FormatSupport/ASF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. @@ -159,6 +157,11 @@ bool ASF_Support::ReadHeaderObject ( XMP_IO* fileRef, ObjectState& inOutObjectSt fileRef->Seek ( pos, kXMP_SeekFromStart ); objectBase.size = GetUns64LE ( &objectBase.size ); + if (XMP_Uns32(objectBase.size) <= 0) /* as ASF_ObjectBase has size in XMP_Uns64 , XMP_Uns32 would give 0 for very large files exceeding UINT32_MAX */ + { + XMP_Throw("Failure reading ASF header object", kXMPErr_InternalFailure); + } + if ( IsEqualGUID ( ASF_File_Properties_Object, objectBase.guid) && (objectBase.size >= 104 ) ) { buffer.clear(); diff --git a/XMPFiles/source/FormatSupport/ASF_Support.hpp b/XMPFiles/source/FormatSupport/ASF_Support.hpp index 1bed9b5..76e3d1f 100644 --- a/XMPFiles/source/FormatSupport/ASF_Support.hpp +++ b/XMPFiles/source/FormatSupport/ASF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ID3_Support.cpp b/XMPFiles/source/FormatSupport/ID3_Support.cpp index 6ada5a3..fe632dd 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.cpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ID3_Support.hpp b/XMPFiles/source/FormatSupport/ID3_Support.hpp index cff626e..f9d8466 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.hpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp index 6801248..b96e409 100644 --- a/XMPFiles/source/FormatSupport/IFF/Chunk.cpp +++ b/XMPFiles/source/FormatSupport/IFF/Chunk.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IFF/Chunk.h b/XMPFiles/source/FormatSupport/IFF/Chunk.h index 61bc9be..3f6efd8 100644 --- a/XMPFiles/source/FormatSupport/IFF/Chunk.h +++ b/XMPFiles/source/FormatSupport/IFF/Chunk.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _Chunk_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp index af924cf..0cf7faf 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp +++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkController.h b/XMPFiles/source/FormatSupport/IFF/ChunkController.h index f14ef01..5ac3bfc 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkController.h +++ b/XMPFiles/source/FormatSupport/IFF/ChunkController.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _ChunkController_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp b/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp index 74d84d8..b399cd0 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp +++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/IFF/ChunkPath.h" diff --git a/XMPFiles/source/FormatSupport/IFF/ChunkPath.h b/XMPFiles/source/FormatSupport/IFF/ChunkPath.h index dd25010..25597b8 100644 --- a/XMPFiles/source/FormatSupport/IFF/ChunkPath.h +++ b/XMPFiles/source/FormatSupport/IFF/ChunkPath.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _ChunkPath_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp index 739144e..a245e46 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp +++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h index 7ac3ca5..984cc66 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkBehavior.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IChunkBehavior_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h b/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h index 2544466..e6da016 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkContainer.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IChunkContainer_h_ diff --git a/XMPFiles/source/FormatSupport/IFF/IChunkData.h b/XMPFiles/source/FormatSupport/IFF/IChunkData.h index 97c94bc..8c5ac78 100644 --- a/XMPFiles/source/FormatSupport/IFF/IChunkData.h +++ b/XMPFiles/source/FormatSupport/IFF/IChunkData.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IChunkData_h_ diff --git a/XMPFiles/source/FormatSupport/IPTC_Support.cpp b/XMPFiles/source/FormatSupport/IPTC_Support.cpp index d921073..9c28c38 100644 --- a/XMPFiles/source/FormatSupport/IPTC_Support.cpp +++ b/XMPFiles/source/FormatSupport/IPTC_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/IPTC_Support.hpp b/XMPFiles/source/FormatSupport/IPTC_Support.hpp index fe362f9..f0e38b5 100644 --- a/XMPFiles/source/FormatSupport/IPTC_Support.hpp +++ b/XMPFiles/source/FormatSupport/IPTC_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp index e0811af..b0945cb 100644 --- a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp +++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp index be62a8e..24f60c4 100644 --- a/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp +++ b/XMPFiles/source/FormatSupport/ISOBaseMedia_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/META_Support.cpp b/XMPFiles/source/FormatSupport/META_Support.cpp index 95d2de5..281b9a8 100644 --- a/XMPFiles/source/FormatSupport/META_Support.cpp +++ b/XMPFiles/source/FormatSupport/META_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/META_Support.hpp" diff --git a/XMPFiles/source/FormatSupport/META_Support.hpp b/XMPFiles/source/FormatSupport/META_Support.hpp index aef9e70..545acd7 100644 --- a/XMPFiles/source/FormatSupport/META_Support.hpp +++ b/XMPFiles/source/FormatSupport/META_Support.hpp @@ -6,9 +6,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/MOOV_Support.cpp b/XMPFiles/source/FormatSupport/MOOV_Support.cpp index 07d5d51..f2c848c 100644 --- a/XMPFiles/source/FormatSupport/MOOV_Support.cpp +++ b/XMPFiles/source/FormatSupport/MOOV_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef TraceParseMoovTree diff --git a/XMPFiles/source/FormatSupport/MOOV_Support.hpp b/XMPFiles/source/FormatSupport/MOOV_Support.hpp index b0a320d..03eafc7 100644 --- a/XMPFiles/source/FormatSupport/MOOV_Support.hpp +++ b/XMPFiles/source/FormatSupport/MOOV_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/P2_Support.cpp b/XMPFiles/source/FormatSupport/P2_Support.cpp index be6242f..222c910 100644 --- a/XMPFiles/source/FormatSupport/P2_Support.cpp +++ b/XMPFiles/source/FormatSupport/P2_Support.cpp @@ -5,9 +5,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. @@ -153,7 +151,7 @@ void P2_Clip::CacheClipContent() p2Offset= p2node->GetNamedElement ( p2NameSpace, "GlobalShotID" ); GetElementLocation(p2Offset,headContent.shotId ); XML_NodePtr p2connection= p2node->GetNamedElement ( p2NameSpace, "Connection" ); - if ( p2node != 0 ) + if ( p2connection != 0 ) { p2node= p2connection->GetNamedElement ( p2NameSpace, "Top" ); if ( p2node != 0 ) diff --git a/XMPFiles/source/FormatSupport/P2_Support.hpp b/XMPFiles/source/FormatSupport/P2_Support.hpp index ba9a633..e1c317b 100644 --- a/XMPFiles/source/FormatSupport/P2_Support.hpp +++ b/XMPFiles/source/FormatSupport/P2_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/XMPFiles/source/FormatSupport/PNG_Support.cpp b/XMPFiles/source/FormatSupport/PNG_Support.cpp index 42d523c..79e9f49 100644 --- a/XMPFiles/source/FormatSupport/PNG_Support.cpp +++ b/XMPFiles/source/FormatSupport/PNG_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. #include "public/include/XMP_Const.h" diff --git a/XMPFiles/source/FormatSupport/PNG_Support.hpp b/XMPFiles/source/FormatSupport/PNG_Support.hpp index b243b66..6142556 100644 --- a/XMPFiles/source/FormatSupport/PNG_Support.hpp +++ b/XMPFiles/source/FormatSupport/PNG_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp index 1580210..b1ddc05 100644 --- a/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/PSIR_FileWriter.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp b/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp index 8cd3a89..a58f238 100644 --- a/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp +++ b/XMPFiles/source/FormatSupport/PSIR_MemoryReader.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PSIR_Support.hpp b/XMPFiles/source/FormatSupport/PSIR_Support.hpp index 7a3cf90..2bd6946 100644 --- a/XMPFiles/source/FormatSupport/PSIR_Support.hpp +++ b/XMPFiles/source/FormatSupport/PSIR_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp b/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp index 843a4db..b40ca49 100644 --- a/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp +++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp b/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp index 65c6462..2f55e87 100644 --- a/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp +++ b/XMPFiles/source/FormatSupport/PackageFormat_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/PostScript_Support.cpp b/XMPFiles/source/FormatSupport/PostScript_Support.cpp index d958880..85e4a4f 100644 --- a/XMPFiles/source/FormatSupport/PostScript_Support.cpp +++ b/XMPFiles/source/FormatSupport/PostScript_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/FormatSupport/PostScript_Support.hpp" diff --git a/XMPFiles/source/FormatSupport/PostScript_Support.hpp b/XMPFiles/source/FormatSupport/PostScript_Support.hpp index 3c0a878..7d1cbd2 100644 --- a/XMPFiles/source/FormatSupport/PostScript_Support.hpp +++ b/XMPFiles/source/FormatSupport/PostScript_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" @@ -149,7 +147,7 @@ static const std::string kPS_XMPHintMainLast="%ADO_ContainsXMP: MainLast\n"; // embedd xpacket in EPS files.the xpacket is written inbetween kEPS_Injectdata1 and kEPS_Injectdata2. // The tokens kPS_Injectdata1 and kPS_Injectdata2 are used to embedd xpacket in DSC compliant PS files // The code inside the tokens is taken from examples in XMP Spec part 3 -// section 2.6.2 PS, EPS (PostScript and Encapsulated PostScript) +// section 2.6.2 PS, EPS (PostScript and Encapsulated PostScript) static const std::string kEPS_Injectdata1="\n/currentdistillerparams where\n" "{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse\n" "{userdict /EPSHandler1_pdfmark /cleartomark load put\n" diff --git a/XMPFiles/source/FormatSupport/QuickTime_Support.cpp b/XMPFiles/source/FormatSupport/QuickTime_Support.cpp index 999e241..c467703 100644 --- a/XMPFiles/source/FormatSupport/QuickTime_Support.cpp +++ b/XMPFiles/source/FormatSupport/QuickTime_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/QuickTime_Support.hpp b/XMPFiles/source/FormatSupport/QuickTime_Support.hpp index ae67df4..ce202ea 100644 --- a/XMPFiles/source/FormatSupport/QuickTime_Support.hpp +++ b/XMPFiles/source/FormatSupport/QuickTime_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. @@ -40,10 +38,10 @@ enum { // List of recognized items from the QuickTime 'moov'/'udta' box. // These items are defined by Adobe. - kQTilst_Reel = 0xA952454CUL, // 'REL' - kQTilst_Timecode = 0xA954494DUL, // 'TIM' - kQTilst_TimeScale = 0xA9545343UL, // 'TSC' - kQTilst_TimeSize = 0xA954535AUL // 'TSZ' + kQTilst_Reel = 0xA952454CUL, // 'REL' + kQTilst_Timecode = 0xA954494DUL, // 'TIM' + kQTilst_TimeScale = 0xA9545343UL, // 'TSC' + kQTilst_TimeSize = 0xA954535AUL // 'TSZ' }; diff --git a/XMPFiles/source/FormatSupport/RIFF.cpp b/XMPFiles/source/FormatSupport/RIFF.cpp index 8cd76ca..bff4e6f 100644 --- a/XMPFiles/source/FormatSupport/RIFF.cpp +++ b/XMPFiles/source/FormatSupport/RIFF.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/RIFF.hpp b/XMPFiles/source/FormatSupport/RIFF.hpp index 5084a20..68db6d4 100644 --- a/XMPFiles/source/FormatSupport/RIFF.hpp +++ b/XMPFiles/source/FormatSupport/RIFF.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/RIFF_Support.cpp b/XMPFiles/source/FormatSupport/RIFF_Support.cpp index 8c7454b..f7881cb 100644 --- a/XMPFiles/source/FormatSupport/RIFF_Support.cpp +++ b/XMPFiles/source/FormatSupport/RIFF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/RIFF_Support.hpp b/XMPFiles/source/FormatSupport/RIFF_Support.hpp index 4418b59..824c860 100644 --- a/XMPFiles/source/FormatSupport/RIFF_Support.hpp +++ b/XMPFiles/source/FormatSupport/RIFF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp b/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp index fd83983..bf797d5 100644 --- a/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileIPTC.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp index 0243ec7..717959f 100644 --- a/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp index 8805dce..7404753 100644 --- a/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp +++ b/XMPFiles/source/FormatSupport/ReconcileLegacy.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp index a3e6d79..d455516 100644 --- a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp b/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp index c7ca7f8..b52700d 100644 --- a/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp +++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp b/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp index 8f889a1..95aea90 100644 --- a/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp +++ b/XMPFiles/source/FormatSupport/Reconcile_Impl.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp index c21d60c..9907b9a 100644 --- a/XMPFiles/source/FormatSupport/SVG_Adapter.cpp +++ b/XMPFiles/source/FormatSupport/SVG_Adapter.cpp @@ -3,9 +3,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" @@ -184,7 +182,7 @@ void SVG_Adapter::ParseBuffer( const void * buffer, size_t length, bool last /* #if BanAllEntityUsage if ( this->isAborted ) { - XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ) + XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ); this->NotifyClient( kXMPErrSev_Recoverable, error ); } #endif @@ -213,11 +211,18 @@ XMP_Bool SVG_Adapter::ParseBufferNoThrow( const void * buffer, size_t length, bo length = 1; } - status = XML_Parse( this->parser, ( const char * ) buffer, static_cast< XMP_StringLen >( length ), last ); + try + { + status = XML_Parse(this->parser, (const char *)buffer, static_cast<XMP_StringLen>(length), last); + } + catch (XMP_Error &e) + { + return false; //Don't let one failure abort checking other file formats , this api is called only from checkFileFormat + } #if BanAllEntityUsage if ( this->isAborted ) { - XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ) + XMP_Error error( kXMPErr_BadXML, "DOCTYPE is not allowed" ); this->NotifyClient( kXMPErrSev_Recoverable, error ); } #endif @@ -235,6 +240,8 @@ static void ParseFullNS( XMP_StringPtr fullName, string & NS, string &localName { // Expat delivers the full name as a catenation of namespace URI, separator, and local name. size_t sepPos = strlen( fullName ); + if (!sepPos) + return; //Throw? for ( --sepPos; sepPos > 0; --sepPos ) { if ( fullName[ sepPos ] == FullNameSeparator ) break; } diff --git a/XMPFiles/source/FormatSupport/SVG_Adapter.hpp b/XMPFiles/source/FormatSupport/SVG_Adapter.hpp index 0e9955d..dbb4c28 100644 --- a/XMPFiles/source/FormatSupport/SVG_Adapter.hpp +++ b/XMPFiles/source/FormatSupport/SVG_Adapter.hpp @@ -6,13 +6,11 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // This file includes implementation of SVG metadata, according to Scalable Vector Graphics (SVG) 1.1 Specification. // "https://www.w3.org/TR/2003/REC-SVG11-20030114/" -// Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, +// Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, // Institut National de Recherche en Informatique et en Automatique, Keio University). // All Rights Reserved . http://www.w3.org/Consortium/Legal // diff --git a/XMPFiles/source/FormatSupport/SWF_Support.cpp b/XMPFiles/source/FormatSupport/SWF_Support.cpp index 9ad9916..57af239 100644 --- a/XMPFiles/source/FormatSupport/SWF_Support.cpp +++ b/XMPFiles/source/FormatSupport/SWF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/SWF_Support.hpp b/XMPFiles/source/FormatSupport/SWF_Support.hpp index 0cbc875..2adcd0a 100644 --- a/XMPFiles/source/FormatSupport/SWF_Support.hpp +++ b/XMPFiles/source/FormatSupport/SWF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp index 3e34d4e..c99fafa 100644 --- a/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp b/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp index b85a904..ed9f135 100644 --- a/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.cpp b/XMPFiles/source/FormatSupport/TIFF_Support.cpp index 5c960a4..2ecfca9 100644 --- a/XMPFiles/source/FormatSupport/TIFF_Support.cpp +++ b/XMPFiles/source/FormatSupport/TIFF_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TIFF_Support.hpp b/XMPFiles/source/FormatSupport/TIFF_Support.hpp index d2a0e2b..40d2fe4 100644 --- a/XMPFiles/source/FormatSupport/TIFF_Support.hpp +++ b/XMPFiles/source/FormatSupport/TIFF_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp b/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp index e87c687..0c6e43f 100644 --- a/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp +++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp b/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp index ee21e67..db03c7b 100644 --- a/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp +++ b/XMPFiles/source/FormatSupport/TimeConversionUtils.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp index f45f244..2a76f17 100644 --- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h index 67ad53a..45f806a 100644 --- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _BEXTMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp index a3c1113..7096a60 100644 --- a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h index 9dfe6e0..95734f9 100644 --- a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _CartMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp index 99aaa9b..1c678e4 100644 --- a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h index ea45829..eef6f23 100644 --- a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _Cr8rMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp index f0b1ca4..df35182 100644 --- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h index 124d052..036e221 100644 --- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _DISPMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp index 13c8178..2dfa32a 100644 --- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h index 007f461..451f1c7 100644 --- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _INFOMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp index afd274d..0866e0a 100644 --- a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string.h> diff --git a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h index bc566e2..5e53c41 100644 --- a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _PrmlMetadata_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp index f731bd6..0ef50e6 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h index 4a7be50..3e5b590 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEBehavior.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _WAVEBEHAVIOR_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp index e5fc5bb..de15d28 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h index 9fbd112..f013884 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _WAVEReconcile_h_ diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp index ea8383e..690f3f4 100644 --- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h index 2b80a52..8b909f7 100644 --- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h +++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/XDCAM_Support.cpp b/XMPFiles/source/FormatSupport/XDCAM_Support.cpp index db29c2e..44afe01 100644 --- a/XMPFiles/source/FormatSupport/XDCAM_Support.cpp +++ b/XMPFiles/source/FormatSupport/XDCAM_Support.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/FormatSupport/XDCAM_Support.hpp b/XMPFiles/source/FormatSupport/XDCAM_Support.hpp index 10927ef..80d4174 100644 --- a/XMPFiles/source/FormatSupport/XDCAM_Support.hpp +++ b/XMPFiles/source/FormatSupport/XDCAM_Support.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/FormatSupport/XMPScanner.cpp b/XMPFiles/source/FormatSupport/XMPScanner.cpp index bdcc442..234baec 100644 --- a/XMPFiles/source/FormatSupport/XMPScanner.cpp +++ b/XMPFiles/source/FormatSupport/XMPScanner.cpp @@ -3,9 +3,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // Adobe patent application tracking #P435, entitled 'Unique markers to simplify embedding data of // one format in a file with a different format', inventors: Sean Parent, Greg Gilley. diff --git a/XMPFiles/source/FormatSupport/XMPScanner.hpp b/XMPFiles/source/FormatSupport/XMPScanner.hpp index cfdaaa3..aaeacc1 100644 --- a/XMPFiles/source/FormatSupport/XMPScanner.hpp +++ b/XMPFiles/source/FormatSupport/XMPScanner.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // // Adobe patent application tracking #P435, entitled 'Unique markers to simplify embedding data of // one format in a file with a different format', inventors: Sean Parent, Greg Gilley. diff --git a/XMPFiles/source/HandlerRegistry.cpp b/XMPFiles/source/HandlerRegistry.cpp index b5164e9..b3e1569 100644 --- a/XMPFiles/source/HandlerRegistry.cpp +++ b/XMPFiles/source/HandlerRegistry.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/HandlerRegistry.h b/XMPFiles/source/HandlerRegistry.h index 69509d8..4152274 100644 --- a/XMPFiles/source/HandlerRegistry.h +++ b/XMPFiles/source/HandlerRegistry.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _HANDLERREGISTRY_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp index 92bcf08..d75812b 100644 --- a/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp +++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/NativeMetadataSupport/IMetadata.h" diff --git a/XMPFiles/source/NativeMetadataSupport/IMetadata.h b/XMPFiles/source/NativeMetadataSupport/IMetadata.h index fe03786..d2191cc 100644 --- a/XMPFiles/source/NativeMetadataSupport/IMetadata.h +++ b/XMPFiles/source/NativeMetadataSupport/IMetadata.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IMetadata_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp b/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp index 4a44477..eb75edc 100644 --- a/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp +++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/NativeMetadataSupport/IReconcile.h" diff --git a/XMPFiles/source/NativeMetadataSupport/IReconcile.h b/XMPFiles/source/NativeMetadataSupport/IReconcile.h index b658559..bea372e 100644 --- a/XMPFiles/source/NativeMetadataSupport/IReconcile.h +++ b/XMPFiles/source/NativeMetadataSupport/IReconcile.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _IReconcile_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp b/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp index f2e2a5a..b75928a 100644 --- a/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp +++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFiles/source/NativeMetadataSupport/MetadataSet.h" diff --git a/XMPFiles/source/NativeMetadataSupport/MetadataSet.h b/XMPFiles/source/NativeMetadataSupport/MetadataSet.h index cbda559..7b8f95d 100644 --- a/XMPFiles/source/NativeMetadataSupport/MetadataSet.h +++ b/XMPFiles/source/NativeMetadataSupport/MetadataSet.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _MetadataSet_h_ diff --git a/XMPFiles/source/NativeMetadataSupport/ValueObject.h b/XMPFiles/source/NativeMetadataSupport/ValueObject.h index 7406bcc..8fa25a1 100644 --- a/XMPFiles/source/NativeMetadataSupport/ValueObject.h +++ b/XMPFiles/source/NativeMetadataSupport/ValueObject.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _ValueObject_h_ diff --git a/XMPFiles/source/PluginHandler/FileHandler.h b/XMPFiles/source/PluginHandler/FileHandler.h index 014a2d5..2dc6895 100644 --- a/XMPFiles/source/PluginHandler/FileHandler.h +++ b/XMPFiles/source/PluginHandler/FileHandler.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef PLUGINHANDLER_H diff --git a/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp index 28218d0..f998ceb 100644 --- a/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp +++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "FileHandlerInstance.h" diff --git a/XMPFiles/source/PluginHandler/FileHandlerInstance.h b/XMPFiles/source/PluginHandler/FileHandlerInstance.h index 84b64a1..60167dd 100644 --- a/XMPFiles/source/PluginHandler/FileHandlerInstance.h +++ b/XMPFiles/source/PluginHandler/FileHandlerInstance.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef PLUGINHANDLERINSTANCE_H diff --git a/XMPFiles/source/PluginHandler/HostAPIImpl.cpp b/XMPFiles/source/PluginHandler/HostAPIImpl.cpp index 465421f..3a60d40 100644 --- a/XMPFiles/source/PluginHandler/HostAPIImpl.cpp +++ b/XMPFiles/source/PluginHandler/HostAPIImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "HostAPI.h" diff --git a/XMPFiles/source/PluginHandler/Module.cpp b/XMPFiles/source/PluginHandler/Module.cpp index 2ae0dcc..f5ff15d 100644 --- a/XMPFiles/source/PluginHandler/Module.cpp +++ b/XMPFiles/source/PluginHandler/Module.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "Module.h" diff --git a/XMPFiles/source/PluginHandler/Module.h b/XMPFiles/source/PluginHandler/Module.h index c03eb65..a722565 100644 --- a/XMPFiles/source/PluginHandler/Module.h +++ b/XMPFiles/source/PluginHandler/Module.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef MODULE_H diff --git a/XMPFiles/source/PluginHandler/ModuleUtils.h b/XMPFiles/source/PluginHandler/ModuleUtils.h index bbae559..cadbb00 100644 --- a/XMPFiles/source/PluginHandler/ModuleUtils.h +++ b/XMPFiles/source/PluginHandler/ModuleUtils.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef MODULEUTILS_H diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp index ade76ae..0d767de 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Android.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp index 6a36e03..84c0eb7 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Linux.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp b/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp index e3300a0..0f70fb4 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_Mac.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp b/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp index 7426fb4..0a1ee3e 100644 --- a/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp +++ b/XMPFiles/source/PluginHandler/OS_Utils_WIN.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "ModuleUtils.h" diff --git a/XMPFiles/source/PluginHandler/PluginManager.cpp b/XMPFiles/source/PluginHandler/PluginManager.cpp index d7a5591..8fb79d7 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.cpp +++ b/XMPFiles/source/PluginHandler/PluginManager.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "PluginManager.h" diff --git a/XMPFiles/source/PluginHandler/PluginManager.h b/XMPFiles/source/PluginHandler/PluginManager.h index c2d8e37..a6b460c 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.h +++ b/XMPFiles/source/PluginHandler/PluginManager.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef PLUGINMANAGER_H diff --git a/XMPFiles/source/PluginHandler/XMPAtoms.cpp b/XMPFiles/source/PluginHandler/XMPAtoms.cpp index 8329afc..42f9732 100644 --- a/XMPFiles/source/PluginHandler/XMPAtoms.cpp +++ b/XMPFiles/source/PluginHandler/XMPAtoms.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPAtoms.h" diff --git a/XMPFiles/source/PluginHandler/XMPAtoms.h b/XMPFiles/source/PluginHandler/XMPAtoms.h index 3bade33..102c489 100644 --- a/XMPFiles/source/PluginHandler/XMPAtoms.h +++ b/XMPFiles/source/PluginHandler/XMPAtoms.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef _H_XMPATOMS diff --git a/XMPFiles/source/WXMPFiles.cpp b/XMPFiles/source/WXMPFiles.cpp index fae04c9..ca493d2 100644 --- a/XMPFiles/source/WXMPFiles.cpp +++ b/XMPFiles/source/WXMPFiles.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/XMPFiles/source/XMPFiles.cpp b/XMPFiles/source/XMPFiles.cpp index 3721fb1..465c859 100644 --- a/XMPFiles/source/XMPFiles.cpp +++ b/XMPFiles/source/XMPFiles.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! diff --git a/XMPFiles/source/XMPFiles.hpp b/XMPFiles/source/XMPFiles.hpp index d6d280b..03ba873 100644 --- a/XMPFiles/source/XMPFiles.hpp +++ b/XMPFiles/source/XMPFiles.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp index 8a517d1..f1eb207 100644 --- a/XMPFiles/source/XMPFiles_Impl.cpp +++ b/XMPFiles/source/XMPFiles_Impl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/XMPFiles/source/XMPFiles_Impl.hpp b/XMPFiles/source/XMPFiles_Impl.hpp index 026d012..f3632ce 100644 --- a/XMPFiles/source/XMPFiles_Impl.hpp +++ b/XMPFiles/source/XMPFiles_Impl.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! 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/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..fc3cdbc 100644 --- a/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp +++ b/XMPFilesPlugins/PluginTemplate/source/Template_Handler.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPFilesPlugins/api/source/PluginBase.h" diff --git a/XMPFilesPlugins/api/source/HostAPI.h b/XMPFilesPlugins/api/source/HostAPI.h index f0bf8fa..62a54c4 100644 --- a/XMPFilesPlugins/api/source/HostAPI.h +++ b/XMPFilesPlugins/api/source/HostAPI.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/XMPFilesPlugins/api/source/HostAPIAccess.cpp b/XMPFilesPlugins/api/source/HostAPIAccess.cpp index f536beb..73add79 100644 --- a/XMPFilesPlugins/api/source/HostAPIAccess.cpp +++ b/XMPFilesPlugins/api/source/HostAPIAccess.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "HostAPIAccess.h" diff --git a/XMPFilesPlugins/api/source/HostAPIAccess.h b/XMPFilesPlugins/api/source/HostAPIAccess.h index a88b562..c3a589a 100644 --- a/XMPFilesPlugins/api/source/HostAPIAccess.h +++ b/XMPFilesPlugins/api/source/HostAPIAccess.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __HostAPIAccess_h__ diff --git a/XMPFilesPlugins/api/source/PluginAPIImpl.cpp b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp index e08b68e..f7b22a9 100644 --- a/XMPFilesPlugins/api/source/PluginAPIImpl.cpp +++ b/XMPFilesPlugins/api/source/PluginAPIImpl.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "HostAPIAccess.h" diff --git a/XMPFilesPlugins/api/source/PluginBase.cpp b/XMPFilesPlugins/api/source/PluginBase.cpp index 191b951..012cb75 100644 --- a/XMPFilesPlugins/api/source/PluginBase.cpp +++ b/XMPFilesPlugins/api/source/PluginBase.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "PluginBase.h" diff --git a/XMPFilesPlugins/api/source/PluginBase.h b/XMPFilesPlugins/api/source/PluginBase.h index 1f79668..f1cbfeb 100644 --- a/XMPFilesPlugins/api/source/PluginBase.h +++ b/XMPFilesPlugins/api/source/PluginBase.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= /************************************************************************** diff --git a/XMPFilesPlugins/api/source/PluginConst.h b/XMPFilesPlugins/api/source/PluginConst.h index 45d2752..a9f0098 100644 --- a/XMPFilesPlugins/api/source/PluginConst.h +++ b/XMPFilesPlugins/api/source/PluginConst.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef __PLUGIN_CONST_H__ diff --git a/XMPFilesPlugins/api/source/PluginHandler.h b/XMPFilesPlugins/api/source/PluginHandler.h index eb64791..e2c7944 100644 --- a/XMPFilesPlugins/api/source/PluginHandler.h +++ b/XMPFilesPlugins/api/source/PluginHandler.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= /************************************************************************** diff --git a/XMPFilesPlugins/api/source/PluginRegistry.cpp b/XMPFilesPlugins/api/source/PluginRegistry.cpp index a059600..5fc9e41 100644 --- a/XMPFilesPlugins/api/source/PluginRegistry.cpp +++ b/XMPFilesPlugins/api/source/PluginRegistry.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "PluginRegistry.h" diff --git a/XMPFilesPlugins/api/source/PluginRegistry.h b/XMPFilesPlugins/api/source/PluginRegistry.h index df04bcb..467fea3 100644 --- a/XMPFilesPlugins/api/source/PluginRegistry.h +++ b/XMPFilesPlugins/api/source/PluginRegistry.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef PLUGINREGISTRY_H diff --git a/XMPFilesPlugins/api/source/PluginUtils.cpp b/XMPFilesPlugins/api/source/PluginUtils.cpp index e720cb9..cbf7aca 100644 --- a/XMPFilesPlugins/api/source/PluginUtils.cpp +++ b/XMPFilesPlugins/api/source/PluginUtils.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMP_Const.h" diff --git a/XMPFilesPlugins/api/source/PluginUtils.h b/XMPFilesPlugins/api/source/PluginUtils.h index fc5453f..93015e6 100644 --- a/XMPFilesPlugins/api/source/PluginUtils.h +++ b/XMPFilesPlugins/api/source/PluginUtils.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMP_Const.h" 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..e5b11a4 100644 --- a/build/XMP_BuildInfo.h +++ b/build/XMP_BuildInfo.h @@ -7,9 +7,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= */ 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/public/include/TXMPFiles.hpp b/public/include/TXMPFiles.hpp index 8a3cbb9..5933155 100644 --- a/public/include/TXMPFiles.hpp +++ b/public/include/TXMPFiles.hpp @@ -11,9 +11,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/public/include/TXMPIterator.hpp b/public/include/TXMPIterator.hpp index ccc8e69..6e052c3 100644 --- a/public/include/TXMPIterator.hpp +++ b/public/include/TXMPIterator.hpp @@ -11,9 +11,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/public/include/TXMPMeta.hpp b/public/include/TXMPMeta.hpp index 12a9214..e66b3a3 100644 --- a/public/include/TXMPMeta.hpp +++ b/public/include/TXMPMeta.hpp @@ -16,9 +16,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/public/include/TXMPUtils.hpp b/public/include/TXMPUtils.hpp index aed1196..17c5ffb 100644 --- a/public/include/TXMPUtils.hpp +++ b/public/include/TXMPUtils.hpp @@ -11,9 +11,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/public/include/XMP.hpp b/public/include/XMP.hpp index cf543a2..8dd5ad8 100644 --- a/public/include/XMP.hpp +++ b/public/include/XMP.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================ diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h index 9ee42d8..eec960d 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h @@ -11,9 +11,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h index 1a9e64b..c8caa2f 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h index 54b56b1..295096f 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IThreadSafe.h @@ -9,9 +9,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // diff --git a/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h b/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h index c7bd606..e35dd85 100644 --- a/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h +++ b/public/include/XMPCommon/Interfaces/BaseInterfaces/IVersionable.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/IConfigurationManager.h b/public/include/XMPCommon/Interfaces/IConfigurationManager.h index 5a38baf..9bb126a 100644 --- a/public/include/XMPCommon/Interfaces/IConfigurationManager.h +++ b/public/include/XMPCommon/Interfaces/IConfigurationManager.h @@ -10,9 +10,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // diff --git a/public/include/XMPCommon/Interfaces/IError.h b/public/include/XMPCommon/Interfaces/IError.h index 8df342a..e63583e 100644 --- a/public/include/XMPCommon/Interfaces/IError.h +++ b/public/include/XMPCommon/Interfaces/IError.h @@ -7,9 +7,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================ #include "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h" diff --git a/public/include/XMPCommon/Interfaces/IErrorNotifier.h b/public/include/XMPCommon/Interfaces/IErrorNotifier.h index 0e3520f..6faaa04 100644 --- a/public/include/XMPCommon/Interfaces/IErrorNotifier.h +++ b/public/include/XMPCommon/Interfaces/IErrorNotifier.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/IMemoryAllocator.h b/public/include/XMPCommon/Interfaces/IMemoryAllocator.h index 893604c..4b764d4 100644 --- a/public/include/XMPCommon/Interfaces/IMemoryAllocator.h +++ b/public/include/XMPCommon/Interfaces/IMemoryAllocator.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/BaseInterfaces/IVersionable.h" diff --git a/public/include/XMPCommon/Interfaces/IObjectFactory.h b/public/include/XMPCommon/Interfaces/IObjectFactory.h index ced1802..bc8ed39 100644 --- a/public/include/XMPCommon/Interfaces/IObjectFactory.h +++ b/public/include/XMPCommon/Interfaces/IObjectFactory.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonFwdDeclarations.h" diff --git a/public/include/XMPCommon/Interfaces/IUTF8String.h b/public/include/XMPCommon/Interfaces/IUTF8String.h index 4530641..0322545 100644 --- a/public/include/XMPCommon/Interfaces/IUTF8String.h +++ b/public/include/XMPCommon/Interfaces/IUTF8String.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/BaseInterfaces/ISharedObject.h" diff --git a/public/include/XMPCommon/Utilities/TWrapperFunctions.h b/public/include/XMPCommon/Utilities/TWrapperFunctions.h index 43f8612..8c5e4c8 100644 --- a/public/include/XMPCommon/Utilities/TWrapperFunctions.h +++ b/public/include/XMPCommon/Utilities/TWrapperFunctions.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IError.h" diff --git a/public/include/XMPCommon/Utilities/TWrapperFunctions2.h b/public/include/XMPCommon/Utilities/TWrapperFunctions2.h index 06ec99c..a6ae200 100644 --- a/public/include/XMPCommon/Utilities/TWrapperFunctions2.h +++ b/public/include/XMPCommon/Utilities/TWrapperFunctions2.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= //! \cond XMP_INTERNAL_DOCUMENTATION diff --git a/public/include/XMPCommon/XMPCommonDefines.h b/public/include/XMPCommon/XMPCommonDefines.h index 823f1b4..7012a67 100644 --- a/public/include/XMPCommon/XMPCommonDefines.h +++ b/public/include/XMPCommon/XMPCommonDefines.h @@ -5,9 +5,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/public/include/XMPCommon/XMPCommonErrorCodes.h b/public/include/XMPCommon/XMPCommonErrorCodes.h index e1d41b9..8a8f886 100644 --- a/public/include/XMPCommon/XMPCommonErrorCodes.h +++ b/public/include/XMPCommon/XMPCommonErrorCodes.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines.h" diff --git a/public/include/XMPCommon/XMPCommonFwdDeclarations.h b/public/include/XMPCommon/XMPCommonFwdDeclarations.h index a39f0c3..9bd8cac 100644 --- a/public/include/XMPCommon/XMPCommonFwdDeclarations.h +++ b/public/include/XMPCommon/XMPCommonFwdDeclarations.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/XMPCommonDefines.h" diff --git a/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h b/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h index 6264144..76e7040 100644 --- a/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h +++ b/public/include/XMPCommon/XMPCommonLatestInterfaceVersions.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= //! diff --git a/public/include/XMPCommon/source/IConfigurable.cpp b/public/include/XMPCommon/source/IConfigurable.cpp index 6d932b5..47867e3 100644 --- a/public/include/XMPCommon/source/IConfigurable.cpp +++ b/public/include/XMPCommon/source/IConfigurable.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/BaseInterfaces/IConfigurable.h" diff --git a/public/include/XMPCommon/source/IConfigurationManager.cpp b/public/include/XMPCommon/source/IConfigurationManager.cpp index edafeb3..d529d58 100644 --- a/public/include/XMPCommon/source/IConfigurationManager.cpp +++ b/public/include/XMPCommon/source/IConfigurationManager.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #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..e9158ff 100644 --- a/public/include/XMPCommon/source/IError.cpp +++ b/public/include/XMPCommon/source/IError.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #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..7a3d251 100644 --- a/public/include/XMPCommon/source/IErrorNotifier.cpp +++ b/public/include/XMPCommon/source/IErrorNotifier.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCommon/Interfaces/IErrorNotifier.h" diff --git a/public/include/XMPCommon/source/IUTF8String.cpp b/public/include/XMPCommon/source/IUTF8String.cpp index 0aace28..c5d4ee9 100644 --- a/public/include/XMPCommon/source/IUTF8String.cpp +++ b/public/include/XMPCommon/source/IUTF8String.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #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..987ee78 100644 --- a/public/include/XMPCore/Interfaces/IArrayNode.h +++ b/public/include/XMPCore/Interfaces/IArrayNode.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/public/include/XMPCore/Interfaces/IClientDOMParser.h b/public/include/XMPCore/Interfaces/IClientDOMParser.h index dc67641..13b9b13 100644 --- a/public/include/XMPCore/Interfaces/IClientDOMParser.h +++ b/public/include/XMPCore/Interfaces/IClientDOMParser.h @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IClientDOMSerializer.h b/public/include/XMPCore/Interfaces/IClientDOMSerializer.h index 49219c0..23fe72c 100644 --- a/public/include/XMPCore/Interfaces/IClientDOMSerializer.h +++ b/public/include/XMPCore/Interfaces/IClientDOMSerializer.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/ICompositeNode.h b/public/include/XMPCore/Interfaces/ICompositeNode.h index 67c0205..2423617 100644 --- a/public/include/XMPCore/Interfaces/ICompositeNode.h +++ b/public/include/XMPCore/Interfaces/ICompositeNode.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/INode.h" diff --git a/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h b/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h index b75d9bc..bd75226 100644 --- a/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h +++ b/public/include/XMPCore/Interfaces/ICoreConfigurationManager.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/ICoreObjectFactory.h b/public/include/XMPCore/Interfaces/ICoreObjectFactory.h index cdd0602..9783d84 100644 --- a/public/include/XMPCore/Interfaces/ICoreObjectFactory.h +++ b/public/include/XMPCore/Interfaces/ICoreObjectFactory.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h b/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h index be084f7..c2df16c 100644 --- a/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h +++ b/public/include/XMPCore/Interfaces/IDOMImplementationRegistry.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IDOMParser.h b/public/include/XMPCore/Interfaces/IDOMParser.h index a852791..6094a5b 100644 --- a/public/include/XMPCore/Interfaces/IDOMParser.h +++ b/public/include/XMPCore/Interfaces/IDOMParser.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IDOMSerializer.h b/public/include/XMPCore/Interfaces/IDOMSerializer.h index bea92cd..34b5fbd 100644 --- a/public/include/XMPCore/Interfaces/IDOMSerializer.h +++ b/public/include/XMPCore/Interfaces/IDOMSerializer.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IMetadata.h b/public/include/XMPCore/Interfaces/IMetadata.h index 6ce098f..5b12bfe 100644 --- a/public/include/XMPCore/Interfaces/IMetadata.h +++ b/public/include/XMPCore/Interfaces/IMetadata.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/IStructureNode.h" diff --git a/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h b/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h index acfc559..5ca132b 100644 --- a/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h +++ b/public/include/XMPCore/Interfaces/IMetadataConverterUtils.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <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..24b5da1 100644 --- a/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h +++ b/public/include/XMPCore/Interfaces/INameSpacePrefixMap.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/INode.h b/public/include/XMPCore/Interfaces/INode.h index 516a944..d11a7c6 100644 --- a/public/include/XMPCore/Interfaces/INode.h +++ b/public/include/XMPCore/Interfaces/INode.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/INodeIterator.h b/public/include/XMPCore/Interfaces/INodeIterator.h index 10c60d8..01b7d72 100644 --- a/public/include/XMPCore/Interfaces/INodeIterator.h +++ b/public/include/XMPCore/Interfaces/INodeIterator.h @@ -8,9 +8,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IPath.h b/public/include/XMPCore/Interfaces/IPath.h index 774bc46..d522cde 100644 --- a/public/include/XMPCore/Interfaces/IPath.h +++ b/public/include/XMPCore/Interfaces/IPath.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/IPathSegment.h b/public/include/XMPCore/Interfaces/IPathSegment.h index 5cd0591..14f8f03 100644 --- a/public/include/XMPCore/Interfaces/IPathSegment.h +++ b/public/include/XMPCore/Interfaces/IPathSegment.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreFwdDeclarations.h" diff --git a/public/include/XMPCore/Interfaces/ISimpleNode.h b/public/include/XMPCore/Interfaces/ISimpleNode.h index 6bc731e..25fad4a 100644 --- a/public/include/XMPCore/Interfaces/ISimpleNode.h +++ b/public/include/XMPCore/Interfaces/ISimpleNode.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/INode.h" diff --git a/public/include/XMPCore/Interfaces/IStructureNode.h b/public/include/XMPCore/Interfaces/IStructureNode.h index 47ebd4d..72f4a9e 100644 --- a/public/include/XMPCore/Interfaces/IStructureNode.h +++ b/public/include/XMPCore/Interfaces/IStructureNode.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/ICompositeNode.h" diff --git a/public/include/XMPCore/XMPCoreDefines.h b/public/include/XMPCore/XMPCoreDefines.h index 00c22a4..5af5be9 100644 --- a/public/include/XMPCore/XMPCoreDefines.h +++ b/public/include/XMPCore/XMPCoreDefines.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/public/include/XMPCore/XMPCoreErrorCodes.h b/public/include/XMPCore/XMPCoreErrorCodes.h index 2ea8f22..80d4632 100644 --- a/public/include/XMPCore/XMPCoreErrorCodes.h +++ b/public/include/XMPCore/XMPCoreErrorCodes.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/XMPCoreDefines.h" diff --git a/public/include/XMPCore/XMPCoreFwdDeclarations.h b/public/include/XMPCore/XMPCoreFwdDeclarations.h index 90a326f..78284ff 100644 --- a/public/include/XMPCore/XMPCoreFwdDeclarations.h +++ b/public/include/XMPCore/XMPCoreFwdDeclarations.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h b/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h index d00d602..ece560e 100644 --- a/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h +++ b/public/include/XMPCore/XMPCoreLatestInterfaceVersions.h @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= //! diff --git a/public/include/XMPCore/source/IArrayNode.cpp b/public/include/XMPCore/source/IArrayNode.cpp index 46a719a..dda3cc3 100644 --- a/public/include/XMPCore/source/IArrayNode.cpp +++ b/public/include/XMPCore/source/IArrayNode.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IClientDOMParser.cpp b/public/include/XMPCore/source/IClientDOMParser.cpp index deac0d1..c8afab7 100644 --- a/public/include/XMPCore/source/IClientDOMParser.cpp +++ b/public/include/XMPCore/source/IClientDOMParser.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/IClientDOMParser.h" diff --git a/public/include/XMPCore/source/IClientDOMSerializer.cpp b/public/include/XMPCore/source/IClientDOMSerializer.cpp index 769e90a..0069ad1 100644 --- a/public/include/XMPCore/source/IClientDOMSerializer.cpp +++ b/public/include/XMPCore/source/IClientDOMSerializer.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/IClientDOMSerializer.h" diff --git a/public/include/XMPCore/source/ICompositeNode.cpp b/public/include/XMPCore/source/ICompositeNode.cpp index d11c2a8..7f95491 100644 --- a/public/include/XMPCore/source/ICompositeNode.cpp +++ b/public/include/XMPCore/source/ICompositeNode.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/ICoreConfigurationManager.cpp b/public/include/XMPCore/source/ICoreConfigurationManager.cpp index a61d8de..b6254ac 100644 --- a/public/include/XMPCore/source/ICoreConfigurationManager.cpp +++ b/public/include/XMPCore/source/ICoreConfigurationManager.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/ICoreObjectFactory.cpp b/public/include/XMPCore/source/ICoreObjectFactory.cpp index 95b372f..2b98ff5 100644 --- a/public/include/XMPCore/source/ICoreObjectFactory.cpp +++ b/public/include/XMPCore/source/ICoreObjectFactory.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMPCore/Interfaces/ICoreObjectFactory.h" diff --git a/public/include/XMPCore/source/IDOMImplementationRegistry.cpp b/public/include/XMPCore/source/IDOMImplementationRegistry.cpp index 9fc436c..e52ae0f 100644 --- a/public/include/XMPCore/source/IDOMImplementationRegistry.cpp +++ b/public/include/XMPCore/source/IDOMImplementationRegistry.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IDOMParser.cpp b/public/include/XMPCore/source/IDOMParser.cpp index 78f4c36..8351250 100644 --- a/public/include/XMPCore/source/IDOMParser.cpp +++ b/public/include/XMPCore/source/IDOMParser.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IDOMSerializer.cpp b/public/include/XMPCore/source/IDOMSerializer.cpp index f76161a..b960f06 100644 --- a/public/include/XMPCore/source/IDOMSerializer.cpp +++ b/public/include/XMPCore/source/IDOMSerializer.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IMetadata.cpp b/public/include/XMPCore/source/IMetadata.cpp index 83e9cd7..8f9f8b3 100644 --- a/public/include/XMPCore/source/IMetadata.cpp +++ b/public/include/XMPCore/source/IMetadata.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IMetadataConverterUtils.cpp b/public/include/XMPCore/source/IMetadataConverterUtils.cpp index 5c98715..433cc43 100644 --- a/public/include/XMPCore/source/IMetadataConverterUtils.cpp +++ b/public/include/XMPCore/source/IMetadataConverterUtils.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/INameSpacePrefixMap.cpp b/public/include/XMPCore/source/INameSpacePrefixMap.cpp index 59db914..6489073 100644 --- a/public/include/XMPCore/source/INameSpacePrefixMap.cpp +++ b/public/include/XMPCore/source/INameSpacePrefixMap.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/INode.cpp b/public/include/XMPCore/source/INode.cpp index 114d2ee..cc71ad6 100644 --- a/public/include/XMPCore/source/INode.cpp +++ b/public/include/XMPCore/source/INode.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/INodeIterator.cpp b/public/include/XMPCore/source/INodeIterator.cpp index 6cae09e..0bb6b97 100644 --- a/public/include/XMPCore/source/INodeIterator.cpp +++ b/public/include/XMPCore/source/INodeIterator.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IPath.cpp b/public/include/XMPCore/source/IPath.cpp index ed42b82..b11d7f0 100644 --- a/public/include/XMPCore/source/IPath.cpp +++ b/public/include/XMPCore/source/IPath.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IPathSegment.cpp b/public/include/XMPCore/source/IPathSegment.cpp index c6b89f9..abff209 100644 --- a/public/include/XMPCore/source/IPathSegment.cpp +++ b/public/include/XMPCore/source/IPathSegment.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/ISimpleNode.cpp b/public/include/XMPCore/source/ISimpleNode.cpp index 81bf3b7..de013d2 100644 --- a/public/include/XMPCore/source/ISimpleNode.cpp +++ b/public/include/XMPCore/source/ISimpleNode.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMPCore/source/IStructureNode.cpp b/public/include/XMPCore/source/IStructureNode.cpp index 0869001..50b4fdc 100644 --- a/public/include/XMPCore/source/IStructureNode.cpp +++ b/public/include/XMPCore/source/IStructureNode.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= namespace AdobeXMPCore { diff --git a/public/include/XMP_Const.h b/public/include/XMP_Const.h index 2e60bb9..21230a0 100644 --- a/public/include/XMP_Const.h +++ b/public/include/XMP_Const.h @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "XMP_Environment.h" diff --git a/public/include/XMP_Environment.h b/public/include/XMP_Environment.h index a635cc6..3be35bc 100644 --- a/public/include/XMP_Environment.h +++ b/public/include/XMP_Environment.h @@ -15,9 +15,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= // ================================================================================================= diff --git a/public/include/XMP_IO.hpp b/public/include/XMP_IO.hpp index 5dcfd76..d0a7c17 100644 --- a/public/include/XMP_IO.hpp +++ b/public/include/XMP_IO.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "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..501ed20 100644 --- a/public/include/XMP_Version.h +++ b/public/include/XMP_Version.h @@ -11,9 +11,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= */ diff --git a/public/include/client-glue/WXMPFiles.hpp b/public/include/client-glue/WXMPFiles.hpp index 4575e48..c23ca62 100644 --- a/public/include/client-glue/WXMPFiles.hpp +++ b/public/include/client-glue/WXMPFiles.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "client-glue/WXMP_Common.hpp" diff --git a/public/include/client-glue/WXMPIterator.hpp b/public/include/client-glue/WXMPIterator.hpp index b0e7624..ea8e619 100644 --- a/public/include/client-glue/WXMPIterator.hpp +++ b/public/include/client-glue/WXMPIterator.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "client-glue/WXMP_Common.hpp" diff --git a/public/include/client-glue/WXMPMeta.hpp b/public/include/client-glue/WXMPMeta.hpp index f507bd7..fa474aa 100644 --- a/public/include/client-glue/WXMPMeta.hpp +++ b/public/include/client-glue/WXMPMeta.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "client-glue/WXMP_Common.hpp" diff --git a/public/include/client-glue/WXMPUtils.hpp b/public/include/client-glue/WXMPUtils.hpp index 34db833..a3c3463 100644 --- a/public/include/client-glue/WXMPUtils.hpp +++ b/public/include/client-glue/WXMPUtils.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "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..79bf322 100644 --- a/public/include/client-glue/WXMP_Common.hpp +++ b/public/include/client-glue/WXMP_Common.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #ifndef XMP_Inline diff --git a/samples/build/cmake/CMakeLists.txt b/samples/build/cmake/CMakeLists.txt index 431e064..3361e55 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 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) 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..73f1578 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 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 "===========================================================================") + + diff --git a/samples/build/cmake/CustomSchema/CMakeLists.txt b/samples/build/cmake/CustomSchema/CMakeLists.txt index 7de7988..faaf454 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 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}) + + diff --git a/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt b/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt index 70b7724..508bab7 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 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}) + + diff --git a/samples/build/cmake/DumpFile/CMakeListsCommon.txt b/samples/build/cmake/DumpFile/CMakeListsCommon.txt index 66ba46b..a06d804 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 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}) + + diff --git a/samples/build/cmake/DumpMainXMP/CMakeLists.txt b/samples/build/cmake/DumpMainXMP/CMakeLists.txt index bdb6352..9984172 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 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}) + + + diff --git a/samples/build/cmake/DumpScannedXMP/CMakeLists.txt b/samples/build/cmake/DumpScannedXMP/CMakeLists.txt index bbdf1f3..6970c9a 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 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}) + + + diff --git a/samples/build/cmake/ModifyingXMP/CMakeLists.txt b/samples/build/cmake/ModifyingXMP/CMakeLists.txt index 26d1e09..bd163bb 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 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}) + + + diff --git a/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt b/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt index 93e7f50..cb50a41 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 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}) + + + diff --git a/samples/build/cmake/ReadingXMP/CMakeLists.txt b/samples/build/cmake/ReadingXMP/CMakeLists.txt index cb5ec36..e042d81 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 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}) + + + diff --git a/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt b/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt index d506981..2599385 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 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}) + + + diff --git a/samples/build/cmake/XMPCommand/CMakeListsCommon.txt b/samples/build/cmake/XMPCommand/CMakeListsCommon.txt index 478519d..22cc1f1 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 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}) + + + diff --git a/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt b/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt index 321dc1c..7e51548 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 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}) + + + diff --git a/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt b/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt index 749300a..58c015a 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 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}) + + + diff --git a/samples/build/cmake/XMPIterations/CMakeLists.txt b/samples/build/cmake/XMPIterations/CMakeLists.txt index 61f177c..39d865c 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 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}) + + + 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..4d285f2 100644 --- a/samples/source/CustomSchema.cpp +++ b/samples/source/CustomSchema.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. // ================================================================================================= /** diff --git a/samples/source/CustomSchemaNewDOM.cpp b/samples/source/CustomSchemaNewDOM.cpp index c1428ad..0f1a22c 100644 --- a/samples/source/CustomSchemaNewDOM.cpp +++ b/samples/source/CustomSchemaNewDOM.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. // ================================================================================================= /** diff --git a/samples/source/DumpMainXMP.cpp b/samples/source/DumpMainXMP.cpp index bf21274..c97d7ac 100644 --- a/samples/source/DumpMainXMP.cpp +++ b/samples/source/DumpMainXMP.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. // ================================================================================================= /** diff --git a/samples/source/DumpScannedXMP.cpp b/samples/source/DumpScannedXMP.cpp index 9d7e65e..f14f0dc 100644 --- a/samples/source/DumpScannedXMP.cpp +++ b/samples/source/DumpScannedXMP.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. // ================================================================================================= /** diff --git a/samples/source/ModifyingXMP.cpp b/samples/source/ModifyingXMP.cpp index df5c86f..0794d7c 100644 --- a/samples/source/ModifyingXMP.cpp +++ b/samples/source/ModifyingXMP.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. // ================================================================================================= /** diff --git a/samples/source/ModifyingXMPNewDOM.cpp b/samples/source/ModifyingXMPNewDOM.cpp index 73f5fb3..9ff2ebf 100644 --- a/samples/source/ModifyingXMPNewDOM.cpp +++ b/samples/source/ModifyingXMPNewDOM.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. // ================================================================================================= /** diff --git a/samples/source/ReadingXMP.cpp b/samples/source/ReadingXMP.cpp index c312535..c73df06 100644 --- a/samples/source/ReadingXMP.cpp +++ b/samples/source/ReadingXMP.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. // ================================================================================================= /** diff --git a/samples/source/ReadingXMPNewDOM.cpp b/samples/source/ReadingXMPNewDOM.cpp index 99d636a..5f7c16a 100644 --- a/samples/source/ReadingXMPNewDOM.cpp +++ b/samples/source/ReadingXMPNewDOM.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. // ================================================================================================= /** diff --git a/samples/source/XMPCoreCoverage.cpp b/samples/source/XMPCoreCoverage.cpp index 291bd27..7bb9f89 100644 --- a/samples/source/XMPCoreCoverage.cpp +++ b/samples/source/XMPCoreCoverage.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. // ================================================================================================= /** diff --git a/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp index 216369f..360a3a7 100644 --- a/samples/source/XMPFilesCoverage.cpp +++ b/samples/source/XMPFilesCoverage.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. // ================================================================================================= /** diff --git a/samples/source/XMPIterations.cpp b/samples/source/XMPIterations.cpp index 2ad2182..8b37946 100644 --- a/samples/source/XMPIterations.cpp +++ b/samples/source/XMPIterations.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. // ================================================================================================= /** diff --git a/samples/source/dumpfile/main.cpp b/samples/source/dumpfile/main.cpp index 847f2d7..9f670ed 100644 --- a/samples/source/dumpfile/main.cpp +++ b/samples/source/dumpfile/main.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. // ================================================================================================= // // diff --git a/samples/source/xmpcommand/Actions.cpp b/samples/source/xmpcommand/Actions.cpp index c8848f5..a99a597 100644 --- a/samples/source/xmpcommand/Actions.cpp +++ b/samples/source/xmpcommand/Actions.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. // ================================================================================================= // actions.cpp|h diff --git a/samples/source/xmpcommand/Actions.h b/samples/source/xmpcommand/Actions.h index f820f70..b0ab055 100644 --- a/samples/source/xmpcommand/Actions.h +++ b/samples/source/xmpcommand/Actions.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. +// 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..10a96a3 100644 --- a/samples/source/xmpcommand/PrintUsage.cpp +++ b/samples/source/xmpcommand/PrintUsage.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. // ================================================================================================= #include "samples/source/common/globals.h" diff --git a/samples/source/xmpcommand/PrintUsage.h b/samples/source/xmpcommand/PrintUsage.h index 4d5b7a6..97f742b 100644 --- a/samples/source/xmpcommand/PrintUsage.h +++ b/samples/source/xmpcommand/PrintUsage.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. +// 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..aecadd6 100644 --- a/samples/source/xmpcommand/XMPCommand.cpp +++ b/samples/source/xmpcommand/XMPCommand.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. // ================================================================================================= /** diff --git a/source/Endian.h b/source/Endian.h index c4fe9d9..123ceb9 100644 --- a/source/Endian.h +++ b/source/Endian.h @@ -5,9 +5,7 @@ * All Rights Reserved * * NOTICE: Adobe permits you to use, modify, and distribute this file in -* accordance with the terms of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +* accordance with the terms of the Adobe license agreement accompanying it. * **************************************************************************/ diff --git a/source/EndianUtils.hpp b/source/EndianUtils.hpp index 19d0224..48d9281 100644 --- a/source/EndianUtils.hpp +++ b/source/EndianUtils.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/source/ExpatAdapter.hpp b/source/ExpatAdapter.hpp index 33c9858..07f8e07 100644 --- a/source/ExpatAdapter.hpp +++ b/source/ExpatAdapter.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! diff --git a/source/Host_IO-POSIX.cpp b/source/Host_IO-POSIX.cpp index 435ca09..88bdd19 100644 --- a/source/Host_IO-POSIX.cpp +++ b/source/Host_IO-POSIX.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/source/Host_IO-Win.cpp b/source/Host_IO-Win.cpp index fd642a5..9000835 100644 --- a/source/Host_IO-Win.cpp +++ b/source/Host_IO-Win.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "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..1cdb3c2 100644 --- a/source/Host_IO.hpp +++ b/source/Host_IO.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! This must be the first include. diff --git a/source/IOUtils.cpp b/source/IOUtils.cpp index 0e0b66e..eb4e916 100644 --- a/source/IOUtils.cpp +++ b/source/IOUtils.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "source/IOUtils.hpp" diff --git a/source/IOUtils.hpp b/source/IOUtils.hpp index ad635c1..b61d209 100644 --- a/source/IOUtils.hpp +++ b/source/IOUtils.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= diff --git a/source/PerfUtils.cpp b/source/PerfUtils.cpp index f792f73..f4636b2 100644 --- a/source/PerfUtils.cpp +++ b/source/PerfUtils.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. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/source/PerfUtils.hpp b/source/PerfUtils.hpp index 051e10b..5df1bc8 100644 --- a/source/PerfUtils.hpp +++ b/source/PerfUtils.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" 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..3c34153 100644 --- a/source/UnicodeConversions.cpp +++ b/source/UnicodeConversions.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. // ================================================================================================= #include "public/include/XMP_Const.h" diff --git a/source/UnicodeConversions.hpp b/source/UnicodeConversions.hpp index 8d902fa..c6a179b 100644 --- a/source/UnicodeConversions.hpp +++ b/source/UnicodeConversions.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include <string> diff --git a/source/XIO.cpp b/source/XIO.cpp index aa72091..a60955b 100644 --- a/source/XIO.cpp +++ b/source/XIO.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/source/XIO.hpp b/source/XIO.hpp index 1d94158..ce8aab0 100644 --- a/source/XIO.hpp +++ b/source/XIO.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/source/XMLParserAdapter.hpp b/source/XMLParserAdapter.hpp index ef18732..df50cf2 100644 --- a/source/XMLParserAdapter.hpp +++ b/source/XMLParserAdapter.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first #include! diff --git a/source/XML_Node.cpp b/source/XML_Node.cpp index c5b6fe4..9d3114e 100644 --- a/source/XML_Node.cpp +++ b/source/XML_Node.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. // ================================================================================================= #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..5d31eb3 100644 --- a/source/XMPFiles_IO.cpp +++ b/source/XMPFiles_IO.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/source/XMPFiles_IO.hpp b/source/XMPFiles_IO.hpp index b44ce16..1f62176 100644 --- a/source/XMPFiles_IO.hpp +++ b/source/XMPFiles_IO.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/source/XMP_LibUtils.cpp b/source/XMP_LibUtils.cpp index 0ea5393..bca3cb7 100644 --- a/source/XMP_LibUtils.cpp +++ b/source/XMP_LibUtils.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. // ================================================================================================= #include "public/include/XMP_Environment.h" diff --git a/source/XMP_LibUtils.hpp b/source/XMP_LibUtils.hpp index 2deee13..c9fd002 100644 --- a/source/XMP_LibUtils.hpp +++ b/source/XMP_LibUtils.hpp @@ -6,9 +6,7 @@ // All Rights Reserved. // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! Must be the first include. diff --git a/source/XMP_ProgressTracker.cpp b/source/XMP_ProgressTracker.cpp index 0a66d55..54464df 100644 --- a/source/XMP_ProgressTracker.cpp +++ b/source/XMP_ProgressTracker.cpp @@ -4,9 +4,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/source/XMP_ProgressTracker.hpp b/source/XMP_ProgressTracker.hpp index 862fb64..cccad8a 100644 --- a/source/XMP_ProgressTracker.hpp +++ b/source/XMP_ProgressTracker.hpp @@ -7,9 +7,7 @@ // All Rights Reserved // // NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms -// of the Adobe license agreement accompanying it. If you have received this file from a source other -// than Adobe, then your use, modification, or distribution of it requires the prior written permission -// of Adobe. +// of the Adobe license agreement accompanying it. // ================================================================================================= #include "public/include/XMP_Environment.h" // ! XMP_Environment.h must be the first included header. diff --git a/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 |