diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.h b/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.h
index bdbc8823c565da2ffe9d2922b02246160f1d41e0..2c5b7d599ce399f1edee5a9be78249d77ed43459 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.h
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.h
@@ -67,22 +67,22 @@ namespace otb
  * functions. Since this class is a singleton, the New() method is
  * deprecated and will be removed in future release. Please use the
  * DEMHandler::Instance() method instead.
- * 
+ *
  * Please be aware that a proper instanciation and parameter setting
  * of this class is advised before any call to geometric filters or
  * functionalities. Ossim internal accesses to elevation are also
  * configured by this class and this will ensure consistency
  * throughout the library.
- * 
+ *
  * The class allows to configure a directory containing DEM tiles
  * (DTED or SRTM supported) using the OpenDEMDirectory() method. The
  * OpenGeoidFile() method allows to input a geoid file as well. Last,
  * a default height above ellipsoid can be set using the
- * SetDefaultHeightAboveEllipsoid() method. 
- * 
+ * SetDefaultHeightAboveEllipsoid() method.
+ *
  * The class allows to retrieve either height above ellipsoid or
  * height above Mean Sea Level (MSL).
- * 
+ *
  * Here is the complete description of both methods outpout depending
  * on the class configuration for the SRTM DEM (in the following, no
  * SRTM means DEMDirectory not set, or no coverage for point, or
@@ -93,7 +93,7 @@ namespace otb
  * - No SRTM but geoid available: geoid_offset
  * - SRTM available, but no geoid: srtm_value
  * - No SRTM and no geoid available: default height above ellipsoid
- * 
+ *
  * GetHeightAboveMSL():
  * - SRTM and geoid both available: srtm_value
  * - No SRTM but geoid available: BUGGY CASE (returns NaN)
@@ -103,7 +103,7 @@ namespace otb
  * Please note that OSSIM internal calls for sensor modelling use the
  * height above ellipsoid, and follow the same logic as the
  * GetHeightAboveEllipsoid() method.
- *  
+ *
  * DEM directory can either contain DTED or SRTM formats.
  * \ingroup Images
  *
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.h b/Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.h
index 67742bc8e1277b2d885362419edfd27e198c0eab..d478d517e3b41e1ce9cd7f09af297e24dafc80ca 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.h
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.h
@@ -40,9 +40,9 @@ class ImageKeywordlist;
  *
  * This class is used inside the GCPsToRPCSensorModelImageFilter and should not
  * be used directly outside.
- * 
+ *
  * \deprecated Please use the RpcSolverAdapter class static methods instead
- * 
+ *
  * \sa GCPsToRPCSensorModelImageFilter
  **/
 
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.cxx
index de228961911197838a4708da1de759c8c6343302..813972e56683ea3279c748c106efaac758fea975 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.cxx
@@ -34,10 +34,10 @@ RPCSolverAdapter::~RPCSolverAdapter()
 {}
 
 void
-RPCSolverAdapter::Solve(const GCPsContainerType& gcpContainer, 
-                        const Point2DType& ulImagePoint, 
+RPCSolverAdapter::Solve(const GCPsContainerType& gcpContainer,
+                        const Point2DType& ulImagePoint,
                         const Point2DType& lrImagePoint,
-                        double& rmsError, 
+                        double& rmsError,
                         ImageKeywordlist& otb_kwl)
 {
   // TODO: for now, this is a simple transfer of what was done in the
@@ -99,9 +99,9 @@ RPCSolverAdapter::Solve(const GCPsContainerType& gcpContainer,
 }
 
 bool RPCSolverAdapter::Solve(const GCPsContainerType& gcpContainer,
-                    const Point2DType& ulImagePoint, 
+                    const Point2DType& ulImagePoint,
                     const Point2DType& lrImagePoint,
-                    double& rmsError, 
+                    double& rmsError,
                     const std::string & outgeom)
  {
    // Declare an empty keywordlist
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.h b/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.h
index 049b6a9b9f74345fd4844d881ec354a39a69509d..7f9efa1d269c0d6bb101ffe752199e817a102700 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.h
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.h
@@ -56,18 +56,18 @@ public:
    *  by other OTB and classes (like GenericRSTransform for instance).
    */
   static void Solve(const GCPsContainerType& gcpContainer,
-                    const Point2DType& ulImagePoint, 
+                    const Point2DType& ulImagePoint,
                     const Point2DType& lrImagePoint,
-                    double& rmsError, 
+                    double& rmsError,
                     ImageKeywordlist& otb_kwl);
 
   /** Solve RPC modelling from a set of GCPs and image bounds. The
-   * estimated RPC model is written to a geom file 
+   * estimated RPC model is written to a geom file
    */
   static bool Solve(const GCPsContainerType& gcpContainer,
-                    const Point2DType& ulImagePoint, 
+                    const Point2DType& ulImagePoint,
                     const Point2DType& lrImagePoint,
-                    double& rmsError, 
+                    double& rmsError,
                     const std::string & outgeom);
 
 
diff --git a/Testing/Code/UtilitiesAdapters/otbDEMHandlerTest.cxx b/Testing/Code/UtilitiesAdapters/otbDEMHandlerTest.cxx
index dc72048d3b0cee3679c85c74aab25e404255835e..7c92a35c3a8680110dccaca671e9e7cb5a521bb7 100644
--- a/Testing/Code/UtilitiesAdapters/otbDEMHandlerTest.cxx
+++ b/Testing/Code/UtilitiesAdapters/otbDEMHandlerTest.cxx
@@ -75,12 +75,12 @@ int otbDEMHandlerTest(int argc, char * argv[])
     {
     height = demHandler->GetHeightAboveMSL(point);
 
-    std::cout<<"height above MSL ("<<longitude<<", "<<latitude<<") = "<<height<<" meters"<<std::endl;  
+    std::cout<<"height above MSL ("<<longitude<<", "<<latitude<<") = "<<height<<" meters"<<std::endl;
     }
   else
     {
     height = demHandler->GetHeightAboveEllipsoid(point);
-    std::cout<<"height above ellipsoid ("<<longitude<<", "<<latitude<<") = "<<height<<" meters"<<std::endl;  
+    std::cout<<"height above ellipsoid ("<<longitude<<", "<<latitude<<") = "<<height<<" meters"<<std::endl;
     }
 
   // Check for Nan
diff --git a/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx b/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
index 70c2f464eceb31639d956f989c60c7f6f8dc0a9f..2d67d8260884a78fe4833178a6fb6d91d55b774e 100644
--- a/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
+++ b/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
@@ -72,9 +72,9 @@ int otbRPCSolverAdapterTest(int argc, char* argv[])
   otb::RPCSolverAdapter::GCPsContainerType gcps;
 
   // Generate gcps
-  for(unsigned int i = 0; i < gridSize;++i)
+  for(unsigned int i = 0; i < gridSize; ++i)
     {
-    for(unsigned int j = 0; j < gridSize;++j)
+    for(unsigned int j = 0; j < gridSize; ++j)
       {
       ImageType::IndexType currentIndex;
       currentIndex[0] = i*stepx;
@@ -136,7 +136,7 @@ int otbRPCSolverAdapterTest(int argc, char* argv[])
   bool fail = false;
 
   for(otb::RPCSolverAdapter::GCPsContainerType::iterator it = gcps.begin();
-      it != gcps.end();++it)
+      it != gcps.end(); ++it)
     {
     Point2DType imgPoint,groundPoint, groundPoint2dRef;
     Point3DType imgPoint3D,groundPoint3D;