OSSIM: remove unnecessary differences with ossim trunk

Utilities/otbossim/src/ossim/projection/ossimBilinearProjection.cpp

@@ -215,8 +215,7 @@ bool ossimBilinearProjection::saveState(ossimKeywordlist& kwl,
 bool ossimBilinearProjection::loadState(const ossimKeywordlist& kwl,
                                         const char* prefix)
 {
-  std::cout << "ossimBilinearProjection::loadState() BEGIN" << std::endl;
-  // Load the base class.
+   // Load the base class.
    ossimProjection::loadState(kwl, prefix);
 
    // Start with clear lists.
@@ -280,7 +279,6 @@ bool ossimBilinearProjection::loadState(const ossimKeywordlist& kwl,
    }
    
    initializeBilinear();
-   std::cout << "ossimBilinearProjection::loadState() END" << std::endl;
 
    return true;
 }

Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp

@@ -701,10 +701,10 @@ void ossimIkonosRpcModel::parseRpcData(const ossimFilename& data_file)
       return;
    }
    else
-   {
-      // copy ossimIkonosMetada-sensor into ossimIkonosRpcModel-sensorId
-      theSensorID = theSupportData->getSensorID();
-   }
+     {
+       // copy ossimIkonosMetada-sensor into ossimIkonosRpcModel-sensorId
+       theSensorID = theSupportData->getSensorID();
+     }
    
 
    theLatScale = atof(buf);

Utilities/otbossim/src/ossim/version-config.cpp

@@ -15,7 +15,7 @@
 //----------------------------------------------------------------------------
 
 #include <ctime>
-#include <fstream>   
+#include <fstream>
 #include <string>
 #include <iostream>