Commit 2b017958 authored by Julien Malik's avatar Julien Malik
Browse files

STYLE: punished by the hooks...

parent 8907bdad
......@@ -121,7 +121,7 @@ CumulantsForEdgeworthProfile<TInput>
return resu < 0.0 ? 0.0 : resu;
}
/* ====== Estimation des moments � partir de voisinnages emboit�s ==== */
/* ====== Moments estimation from nested neighborhoods ==== */
template <class TInput>
int
......@@ -140,8 +140,8 @@ CumulantsForEdgeworthProfile<TInput>
return 0;
}
/* ===================== Estimation des moments ====================== */
/* =============== � partir de la petite taille de fenetre =========== */
/* ===================== Moments estimation ====================== */
/* =============== from the small window size =========== */
template <class TInput>
int
......@@ -241,7 +241,7 @@ CumulantsForEdgeworthProfile<TInput>
return 0;
}
/* ================ Accroissement de la taille de fenetre ============ */
/* ================ Window size growth ============ */
template <class TInput>
int
......
......@@ -59,7 +59,7 @@ ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
// Analyse du canal trait
// Analysis of processed channel
if ((m_Channel <= 0) || (m_Channel > InputImagePixelType::Dimension))
{
itkExceptionMacro(<< "otb::ExtractImImageOfVectorsToMonoChannelExtractROIageFilter::GenerateOutputInformation "
......@@ -67,7 +67,7 @@ ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>
<< typeid(itk::ImageBase<InputImageDimension>*).name());
}
// Appel la methode de la classe de base
// Call base class implementation
Superclass::GenerateOutputInformation();
}
......@@ -97,7 +97,7 @@ ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>
OutputIterator outIt(outputPtr, outputRegionForThread);
InputIterator inIt(inputPtr, inputRegionForThread);
// Parcours des canaux a traiter
// Loop through the processed channels
unsigned int channelIn(m_Channel - 1);
InputImagePixelType pixelInput;
......
......@@ -51,7 +51,7 @@ namespace otb
*
* The full method is detailled in E. Christophe and J. Inglada, "Robust Road
* Extraction for High Resolution Satellite Images," in IEEE International
* Conference on Image Processing, ICIP07, 2007.
* Conference on Image Processing, ICIP'07, 2007.
*
* This filter is fast, as the detection typically takes 3 seconds for a
* 1000 \f$ \times \f$ 1000 images with four spectral bands. Results can be
......
......@@ -33,7 +33,7 @@ namespace otb
* each other or not, i.e. the orthogonal distance between them is calculated. Finally, it
* has to be verified if the two lines have a common part since lines may fulfill the two
* first criteria but be located in different parts of the image. In order to adapt the
* detection algorithm to the users needs, the thresholds AngularThreshold, DistanceThreshold
* detection algorithm to the user's needs, the thresholds AngularThreshold, DistanceThreshold
* and CommonDistanceThreshold can be set.
*
* A possible processing chain would be to extract lines with a line detector, to convert the
......
......@@ -272,7 +272,7 @@ RegionImageToRectangularPathListFilter<TInputImage, TOutputPath>
if (y1 != 0) alpha = vcl_atan(1 / y1) * 180 / vnl_math::pi;
else alpha = 90;
if (alpha < 0) alpha += 180; // Conventionnaly given as a value between 0 and 180
if (alpha < 0) alpha += 180; // Conventionnaly given as a value between 0 and 180 degrees
// Compute equivalent length and width (based on equal area criterion)
double length, width;
......
......@@ -42,7 +42,7 @@ namespace otb
*
* References :
* "Unsupervised Endmember Extraction of Martian Hyperspectral Images",
* B.Luo, J. Chanussot, S. Douté and X. Ceamanos,
* B.Luo, J. Chanussot, S. Doute' and X. Ceamanos,
* IEEE Whispers 2009, Grenoble France, 2009
*
* "Unsupervised classification of hyperspectral images by using linear unmixing algorithm",
......
......@@ -49,7 +49,7 @@ namespace otb {
*
* References :
* "Vertex Component Analysis: A Fast Algorithm to Unmix Hyperspectral Data",
* José M. P. Nascimento, and José M. Bioucas Dias,
* Jose' M. P. Nascimento, and Jose' M. Bioucas Dias,
* IEEE Transactions on Geoscience and Remote Sensing, Vol. 43, No. 4, April 2005
*
* \ingroup Hyperspectral
......
......@@ -507,7 +507,7 @@ void BSQImageIO::Write(const void* buffer)
// image. Start at offset 0 (when no streaming)
if ((lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
{
otbMsgDevMacro(<< "Force l'offset de l'IORegion � 0");
otbMsgDevMacro(<< "Forcing offset to [0,0]");
lFirstLine = 0;
lFirstColumn = 0;
}
......@@ -531,7 +531,7 @@ void BSQImageIO::Write(const void* buffer)
char* value = new char[numberOfBytesToBeWrite];
if (value == NULL)
{
itkExceptionMacro(<< "Erreur allocation meoire");
itkExceptionMacro(<< "Memory allocation error");
return;
}
......@@ -656,7 +656,7 @@ void BSQImageIO::WriteImageInformation()
m_ChannelsFileName[channels].c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
if (m_ChannelsFile[channels].fail())
{
itkExceptionMacro(<< "BSQ : impossible to find the file <" << m_ChannelsFileName[channels] << ">.");
itkExceptionMacro(<< "BSQ : unable to find the file <" << m_ChannelsFileName[channels] << ">");
}
}
this->SetFileTypeToBinary();
......
......@@ -345,11 +345,9 @@ void LUMImageIO::Write(const void* buffer)
unsigned long lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
// Cas particuliers : on controle que si la r�gion � �crire est de la m�me dimension que l'image enti�re,
// on commence l'offset � 0 (lorsque que l'on est pas en "Streaming")
if ((lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
{
otbMsgDevMacro(<< "Force l'offset de l'IORegion � 0");
otbMsgDevMacro(<< "Forcing offset to [0,0]");
lFirstLine = 0;
lFirstColumn = 0;
}
......
......@@ -259,11 +259,9 @@ void MWImageIO::Write(const void* buffer)
unsigned long lPremiereLigne = this->GetIORegion().GetIndex()[1]; // [1... ]
int lPremiereColonne = this->GetIORegion().GetIndex()[0]; // [1... ]
// Cas particuliers : on controle que si la r�gion � �crire est de la m�me dimension que l'image enti�re,
// on commence l'offset � 0 (lorsque que l'on est pas en "Streaming")
if ((lNbLignes == m_Dimensions[1]) && (lNbColonnes == m_Dimensions[0]))
{
otbMsgDevMacro(<< "Force l'offset de l'IORegion � 0");
otbMsgDevMacro(<< "Forcing offset to [0,0]");
lPremiereLigne = 0;
lPremiereColonne = 0;
}
......
......@@ -126,10 +126,9 @@ private:
ONERAImageIO(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
/** M�thode analyse le nom du fichier a ouvrir. S'il s'agit d'un r�pertoire,
* on regarde s'il contient un produit le fichier ent�te (fichier "ENT...")
* Dans ce cas, ONERAFileName contient le nom du fichier a ouvrir.
* Sinon ONERAFileName contient filename
/** Analyze the input file name : if it's a directory, check
* that a header file exists (ENT...) and set OneraFileName to it
* else OneraFileName is set to filename
*/
void GetOneraImageFileName(const char * filename, std::string& OneraFileName);
......
......@@ -104,9 +104,8 @@ Resampler<TInputImage, TOutputImage>
{
outputStartIndex[i] = inputStartIndex[i];
}
// Affectation du spacing � l'image de sortie
outputPtr->SetSpacing(inputSpacing);
// G�n�ration de la r�gion de l'image de sortie
typename OutputImageType::RegionType outputLargestPossibleRegion;
outputLargestPossibleRegion.SetSize(this->GetSize());
outputLargestPossibleRegion.SetIndex(outputStartIndex);
......
......@@ -32,9 +32,9 @@ namespace otb
* \class GroundSpacingImageFunction
* \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 –
* giving an as-the-crow-flies distance between the points (ignoring any hills!).
* This uses the ‘Haversine' formula to calculate great-circle distances between
* 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
*/
......
......@@ -46,13 +46,13 @@ enum LandsatTMBandNames {TM1, TM2, TM3, TM4, TM5, TM60, TM61, TM62, TM7};
// http://www.spotimage.com/web/en/233-resolution-and-spectral-bands.php
// Band Number Wavelength Interval Spectral Response
// 1 0.45-0.52 µm Blue-Green
// 2 0.52-0.60 µm Green
// 3 0.63-0.69 µm Red
// 4 0.76-0.90 µm Near IR
// 5 1.55-1.75 µm Mid-IR
// 6 10.40-12.50 µm Thermal IR
// 7 2.08-2.35 µm Mid-IR
// 1 0.45-0.52 microm Blue-Green
// 2 0.52-0.60 microm Green
// 3 0.63-0.69 microm Red
// 4 0.76-0.90 microm Near IR
// 5 1.55-1.75 microm Mid-IR
// 6 10.40-12.50 microm Thermal IR
// 7 2.08-2.35 microm Mid-IR
}
......
......@@ -41,7 +41,7 @@ TOutput
TerraSarBrightnessFunctor<TInput, TOutput>
::operator() (const TInput &inPix)
{
// Formula: Beta^0 = Ks * |DN|²
// Formula: Beta^0 = Ks * |DN|^2
// First, square the input pixel
double squareInPix = vcl_pow(static_cast<double>(inPix), 2.);
......
......@@ -76,7 +76,7 @@ public:
itkSetMacro(AxisOrigin, PointType);
itkGetConstReferenceMacro(AxisOrigin, PointType);
/// Set§get the axis length
/// Set/Get the axis length
itkSetMacro(AxisLength, VectorType);
itkGetConstReferenceMacro(AxisLength, VectorType);
......
......@@ -63,7 +63,7 @@ int main(int argc, char * argv[])
}
/*
* declaration des types
* Types declaration
*/
const unsigned int Dimension = 2;
......@@ -78,7 +78,7 @@ int main(int argc, char * argv[])
typedef otb::ImageFileReader<TrainingImageType> TrainingReaderType;
/*
* Accs aux paramtres
* Extract command line parameters
*/
const char * inputImageFileName1 = parseResult->GetParameterString(
......
......@@ -168,7 +168,7 @@ ADD_TEST(ioTeDEMToImageGeneratorTest ${EXE_TESTS1}
# Testing the chain of creating a kmz and MapFilefrom
# a non georeferenced image
ADD_TEST(ioImageToKmzAndMapFileProductExample ${EXE_TESTS1}
ADD_TEST(ioTeImageToKmzAndMapFileProductExample ${EXE_TESTS1}
ImageToKmzAndMapFileProductExample
${DATA}/Haiti1_sr10.jpeg
${TEMP}/ioTeHaitiKmzProduct.kmz
......
......@@ -62,7 +62,7 @@
// \mathbf{ARVI} = \frac{ L_{NIR}-L_{rb} }{ L_{NIR}+L_{rb} }
// \end{equation}
//
// For more details, refer to Kaufman and Tanré work \cite{ARVI}.
// For more details, refer to Kaufman and Tanre' work \cite{ARVI}.
//
// \relatedClasses
// \begin{itemize}
......
......@@ -297,7 +297,7 @@ ADD_TEST(bfTuVectorRescaleIntensityImageFilterNew ${BASICFILTERS_TESTS3}
otbVectorRescaleIntensityImageFilterNew)
ADD_TEST(bfTVectorRescaleIntensityImageFilter ${BASICFILTERS_TESTS3}
ADD_TEST(bfTvVectorRescaleIntensityImageFilter ${BASICFILTERS_TESTS3}
--compare-image ${EPSILON_7}
${BASELINE}/bfTvVectorRescaleIntensityOutput.png
${TEMP}/bfTvVectorRescaleIntensityOutput.png
......
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