diff --git a/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx b/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
index ca044835f188c6a6f5c9573541885a6a14a4429a..55729ea40784039b3ecc3bbb0f8615adff7f0dc7 100644
--- a/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
+++ b/Examples/BasicFilters/MeanShiftVectorImageFilterExample.cxx
@@ -26,8 +26,8 @@
// Software Guide : BeginCommandLineArgs
// INPUTS: {ROI_QB_MUL_1.png}
-// OUTPUTS: {MSFilteredOutput.tif}, {MSClusteredOutput.tif}, {MSLabelledOutput.tif}, {MSBoundariesOutput.tif}, {MSFilteredOutput-pretty.png}, {MSClusteredOutput-pretty.png}
-// 16 16 10 1.0
+// OUTPUTS: {MSFilteredOutput.tif}, {MSClusteredOutput.tif}, {MSLabeledOutput.tif}, {MSBoundariesOutput.tif}, {MSFilteredOutput-pretty.png}, {MSClusteredOutput-pretty.png}
+// 7 30 20 1.0
// Software Guide : EndCommandLineArgs
// Software Guide : BeginLatex
@@ -87,7 +87,7 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
//
// We start by the classical \code{typedef}s needed for reading and
-// writing the images. The EDISON code upon which OTB's
+// writing the images. The EDISON \url{http://www.caip.rutgers.edu/riul/research/code/EDISON/index.html} code upon which OTB's
// implementation is based, uses float pixel precision, so we choose
// to work with a float pixel type.
//
diff --git a/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx b/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx
index 5bef3a014f2a3e687aa0cd0e21791660df48dffa..cee915001dc25336caa53371ddde7e2dde23f026 100644
--- a/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx
+++ b/Examples/DisparityMap/SIFTDisparityMapEstimation.cxx
@@ -35,13 +35,14 @@
// estimation. The idea here is to match SIFTs extracted from both the
// fixed and the moving images. The use of SIFTs is demonstrated in
// section \ref{sec:SIFTDetector}. The
-// \doxygen{otb}{NearestPointDeformationFieldGenerator} will be used
-// to generate a deformation field by using nearest neighbor
+// \doxygen{itk}{DeformationFieldSource} will be used
+// to generate a deformation field by using
// interpolation on the deformation values from the point set. More
// advanced methods for deformation field interpolation are also
// available.
//
-// The first step toward the use of these filters is to include the proper header files.
+// The first step toward the use of these filters is to include the
+// appropriate header files.
//
// Software Guide : EndLatex
@@ -77,7 +78,7 @@ int main (int argc, char* argv[])
// Software Guide : BeginLatex
//
// Then we must decide what pixel type to use for the image. We choose to do
- // all the computation in floating point precision and rescale the results
+ // all the computations in floating point precision and rescale the results
// between 0 and 255 in order to export PNG images.
//
// Software Guide : EndLatex
@@ -141,7 +142,8 @@ int main (int argc, char* argv[])
typedef PointSetType::PointType PointType;
typedef std::pair<PointType,PointType> MatchType;
typedef std::vector<MatchType> MatchVectorType;
- typedef EuclideanDistanceMatchingFilterType::LandmarkListType LandmarkListType;
+ typedef EuclideanDistanceMatchingFilterType::LandmarkListType
+ LandmarkListType;
typedef PointSetType::PointsContainer PointsContainerType;
typedef PointsContainerType::Iterator PointsIteratorType;
@@ -165,7 +167,8 @@ int main (int argc, char* argv[])
// Software Guide : BeginLatex
//
- // Two readers are instantiated : one for the fixed image, and one for the moving image.
+ // Two readers are instantiated : one for the fixed image, and one
+ // for the moving image.
//
// Software Guide : EndLatex
@@ -234,7 +237,8 @@ int main (int argc, char* argv[])
// Software Guide : EndCodeSnippet
MatchVectorType trueSecondOrder;
- for(LandmarkListType::Iterator it = landmarkList->Begin(); it != landmarkList->End();++it)
+ for(LandmarkListType::Iterator it = landmarkList->Begin();
+ it != landmarkList->End();++it)
{
PointType point1 = it.Get()->GetPoint1();
PointType point2 = it.Get()->GetPoint2();
@@ -348,10 +352,12 @@ int main (int argc, char* argv[])
LandmarkContainerPointer;
typedef DeformationSourceType::LandmarkContainer
LandmarkContainerType;
- typedef DeformationSourceType::LandmarkPointType LandmarkPointType;
+ typedef DeformationSourceType::LandmarkPointType LandmarkPointType;
- LandmarkContainerType::Pointer sourceLandmarks = LandmarkContainerType::New();
- LandmarkContainerType::Pointer targetLandmarks = LandmarkContainerType::New();
+ LandmarkContainerType::Pointer sourceLandmarks =
+ LandmarkContainerType::New();
+ LandmarkContainerType::Pointer targetLandmarks =
+ LandmarkContainerType::New();
LandmarkPointType sourcePoint;
LandmarkPointType targetPoint;
@@ -400,7 +406,8 @@ int main (int argc, char* argv[])
deformer->UpdateLargestPossibleRegion();
- DeformationFieldType::ConstPointer deformationField = deformer->GetOutput();
+ DeformationFieldType::ConstPointer deformationField =
+ deformer->GetOutput();
deformer->Update();
@@ -454,7 +461,7 @@ int main (int argc, char* argv[])
// \includegraphics[width=0.40\textwidth]{ROISpot5Warped.eps}
// \includegraphics[width=0.40\textwidth]{SIFTdeformationFieldOutput.eps}
// \itkcaption[Deformation field from SIFT disparity map estimation]{From left
- // to right and top to bottom: fixed input image, moving image with a sinusoid deformation,
+ // to right and top to bottom: fixed input image, moving image with a deformation,
// estimated deformation field in the horizontal direction.}
// \label{fig:SIFTDME}
// \end{figure}
diff --git a/Examples/FeatureExtraction/SIFTFastExample.cxx b/Examples/FeatureExtraction/SIFTFastExample.cxx
index 0e0bc45c5e63be77b8965d5706b3eebb6836bda0..758bdcaf1419c28be5f9252300c85f5648f2796e 100644
--- a/Examples/FeatureExtraction/SIFTFastExample.cxx
+++ b/Examples/FeatureExtraction/SIFTFastExample.cxx
@@ -260,7 +260,8 @@ int main(int argc, char * argv[])
ImageType::SpacingType spacing = reader->GetOutput()->GetSpacing();
ImageType::PointType origin = reader->GetOutput()->GetOrigin();
- OutputImageType::SizeType size = outputImage->GetLargestPossibleRegion().GetSize();
+ OutputImageType::SizeType size =
+ outputImage->GetLargestPossibleRegion().GetSize();
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
diff --git a/Examples/FeatureExtraction/SURFExample.cxx b/Examples/FeatureExtraction/SURFExample.cxx
index 7b7e10f461387c2fadcf55da09cb5266c1fd1105..cb3ec5b6823279a6986dd2c9a5433302be318ac4 100644
--- a/Examples/FeatureExtraction/SURFExample.cxx
+++ b/Examples/FeatureExtraction/SURFExample.cxx
@@ -23,11 +23,12 @@ PURPOSE. See the above copyright notices for more information.
// Software Guide : BeginLatex
//
-// This example illustrates the use of the \doxygen{otb}{ImageToSURFKeyPointSetFilter}.
-// The Speed-Up Robust Features (or SURF) is an algorithm in
-// computer vision to detect and describe local features in
-// images. The algorithm is detailed in \cite{SURF}. The applications
-// of SURF are the same as those for SIFT.
+// This example illustrates the use of the
+// \doxygen{otb}{ImageToSURFKeyPointSetFilter}. The Speed-Up Robust
+// Features (or SURF) is an algorithm in computer vision to detect and
+// describe local features in images. The algorithm is detailed in
+// \cite{SURF}. The applications of SURF are the same as those for
+// SIFT.
//
// The first step required to use this filter is to include its header file.
//
@@ -164,7 +165,7 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
//
// We set the regions of the image by copying the information from the
-// input image and we allocate the memeory for the output image.
+// input image and we allocate the memory for the output image.
//
// Software Guide : EndLatex
@@ -258,7 +259,8 @@ int main(int argc, char * argv[])
ImageType::SpacingType spacing = reader->GetOutput()->GetSpacing();
ImageType::PointType origin = reader->GetOutput()->GetOrigin();
- OutputImageType::SizeType size = outputImage->GetLargestPossibleRegion().GetSize();
+ OutputImageType::SizeType size =
+ outputImage->GetLargestPossibleRegion().GetSize();
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
diff --git a/Examples/IO/TileMapImageIOExample.cxx b/Examples/IO/TileMapImageIOExample.cxx
index 1c70bacfc964e33b433cb0ad396d318c9b1a8a27..b9b362561e6738a0a161294a3d7fbf7689521525 100644
--- a/Examples/IO/TileMapImageIOExample.cxx
+++ b/Examples/IO/TileMapImageIOExample.cxx
@@ -90,8 +90,8 @@ int main( int argc, char* argv[] )
// Software Guide : BeginLatex
//
- // We now instanciate the reader. As some parameters need to be given to the
- // IO which is an \doxygen{otb}{TileMapImageIO}, we need to manually create it also:
+ // We now instantiate the reader. As some parameters need to be given to the
+ // IO which is an \doxygen{otb}{TileMapImageIO}, we need to manually create it:
//
// Software Guide : EndLatex
@@ -112,12 +112,12 @@ int main( int argc, char* argv[] )
// Software Guide : BeginLatex
//
- // Now, we potentially have an image of several Peta-bytes covering the whole world
+ // Now, we potentially have an image of several Peta-Bytes covering the whole world
// in the reader
// that's why we don't want to do an update before extracting a specific
// area.
//
- // The coordinates are refered with an origin at the north pole and the
+ // The coordinates are refered with an origin at the North Pole and the
// change date meridian in Mercator projection. So we need to translate the latitude
// and the longitude in this funny coordinate system:
//
@@ -147,7 +147,7 @@ int main( int argc, char* argv[] )
// Software Guide : BeginLatex
//
- // This enable us to use the \doxygen{otb}{ExtractROI} to retrieve only
+ // This enables us to use the \doxygen{otb}{ExtractROI} to retrieve only
// the area of interest and to avoid crashing our memory-limited computer.
//
// Software Guide : EndLatex
diff --git a/Examples/IO/VectorDataIOExample.cxx b/Examples/IO/VectorDataIOExample.cxx
index 65b6ed079de95ddab907847510a633afa195288c..c93dafaca3de7a72c4a1fc448965382f03eb378c 100644
--- a/Examples/IO/VectorDataIOExample.cxx
+++ b/Examples/IO/VectorDataIOExample.cxx
@@ -18,8 +18,8 @@
// Software Guide : BeginLatex
//
-// Although specific vector data import approaches, as the one
-// presented later in \ref{sec:ReadDXF}, can be useful, it is even more
+// Although specific vector data IO approaches, as the one
+// presented in section \ref{sec:ReadDXF}, can be useful, it is even more
// interesting to have available approaches which are independent of
// the input format. Unfortunately, many vector data formats do not
// share the models for the data they represent. However, in some
@@ -32,8 +32,8 @@
// are available in OTB, we designed a generic approach for the IO of
// this kind of data.
//
-// In \ref{sec:VectorDataProjection}, you will find more information on
-// how projection work for the vector data and how you can export
+// In section \ref{sec:VectorDataProjection}, you will find more information on
+// how projections work for the vector data and how you can export
// the results obtained with OTB to the real world.
//
// This example illustrates the use of OTB's vector data IO
@@ -104,7 +104,7 @@ int main(int argc, char * argv[])
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
-// The vector data obtained from the reader wil provide a tree of
+// The vector data obtained from the reader will provide a tree of
// nodes containing the actual objects of the scene. This tree will
// be accessed using an \doxygen{itk}{PreOrderTreeIterator}.
//
@@ -153,7 +153,7 @@ int main(int argc, char * argv[])
//
// We check that the current object is a polygon using the
// \code{IsPolygonFeature()} method and get its exterior ring in
-// order to sore it into the list.
+// order to store it into the list.
//
// Software Guide : EndLatex
@@ -176,7 +176,7 @@ int main(int argc, char * argv[])
// Software Guide : BeginLatex
//
// Before writing the polygons to the output file, we have to build
-// the vector data structure. This structure will be build up of
+// the vector data structure. This structure will be built up of
// nodes. We define the types needed for that.
//
// Software Guide : EndLatex
@@ -243,7 +243,7 @@ int main(int argc, char * argv[])
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
-// An finally we write the vector data to a file using a generic
+// And finally we write the vector data to a file using a generic
// \doxygen{otb}{VectorDataFileWriter}.
//
// Software Guide : EndLatex
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 4a635907a437744e954c900fb015fb40fed478d3..9790c331e6359a29ef74dbbc265a0143c0d10827 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -450,11 +450,9 @@ ADD_TEST(ioTuGDALImageIOCanRead_ENVI ${IO_TESTS5} otbGDALImageIOTestCanRead
# ${INPUTDATA}/poupees_1canal.c1.hdr )
${INPUTDATA}/poupees_1canal.c1 )
-ADD_TEST(ioTuGDALImageIOCanRead_PDS1 ${IO_TESTS5} otbGDALImageIOTestCanRead
- ${INPUTDATA}/pdsImage1.img )
-ADD_TEST(ioTuGDALImageIOCanRead_PDS2 ${IO_TESTS5} otbGDALImageIOTestCanRead
- ${INPUTDATA}/pdsImage2.img )
+ADD_TEST(ioTuGDALImageIOCanRead_PDS ${IO_TESTS5} otbGDALImageIOTestCanRead
+ ${INPUTDATA}/pdsImage.img )
IF(OTB_DATA_USE_LARGEINPUT)
@@ -660,19 +658,12 @@ ADD_TEST(ioTvImageFileReaderENVI2PNG ${IO_TESTS8}
${TEMP}/ioImageFileWriterPNG2BSQ_cthead1.hdr
${TEMP}/ioImageFileWriterPNG2BSQ_cthead1_2.png )
-ADD_TEST(ioTvImageFileReaderPDS2TIFF1 ${IO_TESTS8}
- --compare-image ${TOL} ${INPUTDATA}/pdsImage1.img
- ${TEMP}/ioTvImageFileReaderPDS2TIFF1.tif
+ADD_TEST(ioTvImageFileReaderPDS2TIFF ${IO_TESTS8}
+ --compare-image ${TOL} ${INPUTDATA}/pdsImage.img
+ ${TEMP}/ioTvImageFileReaderPDS2TIFF.tif
otbImageFileReaderTest
- ${INPUTDATA}/pdsImage1.img
- ${TEMP}/ioTvImageFileReaderPDS2TIFF1.tif)
-
-ADD_TEST(ioTvImageFileReaderPDS2TIFF2 ${IO_TESTS8}
- --compare-image ${TOL} ${INPUTDATA}/pdsImage2.img
- ${TEMP}/ioTvImageFileReaderPDS2TIFF2.tif
- otbImageFileReaderTest
- ${INPUTDATA}/pdsImage2.img
- ${TEMP}/ioTvImageFileReaderPDS2TIFF2.tif)
+ ${INPUTDATA}/pdsImage.img
+ ${TEMP}/ioTvImageFileReaderPDS2TIFF.tif)
# RGB
ADD_TEST(ioTvImageFileWriterRGB_PNG2PNG ${IO_TESTS8}