Commit 52d51d5b authored by Rashad Kanavath's avatar Rashad Kanavath

Merge remote-tracking branch 'origin/release-5.6' into develop

parents 3a868e44 ad15fa29
......@@ -182,7 +182,7 @@ otb_add_test(NAME coTvExtractROITestMetaData_TIFF COMMAND otbImageBaseTestDriver
--compare-ascii ${NOTOL}
${TEMP}/coTvExtractROITestMetaData1.txt
${TEMP}/coTvExtractROITestMetaData2.txt
--ignore-lines-with 1 Origin:
--ignore-lines-with 4 Origin: Source: Image ImportImageContainer
otbExtractROITestMetaData
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
${TEMP}/coTvExtractROITestMetaData1.tif
......@@ -195,7 +195,7 @@ otb_add_test(NAME coTvExtractROITestMetaData_HDR COMMAND otbImageBaseTestDriver
--compare-ascii ${NOTOL}
${TEMP}/coTvExtractROITestMetaData1_hdr.txt
${TEMP}/coTvExtractROITestMetaData2_hdr.txt
--ignore-lines-with 1 Origin:
--ignore-lines-with 4 Origin: Source: Image ImportImageContainer
otbExtractROITestMetaData
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
${TEMP}/coTvExtractROITestMetaData1.hdr
......@@ -383,7 +383,7 @@ if(OTB_DATA_USE_LARGEINPUT)
#otb_add_test(NAME ioTvVectorImageReadingInfo_${current_type} COMMAND otbImageBaseTestDriver
#--ignore-order --compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvMultiResolutionReading_${current_type}.txt
#${TEMP}/ioTvMultiResolutionReading_${current_type}_OUT.txt
#--ignore-lines-with 4 CacheSizeInBytes SubDatasetIndex Driver Corner
#--ignore-lines-with 4 CacheSizeInBytes SubDatasetIndex Driver Corner
#otbVectorImageTest
#${current_file}?&resol=0
#${TEMP}/ioTvMultiResolutionReading_${current_type}_OUT.txt
......@@ -750,7 +750,7 @@ if(OTB_DATA_USE_LARGEINPUT)
-ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr
-ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT_ENVI2ENVI_2559_3591_337_280_2.hdr
-startX 0 -startY 0 -sizeX ParseHdfSubsetName337 -sizeY 280 )
set_tests_properties(ioTvMultiMonoChannelROI_RADARSAT_ENVI2ENVI PROPERTIES DEPENDS ioTvMultiMonoChannelROI_RADARSAT2ENVI)
endif()
......
......@@ -24,7 +24,15 @@
#include <string>
#include <cassert>
#if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter"
#include <mpi.h>
# pragma GCC diagnostic pop
#else
#include <mpi.h>
#endif
/**
* Call the MPI routine MPIFunc with arguments Args (surrounded by
......@@ -117,13 +125,13 @@ void MPIConfig::Init(int& argc, char** &argv, bool abortOnException) {
logError("Negative MPI rank");
abort(EXIT_FAILURE);
}
m_MyRank = static_cast<unsigned int>(irank);
// Get MPI NbProocs
int inbprocs=0;
OTB_MPI_CHECK_RESULT(MPI_Comm_size, (MPI_COMM_WORLD , &inbprocs));
if(inbprocs<1)
......@@ -160,4 +168,3 @@ void MPIConfig::logInfo(const std::string message) {
}
} // End namespace otb
......@@ -56,7 +56,15 @@
// SPTW
#include <algorithm>
#include <vector>
#if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter"
#include "sptw.h"
# pragma GCC diagnostic pop
#else
#include "sptw.h"
#endif
// GDAL-OTB datatype brigde
#include "otbGdalDataTypeBridge.h"
......
......@@ -9,16 +9,22 @@
//----------------------------------------------------------------------------
// $Id$
#if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
#include "ossimTerraSarXSarSensorModel.h"
# pragma GCC diagnostic pop
#else
#include "ossimTerraSarXSarSensorModel.h"
#endif
int main(int argc, char * argv[])
{
std::cout.precision(9);
if(argc != 4)
return EXIT_FAILURE;
std::string annotationXml = argv[2];
std::string geoXml = argv[3];
bool inverse = atoi(argv[1]);
......@@ -42,6 +48,6 @@ int main(int argc, char * argv[])
if(validate)
return EXIT_SUCCESS;
return EXIT_FAILURE;
}
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