diff --git a/.mailmap b/.mailmap
index 2886fdab7698af27f0ed90fbb6a3abbadcc2c68a..646d37da8900afc1a51623aca02a5ae49b2a3ba0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -84,6 +84,7 @@ Rémi Cresson <remi.cresson@irstea.fr> Rémi <remi.cresson@t
Rémi Cresson <remi.cresson@irstea.fr> remi <remi.cresson@irstea.fr>
Rémi Cresson <remi.cresson@irstea.fr> remi cresson <remi.cresson@teledetection.fr>
Rémi Cresson <remi.cresson@irstea.fr> remicres <remi.cresson@teledetection.fr>
+Rémi Cresson <remi.cresson@irstea.fr> remi cresson <remi.cresson@inrae.fr>
Sebastien Harasse <sebastien.harasse@c-s.fr>
Stephane Albert <stephane.albert@c-s.fr>
Stephane Albert <stephane.albert@c-s.fr> Stephane ALBERT <stephane.albert@c-s.fr>
diff --git a/CI/deploy.sh b/CI/deploy.sh
index b03391d3781a85dc79cca3662651479366d16a37..f05f5ebd04fd8bd612025a7e530115d27e5e9245 100755
--- a/CI/deploy.sh
+++ b/CI/deploy.sh
@@ -77,10 +77,18 @@ scp ref.sha otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/
#Untar doc
if [ "$CI_COMMIT_REF_NAME" = "develop" ]
then
+ #Cookbook
ssh otbpush@otb5-vm2.orfeo-toolbox.org \
- tar -xf ${jobs_directory}/CookBook-*-html.tar.gz -C ${jobs_directory}/
+ tar -xf ${jobs_directory}/CookBook-*-html.tar.gz -C ${jobs_directory}/
ssh otbpush@otb5-vm2.orfeo-toolbox.org \
- rm -rf /home/otbpush/test/CookBook/*
+ rm -rf /home/otbpush/test/CookBook/*
ssh otbpush@otb5-vm2.orfeo-toolbox.org \
- mv ${jobs_directory}/CookBook-*/* /home/otbpush/test/CookBook/.
+ mv ${jobs_directory}/CookBook-*/* /home/otbpush/test/CookBook/.
+
+ # Doxygen
+ ssh otbpush@otb5-vm2.orfeo-toolbox.org \
+ rm -rf /home/otbpush/test/Doxygen/*
+ # Strip first component of the tar (Doxygen/html/...)
+ ssh otbpush@otb5-vm2.orfeo-toolbox.org \
+ tar -xf ${jobs_directory}/OTB-Doxygen-*.tar.bz2 -C /home/otbpush/test/Doxygen/ --strip-components=1
fi
diff --git a/Documentation/Cookbook/rst/QGISInterface.rst b/Documentation/Cookbook/rst/QGISInterface.rst
index b2fa2a210feb69a2bb04037921713c78461ab299..a6875f33fc2fe9a8f7ef81563cee66b0549d6d49 100644
--- a/Documentation/Cookbook/rst/QGISInterface.rst
+++ b/Documentation/Cookbook/rst/QGISInterface.rst
@@ -1,61 +1,14 @@
QGIS interface
==============
-The OTB QGIS plugin provides a GUI for OTB applications directly into QGIS. Note that OTB is not distributed with the plugin and needs to be installed separately. Binary packages for OTB can be found on the [download page](https://www.orfeo-toolbox.org/download).
+OTB Applications are fully integrated in QGIS since QGIS 3.8.
+You can configure OTB for QGIS according to the:
-The plugin requires QGIS 3.2 or later, and is fully integrated within QGIS since version 3.8.
-
-This page explains how to setup the plugin with QGIS 3.8 or later. For QGIS version between 3.2 and 3.8 the instructions on this (page)[https://gitlab.orfeo-toolbox.org/orfeotoolbox/qgis-otb-plugin#otb-provider-for-qgis-processing] should be followed.
-
-
-Plugin configuration
---------------------
-
-
-Plugin activation
-^^^^^^^^^^^^^^^^^
-
-The plugin should be configured to find the OTB library :
-
-Open processing settings :
-
-
-`Settings -> Options -> Processing (left panel)`
-
-You can see OTB under "Providers":
-
-* Expand OTB tab
-* Tick Activate option
-* Set OTB folder. This is location of your OTB installation.
-* Set OTB application folder. This is location of your OTB applications. ``<OTB_FOLDER>/lib/otb/applications``
-* Click "ok" to save settings and close dialog. If settings are correct, you will have OTB algorithms loaded in Processing toolbox
-
-
-Documentation of OTB settings available in QGIS Processing
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Activate**: This is a checkbox to activate or deactivate OTB provider. Any invalid settings in OTB folder will uncheck this when saved.
-
-* **OTB folder**: This is the directory where OTB is available. Valid values are listed below.
-
-* **OTB application folder**: This is the location(s) of OTB applications. Multiple paths are allowed to use custom/proprietary OTB applications.
-
-* **Logger level** (optional): Level of logger to use by OTB applications. The level of logging controls the amount of details printed during algorithm execution.
-Possible values for logger level are INFO, WARNING, CRITICAL, DEBUG. You can refer to otb::Logger documentation for more on this values. This value is INFO by default. This is an advanced user configuration.
-
-* **Maximum RAM to use** (optional): by default OTB applications use system RAM as available. You can however instruct OTB to use a specific amount of RAM from available using this option.
-A value of 256 is ignored by OTB processing provider. This is an advanced user configuration.
-
-* **Geoid file** (optional): Path to geoid file. Value of this options is set for elev.dem.geoid and elev.geoid parameters in OTB applications.
-Setting this value globally help users to share it across multiple processing algorithms. This value is empty by default.
-
-* **SRTM tiles folder** (optional): Directory where SRTM tiles are available.
-SRTM data can be stored locally to avoid connecting to downloading of files during processing.
-Value of this options is set for elev.dem.path and elev.dem parameters in OTB applications.
-Setting this value globally help users to share it across multiple processing algorithms. This value is empty by default.
+- `QGIS Provider documentation for latest LTR <https://docs.qgis.org/latest/en/docs/user_manual/processing/3rdParty.html>`_.
+- `QGIS Provider documentation <https://docs.qgis.org/testing/en/docs/user_manual/processing/3rdParty.html>`_.
Compatibility between QGIS and OTB versions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-------------------------------------------
There are compatibility issues between the different versions of OTB and QGIS. Any version
of OTB compiled with GDAL 3.X is not compatible with QGIS 3.12 or below. This is the case
@@ -73,6 +26,27 @@ The table below summarizes which version of OTB can be used with which version o
| OTB 7.1.0 | Not Compatible | Compatible |
+---------------+-----------------+--------------------+
-Troubleshoot
-------------
-As of QGIS 3.8 the otb plugin is in the core. It might get messy if you have a previously installed plugin. Try to remove the old plugin before launching QGIS.
+Use OTB in old QGIS version (3.6 and less)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. warning:: Please consider upgrading your QGIS version.
+
+Since QGIS 3.8 and with 3.10 LTR version, the configuration of OTB Application is
+directly done in QGIS Provider (see above).
+
+If you use older version of QGIS (from 3.2 to 3.6), you need to install an
+additional plugin in order to use OTB applications. This plugin is available
+`here <https://gitlab.orfeo-toolbox.org/orfeotoolbox/qgis-otb-plugin>`_
+with specific installation instructions.
+
+Troubleshooting
+^^^^^^^^^^^^^^^
+As of QGIS 3.8 the OTB plugin is in the core. It might get messy if you
+have a previously installed plugin. Try to remove the old plugin before
+launching QGIS.
+
+
+Issue tracking
+^^^^^^^^^^^^^^
+If you encounter issues with integration of OTB application into QGIS,
+please `fill an issue <https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/new?issue[assignee_id]=&issue[milestone_id]=>`_ into the OTB issue tracker with `qgis` label.
diff --git a/Documentation/Cookbook/rst/index.rst b/Documentation/Cookbook/rst/index.rst
index 86acf4e88184b219f736fb51732477acc14f4a3f..cd109ff5c5ee53e3efbe2a98c943756879a95827 100644
--- a/Documentation/Cookbook/rst/index.rst
+++ b/Documentation/Cookbook/rst/index.rst
@@ -1,7 +1,7 @@
Welcome to Orfeo ToolBox!
=========================
-`Orfeo ToolBox (OTB) <http://orfeo-toolbox.org>`_ is an open-source project for
+`Orfeo ToolBox (OTB) <https://www.orfeo-toolbox.org/>`_ is an open-source project for
state-of-the-art remote sensing. Built on the shoulders of the open-source
geospatial community, it can process high resolution optical, multispectral and
radar images at the terabyte scale. A wide variety of applications are
@@ -32,7 +32,7 @@ joining `our community <https://www.orfeo-toolbox.org/community/>`_ and
For other documentation, be sure to read:
- OTB's website: `www.orfeo-toolbox.org <https://www.orfeo-toolbox.org/>`_
-- `Doxygen <http://orfeo-toolbox.org/doxygen/>`_, for exhaustive documentation
+- `Doxygen <https://www.orfeo-toolbox.org/doxygen/>`_, for exhaustive documentation
of the C++ API.
Table of Contents
diff --git a/Documentation/Cookbook/rst/recipes/pbclassif.rst b/Documentation/Cookbook/rst/recipes/pbclassif.rst
index 8a13d970b9ec03ff6d301b350060e1db8f166ab6..2524b6475a32c14030b43626c3eae91f3ea41115 100644
--- a/Documentation/Cookbook/rst/recipes/pbclassif.rst
+++ b/Documentation/Cookbook/rst/recipes/pbclassif.rst
@@ -475,7 +475,7 @@ to positive reference samples (either represented as a raster labeled
image or as a vector data containing the reference classes). It will
compute the confusion matrix and precision, recall and F-score of each
class too, based on the
-`ConfusionMatrixCalculator <http://www.orfeo-toolbox.org/doxygen-current/classotb_1_1ConfusionMatrixCalculator.html>`_
+`ConfusionMatrixCalculator <https://www.orfeo-toolbox.org/doxygen/classotb_1_1ConfusionMatrixCalculator.html>`_
class.
If you have made an unsupervised classification, it must be specified
diff --git a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
index 0412cf70bc94877f0a36306e3046d34892dc03f7..f5eb2ddf65c2d87859834deeb7efa49845bdc852 100644
--- a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
@@ -55,91 +55,121 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const
{
itkExceptionMacro("GetPhysicalBias not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const
{
itkExceptionMacro("GetPhysicalGain not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const
{
itkExceptionMacro("GetSolarIrradiance not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition day from the ossim metadata */
+ /** Get the imaging acquisition day from the ossim metadata
+ * \deprecated
+ */
int GetDay() const override
{
itkExceptionMacro("GetDay not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition month from the ossim metadata */
+ /** Get the imaging acquisition month from the ossim metadata
+ * \deprecated
+ */
int GetMonth() const override
{
itkExceptionMacro("GetMonth not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition year from the ossim metadata */
+ /** Get the imaging acquisition year from the ossim metadata
+ * \deprecated
+ */
int GetYear() const override
{
itkExceptionMacro("GetYear not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition hour from the ossim metadata */
+ /** Get the imaging acquisition hour from the ossim metadata
+ * \deprecated
+ */
int GetHour() const override
{
itkExceptionMacro("GetHour not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition minute from the ossim metadata */
+ /** Get the imaging acquisition minute from the ossim metadata
+ * \deprecated
+ */
int GetMinute() const override
{
itkExceptionMacro("GetMinute not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production day from the ossim metadata */
+ /** Get the imaging production day from the ossim metadata
+ * \deprecated
+ */
int GetProductionDay() const override
{
itkExceptionMacro("GetProductionDay not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production month from the ossim metadata */
+ /** Get the imaging production month from the ossim metadata
+ * \deprecated
+ */
int GetProductionMonth() const override
{
itkExceptionMacro("GetProductionMonth not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production year from the ossim metadata */
+ /** Get the imaging production year from the ossim metadata
+ * \deprecated
+ */
int GetProductionYear() const override
{
itkExceptionMacro("GetProductionYear not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const
{
itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const
{
itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the first wavelength for the spectral band definition */
+ /** Get the first wavelength for the spectral band definition
+ * \deprecated
+ */
VariableLengthVectorType GetFirstWavelengths() const
{
itkExceptionMacro("GetFirstWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
}
- /** Get the last wavelength for the spectral band definition */
+ /** Get the last wavelength for the spectral band definition
+ * \deprecated
+ */
VariableLengthVectorType GetLastWavelengths() const
{
itkExceptionMacro("GetLastWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
diff --git a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
index 279daa346fb79ebe0164c3ec4b55f00dcef64f26..b0c99846fbe000907b95729d9bc2338d4384b9af 100644
--- a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
@@ -53,43 +53,69 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override;
- /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
diff --git a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
index fcef22d014d416b02d44c64a2bc780b6fa8c9ef3..10091e070c27af3b3a308fde53f5730e72fb48d5 100644
--- a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
@@ -52,43 +52,69 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override;
- /** Get the imaging acquisition day from the ossim metadata : "Acquisition Date/Time" metadata variable */
+ /** Get the imaging acquisition day from the ossim metadata : "Acquisition Date/Time" metadata variable
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging acquisition month from the ossim metadata : "Acquisition Date/Time" metadata variable */
+ /** Get the imaging acquisition month from the ossim metadata : "Acquisition Date/Time" metadata variable
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging acquisition hour from the ossim metadata : "Acquisition Date/Time" metadata variable */
+ /** Get the imaging acquisition hour from the ossim metadata : "Acquisition Date/Time" metadata variable
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : "Creation Date" metadata variable */
+ /** Get the imaging production day from the ossim metadata : "Creation Date" metadata variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : "Creation Date" metadata variable */
+ /** Get the imaging production month from the ossim metadata : "Creation Date" metadata variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : "Creation Date" metadata variable */
+ /** Get the imaging production year from the ossim metadata : "Creation Date" metadata variable
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
diff --git a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
index 3f3bbff898419c99bed2df738a04b80843c7e465..05fd794b580c2f463a976c9ca97f44391f007406 100644
--- a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
+++ b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
@@ -144,16 +144,22 @@ public:
Please use bool GetSensorID(std::string& ) **/
std::string const GetSensorID() const;
- /** Get the sensor ID from the ossim metadata */
+ /** Get the sensor ID from the ossim metadata
+ * \deprecated
+ */
bool GetSensorID(std::string& sensorId) const;
// otbMetadataGetMacro(SensorID, std::string);
- /** Get the number of bands from the ossim metadata */
+ /** Get the number of bands from the ossim metadata
+ * \deprecated
+ */
UnsignedIntType GetNumberOfBands() const;
// otbMetadataGetMacro(NumberOfBands, unsigned int);
- /** Get the band name from the ossim metadata */
+ /** Get the band name from the ossim metadata
+ * \deprecated
+ */
StringVectorType GetBandName() const;
// otbMetadataGetMacro(BandName, std::vector<std::string>);
@@ -165,39 +171,57 @@ public:
double GetYPixelSpacing() const;
// otbMetadataGetMacro(YPixelSpacing, double);
- /** Get the imaging acquisition day from the ossim metadata */
+ /** Get the imaging acquisition day from the ossim metadata
+ * \deprecated
+ */
virtual int GetDay() const {return -1;}
// otbMetadataGetMacro(Day, int);
- /** Get the imaging acquisition month from the ossim metadata */
+ /** Get the imaging acquisition month from the ossim metadata
+ * \deprecated
+ */
virtual int GetMonth() const {return -1;}
// otbMetadataGetMacro(Month, int);
- /** Get the imaging acquisition year from the ossim metadata */
+ /** Get the imaging acquisition year from the ossim metadata
+ * \deprecated
+ */
virtual int GetYear() const {return -1;}
// otbMetadataGetMacro(Year, int);
- /** Get the imaging acquisition hour from the ossim metadata */
+ /** Get the imaging acquisition hour from the ossim metadata
+ * \deprecated
+ */
virtual int GetHour() const {return -1;}
// otbMetadataGetMacro(Hour, int);
- /** Get the imaging acquisition minute from the ossim metadata */
+ /** Get the imaging acquisition minute from the ossim metadata
+ * \deprecated
+ */
virtual int GetMinute() const {return -1;}
// otbMetadataGetMacro(Minute, int);
- /** Get the imaging production day from the ossim metadata */
+ /** Get the imaging production day from the ossim metadata
+ * \deprecated
+ */
virtual int GetProductionDay() const {return -1;}
// otbMetadataGetMacro(ProductionDay, int);
- /** Get the imaging production month from the ossim metadata */
+ /** Get the imaging production month from the ossim metadata
+ * \deprecated
+ */
virtual int GetProductionMonth() const {return -1;}
// otbMetadataGetMacro(ProductionMonth, int);
- /** Get the imaging production year from the ossim metadata */
+ /** Get the imaging production year from the ossim metadata
+ * \deprecated
+ */
virtual int GetProductionYear() const {return -1;}
// otbMetadataGetMacro(ProductionYear, int);
- /** Convert the band names provided by ossim to the official band names */
+ /** Convert the band names provided by ossim to the official band names
+ * \deprecated
+ */
virtual StringVectorType GetEnhancedBandNames() const {return StringVectorType();}
/** Get the 3 spectral band numbers corresponding to the default display for visualization,
diff --git a/Modules/Core/Metadata/include/otbNoDataHelper.h b/Modules/Core/Metadata/include/otbNoDataHelper.h
index c393976cc49e497d4a5bd49caa055991cd6a8851..8cfbc6748b65964692ef441166e90c44940e1113 100644
--- a/Modules/Core/Metadata/include/otbNoDataHelper.h
+++ b/Modules/Core/Metadata/include/otbNoDataHelper.h
@@ -37,12 +37,14 @@ namespace otb
/**
* Reads no data flag from the MetaDataDictionary dict to flags and values
* vectors. Returns true upon success.
+ * \deprecated
*/
bool OTBMetadata_EXPORT ReadNoDataFlags(const itk::MetaDataDictionary& dict, std::vector<bool>& flags, std::vector<double>& values);
/**
* Write no data flags to the MetaDataDictionary dict from flags and values
* vectors. Returns true upon success.
+ * \deprecated
*/
void OTBMetadata_EXPORT WriteNoDataFlags(const std::vector<bool>& flags, const std::vector<double>& values, itk::MetaDataDictionary& dict);
diff --git a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
index d86a3614b0f835e8cad8b4236feb1433614bd658..13feea529365ce9d4b024480217abceb0698fbc3 100644
--- a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
@@ -55,79 +55,105 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override
{
itkExceptionMacro("GetPhysicalBias not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override
{
itkExceptionMacro("GetPhysicalGain not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override
{
itkExceptionMacro("GetSolarIrradiance not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition day from the ossim metadata */
+ /** Get the imaging acquisition day from the ossim metadata
+ * \deprecated
+ */
int GetDay() const override
{
itkExceptionMacro("GetDay not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition month from the ossim metadata */
+ /** Get the imaging acquisition month from the ossim metadata
+ * \deprecated
+ */
int GetMonth() const override
{
itkExceptionMacro("GetMonth not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition year from the ossim metadata */
+ /** Get the imaging acquisition year from the ossim metadata
+ * \deprecated
+ */
int GetYear() const override
{
itkExceptionMacro("GetYear not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition hour from the ossim metadata */
+ /** Get the imaging acquisition hour from the ossim metadata
+ * \deprecated
+ */
int GetHour() const override
{
itkExceptionMacro("GetHour not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition minute from the ossim metadata */
+ /** Get the imaging acquisition minute from the ossim metadata
+ * \deprecated
+ */
int GetMinute() const override
{
itkExceptionMacro("GetMinute not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production day from the ossim metadata */
+ /** Get the imaging production day from the ossim metadata
+ * \deprecated
+ */
int GetProductionDay() const override
{
itkExceptionMacro("GetProductionDay not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production month from the ossim metadata */
+ /** Get the imaging production month from the ossim metadata
+ * \deprecated
+ */
int GetProductionMonth() const override
{
itkExceptionMacro("GetProductionMonth not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production year from the ossim metadata */
+ /** Get the imaging production year from the ossim metadata
+ * \deprecated
+ */
int GetProductionYear() const override
{
itkExceptionMacro("GetProductionYear not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override
{
itkExceptionMacro("GetSatElevation not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
}
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override
{
itkExceptionMacro("GetSatElevation not implemented in OpticalDefaultImageMetadataInterface, no captor type found");
diff --git a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
index 843e4c14a740977aa13641fc06ac9b8eb3c1dd45..1bf2aa461d6c09c0e0f89f2fcd9d1182e8d9b61d 100644
--- a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
@@ -57,25 +57,39 @@ public:
typedef otb::ObjectList<FilterFunctionValuesType> InternalWavelengthSpectralBandVectorType;
typedef InternalWavelengthSpectralBandVectorType::Pointer WavelengthSpectralBandVectorType;
- /** Get the sun elevation from the ossim metadata */
+ /** Get the sun elevation from the ossim metadata
+ * \deprecated
+ */
double GetSunElevation() const;
- /** Get the sun azimuth from the ossim metadata */
+ /** Get the sun azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSunAzimuth() const;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
virtual double GetSatElevation() const = 0;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
virtual double GetSatAzimuth() const = 0;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
virtual VariableLengthVectorType GetPhysicalBias() const = 0;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
virtual VariableLengthVectorType GetPhysicalGain() const = 0;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
virtual VariableLengthVectorType GetSolarIrradiance() const = 0;
/** Get the first wavelength for the spectral band definition */
diff --git a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
index 1fc6ee666718c22f89a40c275332029dbce94d22..c9c56bd6b40dc7c1a561074a310ef1393392aec6 100644
--- a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
@@ -53,43 +53,69 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override;
- /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
diff --git a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
index 82c7636ad0df7a4eda88bd20eee952c1a6447e6e..d4d0a353c0e30bbc2b3b807fc6a1627a4af7c59f 100644
--- a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
@@ -52,43 +52,69 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override;
- /** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging acquisition month from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition month from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging acquisition hour from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition hour from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : generationTime metadata value */
+ /** Get the imaging production day from the ossim metadata : generationTime metadata value
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : generationTime metadata value */
+ /** Get the imaging production month from the ossim metadata : generationTime metadata value
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : generationTime metadata value */
+ /** Get the imaging production year from the ossim metadata : generationTime metadata value
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
diff --git a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
index a50708de5e8fbb37a75e0b2ac8e549acc3833f88..91fb7893b1622c0d27d6cc8ead2b0e0dec4e5643 100644
--- a/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbRadarsat2ImageMetadataInterface.h
@@ -56,13 +56,19 @@ public:
// typedef Radarsat2CalibrationLookupData::Pointer LookupDataPointerType;
/*ImageMetadataInterfaceBase pure virtuals */
- /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionYear() const override;
/** check sensor ID */
diff --git a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
index 6965e3f32ee2eba47a09d2ef3280234153465308..a8319bcd20674d1c9ef900672e4057a7e0302f09 100644
--- a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
@@ -117,49 +117,65 @@ public:
itkExceptionMacro("GetRadiometricCalibrationNoisePolynomialDegree() not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition day from the ossim metadata */
+ /** Get the imaging acquisition day from the ossim metadata
+ * \deprecated
+ */
int GetDay() const override
{
itkExceptionMacro("GetDay not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition month from the ossim metadata */
+ /** Get the imaging acquisition month from the ossim metadata
+ * \deprecated
+ */
int GetMonth() const override
{
itkExceptionMacro("GetMonth not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition year from the ossim metadata */
+ /** Get the imaging acquisition year from the ossim metadata
+ * \deprecated
+ */
int GetYear() const override
{
itkExceptionMacro("GetYear not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition hour from the ossim metadata */
+ /** Get the imaging acquisition hour from the ossim metadata
+ * \deprecated
+ */
int GetHour() const override
{
itkExceptionMacro("GetHour not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging acquisition minute from the ossim metadata */
+ /** Get the imaging acquisition minute from the ossim metadata
+ * \deprecated
+ */
int GetMinute() const override
{
itkExceptionMacro("GetMinute not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production day from the ossim metadata */
+ /** Get the imaging production day from the ossim metadata
+ * \deprecated
+ */
int GetProductionDay() const override
{
itkExceptionMacro("GetProductionDay not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production month from the ossim metadata */
+ /** Get the imaging production month from the ossim metadata
+ * \deprecated
+ */
int GetProductionMonth() const override
{
itkExceptionMacro("GetProductionMonth not implemented in SarDefaultImageMetadataInterface, no captor type found");
}
- /** Get the imaging production year from the ossim metadata */
+ /** Get the imaging production year from the ossim metadata
+ * \deprecated
+ */
int GetProductionYear() const override
{
itkExceptionMacro("GetProductionYear not implemented in SarDefaultImageMetadataInterface, no captor type found");
diff --git a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
index 49520c8a22edb3f4fb8851bddaad429836330b6a..65bea26e399ca84f156e1c41813d9e0044dce458 100644
--- a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
@@ -57,13 +57,19 @@ public:
typedef Superclass::RealType RealType;
typedef Superclass::LookupDataPointerType LookupDataPointerType;
- /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionYear() const override;
/** check sensor ID */
diff --git a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
index 7df7fb193a70a4efc511139dc43177e516e34b6b..9fd5a17438d084721fc2bce27f4ad3196a626c2e 100644
--- a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
@@ -53,43 +53,69 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override;
- /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
diff --git a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
index 08148031b0b0b5172e56f801a06cc125f076943e..c0ad610f7ba9a341474a1f9af2c126fe7328c70e 100644
--- a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
@@ -53,52 +53,84 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override;
- /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
+ /** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ /** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override;
- /** Get the first wavelength for the spectral band definition */
+ /** Get the first wavelength for the spectral band definition
+ * \deprecated
+ */
VariableLengthVectorType GetFirstWavelengths() const override;
- /** Get the last wavelength for the spectral band definition */
+ /** Get the last wavelength for the spectral band definition
+ * \deprecated
+ */
VariableLengthVectorType GetLastWavelengths() const override;
- /** Get the enhanced band names (here nothing because the metadata did not provide band names) */
+ /** Get the enhanced band names (here nothing because the metadata did not provide band names)
+ * \deprecated
+ */
std::vector<std::string> GetEnhancedBandNames() const override
{
return this->Superclass::GetBandName();
diff --git a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
index dcaa62cee754014b79b04c2706d109eda6c4a1c5..032dd194adfc0a864f800cb84cb8760cda8b30c9 100644
--- a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
@@ -65,31 +65,49 @@ public:
typedef Superclass::PointSetPointer PointSetPointer;
typedef double RealType;
- /** Get the imaging start acquisition day from the ossim metadata */
+ /** Get the imaging start acquisition day from the ossim metadata
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging start acquisition month from the ossim metadata */
+ /** Get the imaging start acquisition month from the ossim metadata
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging start acquisition year from the ossim metadata */
+ /** Get the imaging start acquisition year from the ossim metadata
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging start acquisition hour from the ossim metadata */
+ /** Get the imaging start acquisition hour from the ossim metadata
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging start acquisition minute from the ossim metadata */
+ /** Get the imaging start acquisition minute from the ossim metadata
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : generationTime variable */
+ /** Get the imaging production day from the ossim metadata : generationTime variable
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : generationTime variable */
+ /** Get the imaging production month from the ossim metadata : generationTime variable
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : generationTime variable */
+ /** Get the imaging production year from the ossim metadata : generationTime variable
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the calibration.calFactor : generationTime variable */
+ /** Get the calibration.calFactor : generationTime variable
+ * \deprecated
+ */
double GetCalibrationFactor() const;
/** Get the number of noise records */
diff --git a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
index 3505c60afaac4bef8fb8dffb97f35e634dc99aa3..4def8580c1b86ddee87eed610167b7879a923c58 100644
--- a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
@@ -52,43 +52,69 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
- /** Get the radiometric bias from the ossim metadata */
+ /** Get the radiometric bias from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalBias() const override;
- /** Get the radiometric gain from the ossim metadata */
+ /** Get the radiometric gain from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetPhysicalGain() const override;
- /** Get the solar irradiance from the ossim metadata */
+ /** Get the solar irradiance from the ossim metadata
+ * \deprecated
+ */
VariableLengthVectorType GetSolarIrradiance() const override;
- /** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetDay() const override;
- /** Get the imaging acquisition month from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition month from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetMonth() const override;
- /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetYear() const override;
- /** Get the imaging acquisition hour from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition hour from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetHour() const override;
- /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
+ /** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value
+ * \deprecated
+ */
int GetMinute() const override;
- /** Get the imaging production day from the ossim metadata : generationTime metadata value */
+ /** Get the imaging production day from the ossim metadata : generationTime metadata value
+ * \deprecated
+ */
int GetProductionDay() const override;
- /** Get the imaging production month from the ossim metadata : generationTime metadata value */
+ /** Get the imaging production month from the ossim metadata : generationTime metadata value
+ * \deprecated
+ */
int GetProductionMonth() const override;
- /** Get the imaging production year from the ossim metadata : generationTime metadata value */
+ /** Get the imaging production year from the ossim metadata : generationTime metadata value
+ * \deprecated
+ */
int GetProductionYear() const override;
- /** Get the sat elevation from the ossim metadata */
+ /** Get the sat elevation from the ossim metadata
+ * \deprecated
+ */
double GetSatElevation() const override;
- /** Get the sat azimuth from the ossim metadata */
+ /** Get the sat azimuth from the ossim metadata
+ * \deprecated
+ */
double GetSatAzimuth() const override;
/** Get the first wavelength for the spectral band definition */
@@ -107,7 +133,9 @@ public:
* There values a computed by 6S. */
WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
- /** Get the enhanced band names from band names collected by ossim */
+ /** Get the enhanced band names from band names collected by ossim
+ * \deprecated
+ */
std::vector<std::string> GetEnhancedBandNames() const override;
protected:
diff --git a/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.hxx b/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.hxx
index 2f53952bab5a6deed52d2d2a8c0d13a023b430f7..06d141e7c3f246dac31ab4547c5db0a78780cb82 100644
--- a/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.hxx
+++ b/Modules/Filtering/Mosaic/include/otbStreamingMosaicFilterBase.hxx
@@ -321,18 +321,21 @@ void StreamingMosaicFilterBase<TInputImage, TOutputImage, TInternalValueType>::G
itk::EncapsulateMetaData<std::string>(mosaicMetaData, static_cast<std::string>(otb::MetaDataKey::ProjectionRefKey), projectionRef);
// check no data pixels
- if (m_NoDataOutputPixel.GetSize() != nbOfBands || m_NoDataInputPixel.GetSize() != nbOfBands)
+ if (m_NoDataInputPixel.GetSize() != nbOfBands)
{
- if (m_NoDataOutputPixel.GetSize() != 0)
- itkWarningMacro(<< "Specified NoDataOutputPixel has not " << nbOfBands << " components. Using default (zeros)");
if (m_NoDataInputPixel.GetSize() != 0)
itkWarningMacro(<< "Specified NoDataInputPixel has not " << nbOfBands << " components. Using default (zeros)");
- m_NoDataOutputPixel.SetSize(nbOfBands);
m_NoDataInputPixel.SetSize(nbOfBands);
- m_NoDataOutputPixel.Fill(itk::NumericTraits<OutputImageInternalPixelType>::Zero);
m_NoDataInputPixel.Fill(itk::NumericTraits<InputImageInternalPixelType>::Zero);
}
+ if (m_NoDataOutputPixel.GetSize() == 0)
+ {
+ itkWarningMacro(<< "NoDataOutputPixel not set. Using zeros");
+ m_NoDataOutputPixel.SetSize(nbOfBands);
+ m_NoDataOutputPixel.Fill(itk::NumericTraits<InputImageInternalPixelType>::Zero);
+ }
+
// Write no data flags
std::vector<bool> noDataValueAvailable;
@@ -444,4 +447,4 @@ void StreamingMosaicFilterBase<TInputImage, TOutputImage, TInternalValueType>::P
} // end namespace otb
-#endif
+#endif
\ No newline at end of file
diff --git a/SuperBuild/CMake/External_opencv.cmake b/SuperBuild/CMake/External_opencv.cmake
index d668a408756b8d3d766744851e4562afcfa6a28a..ae66793c987053680f42a7cdb7690c6cf754b2e4 100644
--- a/SuperBuild/CMake/External_opencv.cmake
+++ b/SuperBuild/CMake/External_opencv.cmake
@@ -125,5 +125,3 @@ ExternalProject_Add(OPENCV
)
SUPERBUILD_PATCH_SOURCE(OPENCV)
-
-set(_SB_OpenCV_DIR ${SB_INSTALL_PREFIX}/share/OpenCV)