Commit 77583d2a authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch 'develop' into 2159

parents 5217bf98 ebb01245
Pipeline #7424 failed with stages
in 26 minutes and 23 seconds
......@@ -56,7 +56,7 @@ if %3.==. (
)
if %4.==. (
set VCVER=14.0
set VCVER=14.20
) else (
set VCVER=%4
)
......
......@@ -21,5 +21,5 @@
# Configuration options for windows-10-x64-vc14.0.cmake
set(site_option
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc /D_ENABLE_EXTENDED_ALIGNED_STORAGE
")
......@@ -21,5 +21,5 @@
# Configuration options for windows-8.1-x64-vc14.0.cmake
set(site_option
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc /D_ENABLE_EXTENDED_ALIGNED_STORAGE
")
......@@ -21,5 +21,5 @@
# Configuration options for windows-8.1-x86-vc14.0.cmake
set(site_option
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc /D_ENABLE_EXTENDED_ALIGNED_STORAGE
")
......@@ -30,6 +30,7 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wshadow"
......@@ -309,7 +310,7 @@ ImageKeywordlist ReadGeometryFromImage(const std::string& filename, bool checkRp
ImageKeywordlist ReadGeometryFromGEOMFile(const std::string& filename)
{
ossimKeywordlist geom_kwl;
// ossimKeywordlist geom_kwl;
ImageKeywordlist otb_kwl;
ossimFilename ossimGeomFile = ossimFilename(filename);
......@@ -332,11 +333,17 @@ ImageKeywordlist ReadGeometryFromGEOMFile(const std::string& filename)
// {
// geom_kwl = kwl;
// }
geom_kwl = kwl;
otb_kwl.SetKeywordlist(kwl);
}
else
{
otb_kwl.SetKeywordlist(ossimKeywordlist());
}
}
otb_kwl.SetKeywordlist(geom_kwl);
else
{
otb_kwl.SetKeywordlist(ossimKeywordlist());
}
return otb_kwl;
}
......@@ -456,7 +463,7 @@ void WriteGeometry(const ImageKeywordlist& otb_kwl, const std::string& filename)
}
}
bool ImageKeywordlist::ReadGeometry(const std::string & path)
bool ImageKeywordlist::ReadGeometry(const std::string & /*path*/)
{
// The geom files used in OTB are simpler than what OSSIM actually supports
// It is basically a list of 'key: value' lines
......@@ -467,7 +474,7 @@ bool ImageKeywordlist::ReadGeometry(const std::string & path)
return false;
}
void ImageKeywordlist::WriteGeometry(const std::string& filename) const
void ImageKeywordlist::WriteGeometry(const std::string& /*filename*/) const
{
// Write the image keyword list if any (without using ossimKeywordlist)
// values in the keywordlist matching the regex '\n|\r| $|^ ' must be
......
......@@ -27,6 +27,7 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wshadow"
......
......@@ -27,6 +27,8 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wshadow"
......
......@@ -26,6 +26,7 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wshadow"
......
......@@ -27,6 +27,7 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wshadow"
......
......@@ -25,6 +25,7 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wshadow"
......
......@@ -27,7 +27,7 @@ string_view lstrip(string_view const& v, string_view const& c )
{
string_view::const_iterator pos = std::find_if(
v.cbegin(), v.cend(),
[&v, &c](char in) -> bool {return std::find(c.cbegin(),c.cend(),in) == c.cend();});
[&c](char in) -> bool {return std::find(c.cbegin(),c.cend(),in) == c.cend();});
// Beware: returned string_view may be empty
return string_view(pos, v.cend());
......@@ -37,7 +37,7 @@ string_view rstrip(string_view const& v, string_view const& c )
{
string_view::const_reverse_iterator pos = std::find_if(
v.crbegin(), v.crend(),
[&v, &c](char in) -> bool {return std::find(c.cbegin(),c.cend(),in) == c.cend();});
[&c](char in) -> bool {return std::find(c.cbegin(),c.cend(),in) == c.cend();});
// Beware: returned string_view may be empty
return string_view(v.cbegin(), &*pos - &(*v.cbegin()) + 1);
......
......@@ -158,7 +158,7 @@ public:
* There values a computed by 6S. */
WavelengthSpectralBandVectorType GetSpectralSensitivity() const override;
void Parse(ImageMetadata &);
void Parse(ImageMetadata &) override;
protected:
SpotImageMetadataInterface() = default;
......
......@@ -37,7 +37,7 @@ XMLMetadataSupplier::XMLMetadataSupplier(const std::string & fileName)
CPLDestroyXMLNode(psNode);
}
std::string XMLMetadataSupplier::GetMetadataValue(std::string const& path, bool& hasValue, int band) const
std::string XMLMetadataSupplier::GetMetadataValue(std::string const& path, bool& hasValue, int /*band*/) const
{
const char * ret = CSLFetchNameValue(m_MetadataDic, path.c_str());
if (ret)
......@@ -84,7 +84,7 @@ std::string XMLMetadataSupplier::GetFirstMetadataValue(std::string const& path,
}
}
std::string XMLMetadataSupplier::GetResourceFile(std::string const& s) const
std::string XMLMetadataSupplier::GetResourceFile(std::string const& /*s*/) const
{
return m_FileName;
}
......
......@@ -28,6 +28,7 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
......
......@@ -45,6 +45,7 @@
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wshadow"
......
......@@ -51,7 +51,7 @@ int otbRPCTransformTest(int itkNotUsed(argc), char* argv[])
std::string rpcFile(argv[1]);
std::string gcpFileName(argv[2]);
double geoTol(atof(argv[3]));
double imgTol(atof(argv[4]));
// double imgTol(atof(argv[4]));
// Tools
auto imgDistance = DistanceType::New();
......
......@@ -34,8 +34,6 @@ int otbImageToGenericRSOutputParameters(int itkNotUsed(argc), char* argv[])
const char* infname = argv[1];
const char* outfname = argv[2];
typedef ImageType::SizeType SizeType;
typedef ImageType::SpacingType SpacingType;
typedef otb::ImageFileReader<ImageType> ReaderType;
// Reader
......
......@@ -47,6 +47,8 @@ typedef otb::GeographicalDistance<ImageType::PointType> Geographi
int produceGCP(char* outputgcpfilename, const otb::ImageMetadata& imd, bool useForwardSensorModel = true, double z = 16.19688987731934)
{
(void)useForwardSensorModel;
itk::Point<double, 2> imagePoint;
itk::Point<double, 2> geoPoint;
......
......@@ -430,7 +430,7 @@ void VectorDataExtractROI<TVectorData>::ProjectRegionToInputVectorProjection()
genericTransform->SetInputProjectionRef(m_ROI.GetRegionProjection());
//TODO: genericTransform->SetInputImageMetadata(m_ROI.GetImageMetadata());
genericTransform->SetOutputProjectionRef(this->GetInput()->GetProjectionRef());
const itk::MetaDataDictionary& inputDict = this->GetInput()->GetMetaDataDictionary();
//TODO: const itk::MetaDataDictionary& inputDict = this->GetInput()->GetMetaDataDictionary();
//TODO: genericTransform->SetOutputImageMetadata(this->GetInput()->GetImageMetadata());
genericTransform->SetOutputOrigin(this->GetInput()->GetOrigin());
genericTransform->SetOutputSpacing(this->GetInput()->GetSpacing());
......
......@@ -24,8 +24,12 @@
#include "otbMachineLearningModel.h"
#include <string>
// Quiet a deprecation warning
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
......@@ -70,10 +74,10 @@ template <class TInputValue, class NeuronType>
class ITK_EXPORT AutoencoderModel : public MachineLearningModel<itk::VariableLengthVector<TInputValue>, itk::VariableLengthVector<TInputValue>>
{
public:
typedef AutoencoderModel Self;
typedef AutoencoderModel Self;
typedef MachineLearningModel<itk::VariableLengthVector<TInputValue>, itk::VariableLengthVector<TInputValue>> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::InputValueType InputValueType;
typedef typename Superclass::InputSampleType InputSampleType;
......@@ -91,7 +95,7 @@ public:
typedef typename Superclass::ProbaSampleType ProbaSampleType;
typedef typename Superclass::ProbaListSampleType ProbaListSampleType;
/// Neural network related typedefs
typedef shark::ConcatenatedModel<shark::RealVector> ModelType;
typedef shark::ConcatenatedModel<shark::RealVector> ModelType;
typedef shark::LinearModel<shark::RealVector, NeuronType> LayerType;
typedef shark::LinearModel<shark::RealVector, shark::LinearNeuron> OutLayerType;
......
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