From 52ecc4dfa7e6e48b1f42efe20428dbae111dbea5 Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Fri, 4 Nov 2011 19:55:37 +0100
Subject: [PATCH] STYLE
---
.../otbTrainSVMImagesClassifier.cxx | 2 +-
.../otbValidateSVMImagesClassifier.cxx | 2 +-
Code/IO/otbJPEG2000ImageIO.cxx | 23 ++++++++-----------
Code/IO/otbKMLVectorDataIO.h | 2 +-
.../otbopenjpeg/libopenjpeg/cidx_manager.c | 0
.../otbopenjpeg/libopenjpeg/cidx_manager.h | 0
.../libopenjpeg/indexbox_manager.h | 0
.../libopenjpeg/jpwl/CMakeLists.txt | 0
.../otbopenjpeg/libopenjpeg/phix_manager.c | 0
.../otbopenjpeg/libopenjpeg/ppix_manager.c | 0
.../otbopenjpeg/libopenjpeg/thix_manager.c | 0
.../otbopenjpeg/libopenjpeg/tpix_manager.c | 0
12 files changed, 13 insertions(+), 16 deletions(-)
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/cidx_manager.c
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/cidx_manager.h
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/indexbox_manager.h
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/jpwl/CMakeLists.txt
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/phix_manager.c
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/ppix_manager.c
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/thix_manager.c
mode change 100755 => 100644 Utilities/otbopenjpeg/libopenjpeg/tpix_manager.c
diff --git a/Applications/Classification/otbTrainSVMImagesClassifier.cxx b/Applications/Classification/otbTrainSVMImagesClassifier.cxx
index 99e6f9d781..301fda9601 100644
--- a/Applications/Classification/otbTrainSVMImagesClassifier.cxx
+++ b/Applications/Classification/otbTrainSVMImagesClassifier.cxx
@@ -198,7 +198,7 @@ private:
SetParameterString("vfn", "Class");
AddParameter(ParameterType_Filename, "out", "Output SVM model");
SetParameterDescription("out", "Output SVM model");
- SetParameterRole("out",Role_Output);
+ SetParameterRole("out", Role_Output);
}
diff --git a/Applications/Classification/otbValidateSVMImagesClassifier.cxx b/Applications/Classification/otbValidateSVMImagesClassifier.cxx
index 179ec00bdc..59ded41871 100644
--- a/Applications/Classification/otbValidateSVMImagesClassifier.cxx
+++ b/Applications/Classification/otbValidateSVMImagesClassifier.cxx
@@ -157,7 +157,7 @@ private:
AddParameter(ParameterType_Filename, "out", "Output filename");
SetParameterDescription("out", "Filename, which will contain the performance of the SVM model.");
MandatoryOff("out");
- SetParameterRole("out",Role_Output);
+ SetParameterRole("out", Role_Output);
}
void DoUpdateParameters()
diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Code/IO/otbJPEG2000ImageIO.cxx
index 700c03a0ef..0350585caa 100644
--- a/Code/IO/otbJPEG2000ImageIO.cxx
+++ b/Code/IO/otbJPEG2000ImageIO.cxx
@@ -25,7 +25,6 @@
#include "itkMacro.h"
-
/**
sample error debug callback expecting no client object
*/
@@ -59,17 +58,17 @@ class JPEG2000ReaderInternal
public:
JPEG2000ReaderInternal();
- opj_codec_t* GetCodec(){return this->m_Codec;};
- FILE* GetFile(){return this->m_File;};
- opj_image_t* GetImage(){return this->m_Image;};
- opj_stream_t* GetStream(){return this->m_Stream;};
- opj_codestream_info_v2* GetCstrInfo(){return this->m_CstrInfo;};
+ opj_codec_t* GetCodec(){return this->m_Codec; };
+ FILE* GetFile(){return this->m_File; };
+ opj_image_t* GetImage(){return this->m_Image; };
+ opj_stream_t* GetStream(){return this->m_Stream; };
+ opj_codestream_info_v2* GetCstrInfo(){return this->m_CstrInfo; };
- void Clean();
+ void Clean();
- int CanRead();
+ int CanRead();
- int Open(const char *filename);
+ int Open(const char *filename);
bool m_IsOpen;
OPJ_CODEC_FORMAT m_CodecFormat;
@@ -239,7 +238,7 @@ int JPEG2000ReaderInternal::Initialize()
// Set default event mgr FIXME
opj_event_mgr_t event_mgr;
- otbopenjpeg_opj_initialize_default_event_handler(&event_mgr,true);
+ otbopenjpeg_opj_initialize_default_event_handler(&event_mgr, true);
// Setting default parameters
opj_dparameters_t parameters;
@@ -291,7 +290,7 @@ int JPEG2000ReaderInternal::Initialize()
this->m_Precision[itComp] = this->m_Image->comps[itComp].prec;
}
- this->m_Signed = new int[this->m_NbOfComponent] ;
+ this->m_Signed = new int[this->m_NbOfComponent];
if (!this->m_Signed)
{
this->Clean();
@@ -479,7 +478,6 @@ void JPEG2000ImageIO::Read(void* buffer)
}
-
unsigned int nbPixel = (m_InternalReader->GetImage()->x1 - m_InternalReader->GetImage()->x0) *
(m_InternalReader->GetImage()->y1 - m_InternalReader->GetImage()->y0);
//std::cout<< "NbPixel = " << nbPixel << std::endl;
@@ -489,7 +487,6 @@ void JPEG2000ImageIO::Read(void* buffer)
//unsigned char *p = static_cast<unsigned char *>(buffer);
-
// move the data into the buffer
switch (this->GetComponentType())
{
diff --git a/Code/IO/otbKMLVectorDataIO.h b/Code/IO/otbKMLVectorDataIO.h
index fb65244aae..bc5a4de724 100644
--- a/Code/IO/otbKMLVectorDataIO.h
+++ b/Code/IO/otbKMLVectorDataIO.h
@@ -80,7 +80,7 @@ public:
typedef PolygonListType::Pointer PolygonListPointerType;
typedef VectorDataType::Pointer VectorDataPointerType;
typedef VectorDataType::ConstPointer VectorDataConstPointerType;
- typedef VectorDataProjectionFilter<VectorDataType,VectorDataType> ProjectionFilterType;
+ typedef VectorDataProjectionFilter<VectorDataType, VectorDataType> ProjectionFilterType;
/*-------- This part of the interface deals with reading data. ------ */
/** Determine the file type. Returns true if this VectorDataIO can read the
diff --git a/Utilities/otbopenjpeg/libopenjpeg/cidx_manager.c b/Utilities/otbopenjpeg/libopenjpeg/cidx_manager.c
old mode 100755
new mode 100644
diff --git a/Utilities/otbopenjpeg/libopenjpeg/cidx_manager.h b/Utilities/otbopenjpeg/libopenjpeg/cidx_manager.h
old mode 100755
new mode 100644
diff --git a/Utilities/otbopenjpeg/libopenjpeg/indexbox_manager.h b/Utilities/otbopenjpeg/libopenjpeg/indexbox_manager.h
old mode 100755
new mode 100644
diff --git a/Utilities/otbopenjpeg/libopenjpeg/jpwl/CMakeLists.txt b/Utilities/otbopenjpeg/libopenjpeg/jpwl/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/Utilities/otbopenjpeg/libopenjpeg/phix_manager.c b/Utilities/otbopenjpeg/libopenjpeg/phix_manager.c
old mode 100755
new mode 100644
diff --git a/Utilities/otbopenjpeg/libopenjpeg/ppix_manager.c b/Utilities/otbopenjpeg/libopenjpeg/ppix_manager.c
old mode 100755
new mode 100644
diff --git a/Utilities/otbopenjpeg/libopenjpeg/thix_manager.c b/Utilities/otbopenjpeg/libopenjpeg/thix_manager.c
old mode 100755
new mode 100644
diff --git a/Utilities/otbopenjpeg/libopenjpeg/tpix_manager.c b/Utilities/otbopenjpeg/libopenjpeg/tpix_manager.c
old mode 100755
new mode 100644
--
GitLab