diff --git a/Code/IO/otbImageFileReader.h b/Code/IO/otbImageFileReader.h index 2190767b976b62f8427f35af7099bbf8e3e0dd74..3496bd58dea12023e046569229bc98768ba07bad 100644 --- a/Code/IO/otbImageFileReader.h +++ b/Code/IO/otbImageFileReader.h @@ -24,7 +24,7 @@ namespace otb { /** \class ImageFileReader - * \brief Ressource to read an image from a file. + * \brief Resource to read an image from a file. * * \sa ImageSeriesReader * \sa ImageIOBase @@ -37,9 +37,9 @@ class ITK_EXPORT ImageFileReader : public itk::ImageFileReader<TOutputImage> { public: /** Standard class typedefs. */ - typedef ImageFileReader Self; + typedef ImageFileReader Self; typedef itk::ImageFileReader<TOutputImage> Superclass; - typedef itk::SmartPointer<Self> Pointer; + typedef itk::SmartPointer<Self> Pointer; /** Method for creation through the object factory. */ itkNewMacro(Self); @@ -59,8 +59,7 @@ public: /** The pixel type of the output image. */ //typedef typename TOutputImage::InternalPixelType OutputImagePixelType; - /** Prepare l'allocation de l'image output lors du premier appel de traitement - * pipeline. */ + /** Prepare image allocation at the first call of the pipeline processing */ virtual void GenerateOutputInformation(void); /** Does the real work. */ diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx index 3974bdc9a22987de917943188bbbd07b2706e491..4522919442f1bba29f11af1e4562324ecee0aad6 100644 --- a/Code/IO/otbImageFileReader.txx +++ b/Code/IO/otbImageFileReader.txx @@ -170,7 +170,8 @@ ImageFileReader<TOutputImage> ImageRegionType region = output->GetBufferedRegion(); // Adapte the image size with the region - std::streamoff nbBytes = (this->m_ImageIO->GetImageSizeInBytes() / this->m_ImageIO->GetImageSizeInPixels()) * static_cast<std::streamoff>(region.GetNumberOfPixels()); + std::streamoff nbBytes = (this->m_ImageIO->GetImageSizeInBytes() / this->m_ImageIO->GetImageSizeInPixels()) + * static_cast<std::streamoff>(region.GetNumberOfPixels()); char * loadBuffer = new char[nbBytes]; @@ -339,12 +340,10 @@ ImageFileReader<TOutputImage> ossimKeywordlist geom_kwl, tmp_kwl, tmp_kwl2;// = new ossimKeywordlist(); - // Add the radar factory ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance()); - ossimImageHandler* handler = ossimImageHandlerRegistry::instance() ->open(ossimFilename(lFileNameOssimKeywordlist.c_str())); @@ -371,14 +370,14 @@ ImageFileReader<TOutputImage> // Add the plugins factory ossimProjectionFactoryRegistry::instance()->registerFactory(ossimplugins::ossimPluginProjectionFactory::instance()); ossimProjection * projection = ossimProjectionFactoryRegistry::instance() - ->createProjection(ossimFilename(lFileNameOssimKeywordlist.c_str()),0); + ->createProjection(ossimFilename(lFileNameOssimKeywordlist.c_str()), 0); if (!projection) { - otbMsgDevMacro( <<"OSSIM Instanciate projection FAILED ! "); + otbMsgDevMacro( <<"OSSIM Instantiate projection FAILED ! "); } else { - otbMsgDevMacro( <<"OSSIM Instanciate projection SUCCESS ! "); + otbMsgDevMacro( <<"OSSIM Instantiate projection SUCCESS ! "); hasMetaData = projection->saveState(geom_kwl); // Free memory delete projection; @@ -399,7 +398,7 @@ ImageFileReader<TOutputImage> ImageKeywordlist otb_kwl; otb_kwl.SetKeywordlist( geom_kwl ); - // Update itk MetaData Dictionnary + // Update itk MetaData Dictionary itk::MetaDataDictionary& dict = this->m_ImageIO->GetMetaDataDictionary(); @@ -453,7 +452,7 @@ ImageFileReader<TOutputImage> } // Test if the file can be open for reading access. - //Only if m_FileName speciy a filname (not a dirname) + //Only if m_FileName specify a filename (not a dirname) if ( System::IsAFileName( this->m_FileName ) == true ) { std::ifstream readTester; @@ -481,7 +480,7 @@ ImageFileReader<TOutputImage> { std::vector<std::string> listFileSearch; listFileSearch.push_back("DAT_01.001"); - listFileSearch.push_back("dat_01.001");// RADARSAT ou SAR_ERS2 + listFileSearch.push_back("dat_01.001");// RADARSAT or SAR_ERS2 listFileSearch.push_back("IMAGERY.TIF"); listFileSearch.push_back("imagery.tif");//For format SPOT5TIF // Not recognised as a supported file format by GDAL. diff --git a/Examples/IO/TileMapImageIOExample.cxx b/Examples/IO/TileMapImageIOExample.cxx index a7ea1f376185a95ba78b35ef5203eeb4f07e5405..e6bb490179137385ce381544a22ab892eb1ce93f 100644 --- a/Examples/IO/TileMapImageIOExample.cxx +++ b/Examples/IO/TileMapImageIOExample.cxx @@ -96,10 +96,10 @@ int main( int argc, char* argv[] ) // Software Guide : EndLatex // Software Guide : BeginCodeSnippet - typedef itk::RGBPixel<unsigned char> RGBPixelType; - typedef otb::Image<RGBPixelType, 2> ImageType; + typedef itk::RGBPixel<unsigned char> RGBPixelType; + typedef otb::Image<RGBPixelType, 2> ImageType; typedef otb::ImageFileReader<ImageType> ReaderType; - typedef otb::TileMapImageIO ImageIOType; + typedef otb::TileMapImageIO ImageIOType; ImageIOType::Pointer tileIO = ImageIOType::New(); ReaderType::Pointer readerTile = ReaderType::New(); @@ -117,7 +117,7 @@ int main( int argc, char* argv[] ) // 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 referred 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: //