Commit 93e16feb authored by Guillaume Pasero's avatar Guillaume Pasero

Merge branch '1990-move-to-OTBMetadata' into 'develop'

Resolve "Move FilterFunctionValues and MetadataKey to OTBMetadata"

Closes #1990

See merge request !651
parents e472b712 e4ec6e4f
Pipeline #3304 failed with stages
in 84 minutes and 14 seconds
......@@ -24,8 +24,6 @@ set(OTBOSSIMAdapters_SRC
otbSensorModelAdapter.cxx
otbRPCSolverAdapter.cxx
otbDateTimeAdapter.cxx
otbFilterFunctionValues.cxx
otbMetaDataKey.cxx
otbEllipsoidAdapter.cxx
otbSarSensorModelAdapter.cxx
)
......
......@@ -27,7 +27,7 @@
#include "itkObjectFactory.h"
#include "itkMacro.h"
#include "OTBOSSIMAdaptersExport.h"
#include "OTBMetadataExport.h"
namespace otb
{
......@@ -39,9 +39,9 @@ namespace otb
*
* \ingroup IO
*
* \ingroup OTBOSSIMAdapters
* \ingroup OTBMetadata
*/
class OTBOSSIMAdapters_EXPORT FilterFunctionValues : public itk::DataObject
class OTBMetadata_EXPORT FilterFunctionValues : public itk::DataObject
{
public:
/** Standard typedefs */
......
......@@ -26,7 +26,7 @@
#include "itkDataObject.h"
#include "itkVariableLengthVector.h"
#include "OTBOSSIMAdaptersExport.h"
#include "OTBMetadataExport.h"
namespace otb
{
......@@ -35,46 +35,46 @@ namespace otb
*/
namespace MetaDataKey
{
extern OTBOSSIMAdapters_EXPORT char const* DriverShortNameKey;
extern OTBOSSIMAdapters_EXPORT char const* DriverLongNameKey;
extern OTBMetadata_EXPORT char const* DriverShortNameKey;
extern OTBMetadata_EXPORT char const* DriverLongNameKey;
extern OTBOSSIMAdapters_EXPORT char const* ProjectionRefKey;
extern OTBMetadata_EXPORT char const* ProjectionRefKey;
extern OTBOSSIMAdapters_EXPORT char const* GCPProjectionKey;
extern OTBOSSIMAdapters_EXPORT char const* GCPParametersKey;
extern OTBOSSIMAdapters_EXPORT char const* GCPCountKey;
extern OTBMetadata_EXPORT char const* GCPProjectionKey;
extern OTBMetadata_EXPORT char const* GCPParametersKey;
extern OTBMetadata_EXPORT char const* GCPCountKey;
extern OTBOSSIMAdapters_EXPORT char const* GeoTransformKey;
extern OTBMetadata_EXPORT char const* GeoTransformKey;
extern OTBOSSIMAdapters_EXPORT char const* MetadataKey;
extern OTBOSSIMAdapters_EXPORT char const* SubMetadataKey;
extern OTBMetadata_EXPORT char const* MetadataKey;
extern OTBMetadata_EXPORT char const* SubMetadataKey;
extern OTBOSSIMAdapters_EXPORT char const* UpperLeftCornerKey;
extern OTBOSSIMAdapters_EXPORT char const* UpperRightCornerKey;
extern OTBOSSIMAdapters_EXPORT char const* LowerLeftCornerKey;
extern OTBOSSIMAdapters_EXPORT char const* LowerRightCornerKey;
extern OTBMetadata_EXPORT char const* UpperLeftCornerKey;
extern OTBMetadata_EXPORT char const* UpperRightCornerKey;
extern OTBMetadata_EXPORT char const* LowerLeftCornerKey;
extern OTBMetadata_EXPORT char const* LowerRightCornerKey;
extern OTBOSSIMAdapters_EXPORT char const* ColorTableNameKey;
extern OTBOSSIMAdapters_EXPORT char const* ColorEntryCountKey;
extern OTBOSSIMAdapters_EXPORT char const* ColorEntryAsRGBKey;
extern OTBMetadata_EXPORT char const* ColorTableNameKey;
extern OTBMetadata_EXPORT char const* ColorEntryCountKey;
extern OTBMetadata_EXPORT char const* ColorEntryAsRGBKey;
extern OTBOSSIMAdapters_EXPORT char const* OSSIMKeywordlistKey;
extern OTBOSSIMAdapters_EXPORT char const* OSSIMKeywordlistDelimiterKey;
extern OTBMetadata_EXPORT char const* OSSIMKeywordlistKey;
extern OTBMetadata_EXPORT char const* OSSIMKeywordlistDelimiterKey;
extern OTBOSSIMAdapters_EXPORT char const* VectorDataKeywordlistKey;
extern OTBOSSIMAdapters_EXPORT char const* VectorDataKeywordlistDelimiterKey;
extern OTBMetadata_EXPORT char const* VectorDataKeywordlistKey;
extern OTBMetadata_EXPORT char const* VectorDataKeywordlistDelimiterKey;
extern OTBOSSIMAdapters_EXPORT char const* ResolutionFactor;
extern OTBOSSIMAdapters_EXPORT char const* SubDatasetIndex;
extern OTBOSSIMAdapters_EXPORT char const* CacheSizeInBytes;
extern OTBMetadata_EXPORT char const* ResolutionFactor;
extern OTBMetadata_EXPORT char const* SubDatasetIndex;
extern OTBMetadata_EXPORT char const* CacheSizeInBytes;
extern OTBOSSIMAdapters_EXPORT char const* TileHintX;
extern OTBOSSIMAdapters_EXPORT char const* TileHintY;
extern OTBMetadata_EXPORT char const* TileHintX;
extern OTBMetadata_EXPORT char const* TileHintY;
extern OTBOSSIMAdapters_EXPORT char const* NoDataValueAvailable;
extern OTBOSSIMAdapters_EXPORT char const* NoDataValue;
extern OTBMetadata_EXPORT char const* NoDataValueAvailable;
extern OTBMetadata_EXPORT char const* NoDataValue;
extern OTBOSSIMAdapters_EXPORT char const* DataType;
extern OTBMetadata_EXPORT char const* DataType;
enum KeyType
......@@ -110,7 +110,7 @@ struct KeyTypeDef
}
};
KeyType OTBOSSIMAdapters_EXPORT GetKeyType(const std::string& name);
KeyType OTBMetadata_EXPORT GetKeyType(const std::string& name);
typedef std::vector<double> VectorType;
typedef std::vector<bool> BoolVectorType;
......@@ -123,9 +123,9 @@ typedef itk::VariableLengthVector<double> VariableLengthVectorType;
* in OTB.
*
*
* \ingroup OTBOSSIMAdapters
* \ingroup OTBMetadata
*/
class OTBOSSIMAdapters_EXPORT OTB_GCP
class OTBMetadata_EXPORT OTB_GCP
{
public:
/** Unique identifier, often numeric */
......
......@@ -66,6 +66,8 @@ set(OTBMetadata_SRC
otbRadarsat2ImageMetadataInterface.cxx
otbNoDataHelper.cxx
otbFilterFunctionValues.cxx
otbMetaDataKey.cxx
)
add_library(OTBMetadata ${OTBMetadata_SRC})
......
......@@ -29,6 +29,7 @@ ENABLE_SHARED
OTBCommon
OTBITK
OTBImageBase
OTBMetadata
OTBOSSIMAdapters
OTBObjectList
......
......@@ -31,6 +31,7 @@ otb_module(OTBTransform
OTBITK
OTBInterpolation
OTBOSSIMAdapters
OTBMetadata
OTBGdalAdapters
TEST_DEPENDS
OTBImageBase
......
......@@ -28,7 +28,7 @@ ENABLE_SHARED
OTBGDAL
OTBITK
OTBImageBase
OTBOSSIMAdapters
OTBMetadata
OTBObjectList
TEST_DEPENDS
......
......@@ -26,6 +26,7 @@ otb_module(OTBMajorityVoting
DEPENDS
OTBITK
OTBOSSIMAdapters
OTBMetadata
TEST_DEPENDS
OTBTestKernel
......
......@@ -32,6 +32,7 @@ ENABLE_SHARED
OTBTinyXML
OTBGDAL
OTBBoostAdapters
OTBMetadata
OTBOSSIMAdapters
TEST_DEPENDS
......
......@@ -29,6 +29,7 @@ otb_module(OTBIOKML
OTBGDAL
OTBCommon
OTBOSSIMAdapters
OTBMetadata
OTBITK
TEST_DEPENDS
......
......@@ -36,6 +36,7 @@ otb_module(OTBImageIO
OTBITK
OTBImageBase
OTBOSSIMAdapters
OTBMetadata
OTBObjectList
OTBStreaming
......
......@@ -27,6 +27,7 @@ otb_module(OTBKMZWriter
OTBImageBase
OTBImageIO
OTBImageManipulation
OTBMetadata
OTBOSSIMAdapters
OTBTransform
OTBVectorDataBase
......
......@@ -33,6 +33,7 @@ otb_module(OTBTestKernel
OTBImageBase
OTBCommon
OTBGDAL
OTBMetadata
OTBOSSIMAdapters
OTBImageManipulation
......
......@@ -29,6 +29,7 @@ otb_module(OTBVectorDataIO
OTBITK
OTBVectorDataManipulation
OTBCommon
OTBMetadata
OPTIONAL_DEPENDS
OTBIOKML
......
......@@ -34,6 +34,7 @@ otb_module(OTBDempsterShafer
OTBCommon
OTBFuzzy
OTBMathParser
OTBMetadata
TEST_DEPENDS
OTBVectorDataIO
......
......@@ -33,6 +33,7 @@ otb_module(OTBMPITiffWriter
OTBOSSIMAdapters
OTBSPTW
OTBStreaming
OTBMetadata
OTBMPI
OTBMPIConfig
TEST_DEPENDS
......
......@@ -33,7 +33,6 @@ ENABLE_SHARED
OTBImageBase
OTBImageManipulation
OTBMetadata
OTBOSSIMAdapters
OTBObjectList
TEST_DEPENDS
......
......@@ -37,6 +37,7 @@ ENABLE_SHARED
OTBBoostAdapters
OTBOSSIMAdapters
OTBITK
OTBMetadata
OPTIONAL_DEPENDS
OTBMPIVrtWriter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment