Skip to content

GitLab

otb
otb
Commit 7061435a authored by Julien Malik's avatar Julien Malik
Browse files
Options

STYLE: more non ascii characters

parent 156358bc
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 31 deletions
Code/Projections/otbGroundSpacingImageFunction.h
View file @ 7061435a
......@@ -33,7 +33,7 @@ namespace otb
* \brief Calculate the approximate ground spacing in X and Y directions
*
* This uses the 'Haversine' formula to calculate great-circle distances between
* the two points – that is, the shortest distance over the Earth's surface –
* the two points (that is, the shortest distance over the Earth's surface)
* giving an 'as-the-crow-flies' distance between the points (ignoring any hills!).
*
* \ingroup ImageFunctions
......
Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
View file @ 7061435a
......@@ -53,8 +53,6 @@ int otbImageToSURFKeyPointSetFilterOutputDescriptorAscii(int argc, char * argv[]
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
typedef otb::ImageToSURFKeyPointSetFilter<ImageType, PointSetType> ImageToSURFKeyPointSetFilterType;
// PointSet iterator types
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
View file @ 7061435a
......@@ -54,8 +54,6 @@ int otbImageToSURFKeyPointSetFilterOutputInterestPointAscii(int argc, char * arg
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef itk::PointSet<RealVectorType, Dimension> PointSetType;
typedef otb::ImageToSURFKeyPointSetFilter<ImageType, PointSetType> ImageToSURFKeyPointSetFilterType;
// PointSet iterator types
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
typedef PointSetType::PointDataContainer PointDataContainerType;
......
Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
View file @ 7061435a
......@@ -35,9 +35,8 @@ int otbLineCorrelationDetectorLinear(int argc, char* argv[])
const char * outputFilename1 = argv[2];
const char * outputFilename2 = argv[3];
// Largeur de la ligne � detecter = 2*WidthLine+1
// Parameters of the line to detect
unsigned int WidthLine((unsigned int) ::atoi(argv[4]));
// Longueur de la ligne � detecter = 2*LengthLine+1
unsigned int LengthLine((unsigned int) ::atoi(argv[5]));
typedef unsigned char InputPixelType;
......
Testing/Utilities/CMakeLists.txt
View file @ 7061435a
......@@ -176,13 +176,13 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# ------- lib Galib ------------------------------
# FOREACH(num 1 12 14 16 17 25 27)
# ADD_TEST( utTuGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTuGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# galibTests${num}
# seed 555 )
# ENDFOREACH(num)
# FOREACH(num 6 8 19 20)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-ascii ${NOTOL}
# ${BASELINE_FILES}/utGalibTest${num}_bog.dat
# ${TEMP}/utGalibTest${num}_bog.dat
......@@ -191,7 +191,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# seed 555 )
# ENDFOREACH(num)
# FOREACH(num 2 4 9 11 15)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-ascii ${NOTOL}
# ${BASELINE_FILES}/utGalibTest${num}_bog.dat
# ${TEMP}/utGalibTest${num}_bog.dat
......@@ -203,7 +203,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# SET(num 13)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-ascii ${NOTOL}
# ${BASELINE_FILES}/utGalibTest${num}_bog.dat
# ${TEMP}/utGalibTest${num}_bog.dat
......@@ -213,7 +213,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# seed 555 )
# FOREACH(num 3 18)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-ascii ${NOTOL}
# ${BASELINE_FILES}/utGalibTest${num}_bog.dat
# ${TEMP}/utGalibTest${num}_bog.dat
......@@ -225,7 +225,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# ENDFOREACH(num)
# SET(num 5)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-ascii ${NOTOL}
# ${BASELINE_FILES}/utGalibTest${num}_bog.dat
# ${TEMP}/utGalibTest${num}_bog.dat
......@@ -237,7 +237,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# Test 7 commented becasue impossible to specific he bog.dat file name in the process ;-(
#SET(num 7)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-ascii ${NOTOL}
# ${BASELINE_FILES}/utGalibTest${num}_bog.dat
# ${TEMP}/utGalibTest${num}_bog.dat
......@@ -249,7 +249,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# SET(num 10)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-n-ascii ${NOTOL} 4
# ${BASELINE_FILES}/utGalibTest${num}_sinusoid.dat
# ${TEMP}/utGalibTest${num}_sinusoid.dat
......@@ -267,7 +267,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# seed 555 )
# SET(num 21)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-n-ascii ${NOTOL} 5
# ${BASELINE_FILES}/utGalibTest${num}_bog1.dat
# ${TEMP}/utGalibTest${num}_bog1.dat
......@@ -289,7 +289,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# SET(num 22)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-n-ascii ${NOTOL} 4
# ${BASELINE_FILES}/utGalibTest${num}_sinusoid.dat
# ${TEMP}/utGalibTest${num}_sinusoid.dat
......@@ -307,7 +307,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# seed 555 )
# SET(num 23)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-n-ascii ${NOTOL} 4
# ${BASELINE_FILES}/utGalibTest${num}_popi.dat
# ${TEMP}/utGalibTest${num}_popi.dat
......@@ -325,7 +325,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# seed 555 )
# SET(num 24)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# --compare-n-ascii ${NOTOL} 3
# ${BASELINE_FILES}/utGalibTest${num}_population.dat
# ${TEMP}/utGalibTest${num}_population.dat
......@@ -341,7 +341,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
# seed 555 )
# SET(num 26)
# ADD_TEST( utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# ADD_TEST(utTvGalibTest${num} ${CXX_TEST_PATH}/otbGalibTests${num}
# galibTests${num}
# ${INPUTDATA}/galib-tsp_rect_20.txt
# seed 555 )
......@@ -420,24 +420,24 @@ FOREACH(id_test createkml helloattrs helloenum hellofolder hellogeometry hellore
ENDFOREACH(id_test)
ADD_TEST( utTvKmlhellofeatures ${UTILITIES_TESTS}
ADD_TEST(utTvKmlhellofeatures ${UTILITIES_TESTS}
kmlhellofeatures
${INPUTDATA}/MODIS20040214212340.kml #abstractview.kml
# ${TEMP}/utkmlhellofeatures.txt
)
ADD_TEST( utTvKmlhellohref ${UTILITIES_TESTS}
ADD_TEST(utTvKmlhellohref ${UTILITIES_TESTS}
kmlhellohref
${INPUTDATA}/abstractview.kml
# ${TEMP}/utkmlhellohref.txt
)
ADD_TEST( utTvKmlhellokmz ${UTILITIES_TESTS}
ADD_TEST(utTvKmlhellokmz ${UTILITIES_TESTS}
kmlhellokmz
${INPUTDATA}/multikml-doc.kmz
# ${TEMP}/utkmlhellokmz.txt
)
ADD_TEST( utTvKmlprettykml ${UTILITIES_TESTS}
ADD_TEST(utTvKmlprettykml ${UTILITIES_TESTS}
--compare-ascii ${NOTOL}
${BASELINE_FILES}/utkmlprettykml.txt
${TEMP}/utkmlprettykml.txt
......@@ -446,7 +446,7 @@ ADD_TEST( utTvKmlprettykml ${UTILITIES_TESTS}
${TEMP}/utkmlprettykml.txt
)
ADD_TEST( utTvKmlprintgeometry ${UTILITIES_TESTS}
ADD_TEST(utTvKmlprintgeometry ${UTILITIES_TESTS}
kmlprintgeometry
${INPUTDATA}/polygons2d.kml
# ${TEMP}/utkmlprintgeometry.txt
......@@ -460,7 +460,7 @@ ADD_TEST( utTvKmlprintgeometry ${UTILITIES_TESTS}
# ------- KNN classification from Insight Journal --------------------
# The data are those submitted with the pape for the case 2D classification
# with 2 features.
ADD_TEST( utTvClassifyKNN2 ${UTILITIES_TESTS}
ADD_TEST(utTvClassifyKNN2 ${UTILITIES_TESTS}
--compare-image ${NOTOL}
${BASELINE}/output2D_2ch.tif
${TEMP}/output2D_2ch.tif
......@@ -473,7 +473,7 @@ ADD_TEST( utTvClassifyKNN2 ${UTILITIES_TESTS}
)
# ------- GreyLevelRunLengthMatrixTextureCoefficientsCalculator from Insight Journal --------------------
ADD_TEST( ijTuGreyLevelRunLengthMatrixTextureCoefficientsCalculator ${UTILITIES_TESTS}
ADD_TEST(ijTuGreyLevelRunLengthMatrixTextureCoefficientsCalculator ${UTILITIES_TESTS}
ijGreyLevelRunLengthMatrixTextureCoefficientsCalculatorTest
${INPUTDATA}/Textures/1.1.02.png )
......
Testing/Utilities/ossimRadarSatSupport.cxx
View file @ 7061435a
......@@ -62,7 +62,7 @@ int ossimRadarSatSupport(int argc, char* argv[])
return EXIT_FAILURE;
}
char * filename = argv[1];
/** Don't use FactoryRegistry because of its default factory that can conflict
......@@ -70,7 +70,7 @@ int ossimRadarSatSupport(int argc, char* argv[])
// test ossim plugin factory
ossimProjection * projection = ossimplugins::ossimPluginProjectionFactory::instance()->createProjection(
ossimFilename(filename), 0);
// if ossim plugins factory failed, then test ossim factory
if (!projection)
{
......@@ -81,7 +81,7 @@ int ossimRadarSatSupport(int argc, char* argv[])
return EXIT_FAILURE;
}
}
ossimKeywordlist geom;
std::cout << "Read ossim Keywordlist...";
......@@ -881,7 +881,7 @@ int ossimRadarSatSupport(int argc, char* argv[])
ossimplugins::ossimRadarSatModel * RDSmodel = (ossimplugins::ossimRadarSatModel *) model;
std::list<ossimGpt> listePtsSol;
std::list<ossimDpt> listePtsImage;
// le point d'appui : le centre scène
// le point d'appui : le centre
ossimDpt * imageGCP;
ossimGpt * groundGCP;
const char* i_str0 = geom.find("cornersCol0");
......
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