Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
Merge Adobe SDK CC 2016.07
|
|
|
|
|
|
-Remove INCLUDES
-Use subdir-objects
-Remove conditionals
|
|
|
|
|
|
Conflicts:
XMPFiles/source/FileHandlers/MP3_Handler.cpp
XMPFiles/source/FileHandlers/UCF_Handler.hpp
public/include/XMP_Const.h
samples/source/common/TagTree.cpp
|
|
|
|
|
|
|
|
Merge branch 'adobe-sdk' into cc-2013.06-integration
Conflicts:
XMPCore/source/XMPMeta.cpp
XMPCore/source/XMPMeta.hpp
XMPFiles/source/FormatSupport/TIFF_FileWriter.cpp
XMPFiles/source/PluginHandler/XMPAtoms.h
public/include/XMP_Const.h
samples/source/DumpMainXMP.cpp
samples/source/DumpScannedXMP.cpp
samples/source/XMPCoreCoverage.cpp
samples/source/XMPFilesCoverage.cpp
samples/source/common/LargeFileAccess.cpp
samples/source/common/globals.h
source/EndianUtils.hpp
|
|
|
|
|
|
|
|
Put back GIF definition until the GIF Handler is ported to the new API
|
|
This bring the CS6 version of the SDK to Exempi
Adapt the build system.
GIF support is currently disabled.
Conflicts:
XMPCore/source/XMPCore_Impl.hpp
XMPFiles/source/FileHandlers/AVCHD_Handler.cpp
XMPFiles/source/FileHandlers/MPEG4_Handler.cpp
XMPFiles/source/FileHandlers/P2_Handler.cpp
XMPFiles/source/FileHandlers/PSD_Handler.hpp
XMPFiles/source/FileHandlers/PostScript_Handler.cpp
XMPFiles/source/FileHandlers/SonyHDV_Handler.cpp
XMPFiles/source/FileHandlers/UCF_Handler.hpp
XMPFiles/source/FileHandlers/XDCAMEX_Handler.cpp
XMPFiles/source/FileHandlers/XDCAM_Handler.cpp
XMPFiles/source/FormatSupport/PSIR_Support.hpp
XMPFiles/source/XMPFiles.hpp
XMPFiles/source/XMPFiles_Impl.cpp
XMPFiles/source/XMPFiles_Impl.hpp
samples/source/common/DumpFile.cpp
samples/source/common/LargeFileAccess.cpp
samples/source/common/LargeFileAccess.hpp
samples/source/common/Log.cpp
source/XMPFiles/FormatSupport/ID3_Support.hpp
source/XMPFiles/XMPFiles.cpp
source/XMP_LibUtils.cpp
|
|
|
|
|
|
|
|
Conflicts:
public/include/TXMPMeta.hpp
public/include/XMP_Const.h
public/include/client-glue/TXMPMeta.incl_cpp
public/include/client-glue/WXMPMeta.hpp
samples/source/XMPCoreCoverage.cpp
samples/source/XMPScanner.cpp
source/XMPCore/WXMPMeta.cpp
source/XMPCore/XMPIterator.cpp
source/XMPCore/XMPMeta.cpp
source/XMPCore/XMPMeta.hpp
source/XMPCore/XMPUtils.cpp
source/XMPFiles/FileHandlers/MP3_Handler.cpp
source/XMPFiles/FileHandlers/MP3_Handler.hpp
source/XMPFiles/FileHandlers/P2_Handler.cpp
source/XMPFiles/FileHandlers/TIFF_Handler.cpp
source/XMPFiles/FileHandlers/UCF_Handler.cpp
source/XMPFiles/FileHandlers/WAV_Handler.cpp
source/XMPFiles/FileHandlers/WAV_Handler.hpp
source/XMPFiles/FormatSupport/ID3_Support.cpp
source/XMPFiles/FormatSupport/ID3_Support.hpp
source/XMPFiles/FormatSupport/RIFF_Support.cpp
source/XMPFiles/FormatSupport/RIFF_Support.hpp
source/XMPFiles/FormatSupport/ReconcileTIFF.cpp
source/XMPFiles/FormatSupport/Reconcile_Impl.cpp
source/XMPFiles/FormatSupport/Reconcile_Impl.hpp
source/XMPFiles/FormatSupport/TIFF_MemoryReader.cpp
source/XMPFiles/FormatSupport/TIFF_Support.hpp
source/XMPFiles/XMPFiles.cpp
source/XMPFiles/XMPFiles.hpp
source/common/LargeFileAccess.hpp
|
|
|
|
- Add missing includes to fix FTBFS with GCC 4.4. See Debian
Bug#504944
Signed-off-by: Hubert Figuiere <hub@figuiere.net>
|
|
samples/testfiles/Makefile.am: Forgotten files.
|
|
merging the SDK 4.4.2
|
|
Conflicts:
public/include/TXMPMeta.hpp
public/include/XMP_Const.h
samples/source/XMPScanner.cpp
source/XMPCore/XMPUtils.cpp
source/XMPFiles/FileHandlers/TIFF_Handler.cpp
source/XMPFiles/FormatSupport/ReconcileTIFF.cpp
source/XMPFiles/FormatSupport/Reconcile_Impl.cpp
source/XMPFiles/FormatSupport/TIFF_FileWriter.cpp
source/XMPFiles/FormatSupport/TIFF_MemoryReader.cpp
source/XMPFiles/XMPFiles.cpp
source/XMPFiles/XMPFiles_Impl.cpp
source/common/EndianUtils.hpp
|
|
|
|
samples/source/XMPCoreCoverage.cpp,
source/XMPFiles/FormatSupport/ReconcileTIFF.cpp:
Some APIs use long and long long. Change that.
(UPSTREAM)
|
|
|
|
(UPSTREAM)
|
|
|
|
(UPSTREAM)
|
|
|
|
|
|
|
|
|
|
|
|
|