Skip to content
Snippets Groups Projects

Resolve "Migrate code to OTB 8.x"

Merged Luc Hermitte requested to merge 5-migrate-code-to-otb-8-x into master
Files
2
@@ -22,7 +22,7 @@
#define otbSARDEMPolygonsAnalysisImageFilter2_h
#include "otbSpan.h"
#if defined(DRAFT_OTB8) || OTB_VERSION_MAJOR >= 8
#if OTB_VERSION_MAJOR >= 8
#else
#include "otbImageKeywordlist.h"
#endif
@@ -152,7 +152,7 @@ public:
using OutputOptIterator = itk::ImageRegionIterator< ImageOutType >;
// Setter
#if defined(DRAFT_OTB8) || OTB_VERSION_MAJOR >= 8
#if OTB_VERSION_MAJOR >= 8
void SetSARImageMetadata(ImageMetadata sarImageKWL);
#else
void SetSARImageKeyWorList(ImageKeywordlist const& sarImageKWL);
@@ -249,7 +249,7 @@ private:
// DEM Image (only metadata)
ImageDEMPointer m_DemImagePtr;
#if defined(DRAFT_OTB8) || OTB_VERSION_MAJOR >= 8
#if OTB_VERSION_MAJOR >= 8
// SAR Image metadata
ImageMetadata m_SarImageKwl;
#else
Loading