Merge branch 'dev' of github.com:ossimlabs/ossim-plugins into dev

cnes/src/ossimAlosPalsarModel.cpp

@@ -27,6 +27,8 @@
 #include <ossim/base/ossimKeywordNames.h>
 #include <ossim/base/ossimTrace.h>
 
+using namespace std;
+
 
 // Static trace for debugging
 static ossimTrace traceDebug("ossimAlosPalsarModel:debug");

cnes/src/ossimCosmoSkymedModel.cpp

@@ -23,6 +23,8 @@
 #include <otb/RefPoint.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 

cnes/src/ossimEnvisatAsarModel.cpp

@@ -28,6 +28,8 @@
 #include <otb/RefPoint.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 

cnes/src/ossimEnvisatAsarModel.h

@@ -26,7 +26,6 @@
 namespace ossimplugins
 {
 
-
 class PlatformPosition;
 class SensorParams;
 class RefPoint;

cnes/src/ossimErsSarModel.cpp

@@ -31,6 +31,8 @@ static ossimTrace traceDebug("ossimErsSarModel:debug");
 #include <string>
 #include <algorithm>
 
+using namespace std;
+
 namespace ossimplugins
 {
 

cnes/src/ossimFormosatDimapSupportData.cpp

@@ -28,6 +28,8 @@
 // Define Trace flags for use within this file:
 static ossimTrace traceDebug ("ossimFormosatDimapSupportData:debug");
 
+using namespace std;
+
 static const ossim_uint32  LAGRANGE_FILTER_SIZE = 8; // num samples considered
 
 ossimFormosatDimapSupportData::ossimFormosatDimapSupportData ()

cnes/src/ossimFormosatDimapSupportData.h

@@ -29,7 +29,6 @@
 #include <vector>
 #include <iostream>
 
-using namespace std;
 
 class ossimKeywordlist;
 // class ossimRefPtr;
@@ -151,7 +150,7 @@ class OSSIM_PLUGINS_DLL ossimFormosatDimapSupportData :
    //---
    // Convenient method to print important image info:
    //---
-   void  printInfo (ostream& os) const;
+   void  printInfo (std::ostream& os) const;
 
    virtual bool saveState(ossimKeywordlist& kwl,
                           const char* prefix = 0)const;

cnes/src/ossimFormosatModel.cpp

@@ -29,6 +29,8 @@ using namespace std;
 
 #include <ossimFormosatDimapSupportData.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 RTTI_DEF1(ossimFormosatModel, "ossimFormosatModel", ossimSensorModel);

cnes/src/ossimFormosatModel.h

@@ -15,7 +15,6 @@
 #define ossimFormosatModel_HEADER
 
 #include <iostream>
-using namespace std;
 
 #include <ossim/plugin/ossimPluginConstants.h>
 #include <ossim/projection/ossimSensorModel.h>
@@ -82,7 +81,7 @@ class OSSIM_PLUGINS_DLL ossimFormosatModel : public ossimSensorModel
     * Writes a template of geom keywords processed by loadState and saveState
     * to output stream.
     */
-   static void writeGeomTemplate(ostream& os);
+   static void writeGeomTemplate(std::ostream& os);
 
    /*!
     * Given an image point and height, initializes worldPoint.

cnes/src/ossimGeometricSarSensorModel.cpp

@@ -23,6 +23,8 @@
 #include <cmath>
 #include <string>
 
+using namespace std;
+
 namespace ossimplugins
 {
 

cnes/src/ossimGeometricSarSensorModel.h

@@ -19,7 +19,6 @@
 #include <list>
 #include <vector>
 
-using namespace std;
 
 namespace ossimplugins
 {
@@ -73,7 +72,7 @@ class OSSIM_PLUGINS_DLL ossimGeometricSarSensorModel : public ossimSensorModel
     * @param position Position of the sensor at line line
     * @param speed Speed of the sensor at line line
     */
-  virtual bool getPlatformPositionAtLine(double line, vector<double>& position, vector<double>& speed);
+  virtual bool getPlatformPositionAtLine(double line, std::vector<double>& position, std::vector<double>& speed);
 
    /**
     * @brief This function is able to convert image coordinates into world

cnes/src/ossimPleiadesDimapSupportData.cpp

@@ -46,6 +46,8 @@
 #include <iterator>
 #include <sstream>
 
+using namespace std;
+
 
 // Define Trace flags for use within this file:
 static ossimTrace traceExec  ("ossimPleiadesDimapSupportData:exec");

cnes/src/ossimPleiadesDimapSupportData.h

@@ -47,7 +47,6 @@
 #include <vector>
 #include <iostream>
 
-using namespace std;
 
 
 class ossimKeywordlist;
@@ -85,7 +84,7 @@ namespace ossimplugins
          //---
          // Convenient method to print important image info:
          //---
-         void  printInfo (ostream& os) const;
+         void  printInfo (std::ostream& os) const;
 
          /**
           * Method to save the state of the object to a keyword list.

cnes/src/ossimPleiadesModel.cpp

@@ -44,6 +44,7 @@
 #include <ossim/base/ossimXmlNode.h>
 #include <ossim/support_data/ossimSupportFilesList.h>
 
+using namespace std;
 
 namespace ossimplugins
 {

cnes/src/ossimPluginCommon.cpp

@@ -21,6 +21,9 @@
 #include <ossim/base/ossimXmlNode.h>
 #include <otb/CivilDateTime.h>
 #include <ossim/base/ossimTrace.h>
+
+using namespace std;
+
 static ossimTrace traceDebug("ossimPluginCommon:debug");
 namespace ossimplugins
 {

cnes/src/ossimPluginInit.cpp

@@ -15,6 +15,7 @@
 #include <ossimPluginProjectionFactory.h>
 #include <ossimPluginReaderFactory.h>
 
+using namespace std;
 
 namespace ossimplugins
 {

cnes/src/ossimPluginProjectionFactory.cpp

@@ -44,6 +44,8 @@ static ossimTrace traceDebug = ossimTrace("ossimPluginProjectionFactory:debug");
 #include <ossimFormosatModel.h>
 #include <ossimFormosatDimapSupportData.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 

cnes/src/ossimPluginReaderFactory.cpp

@@ -21,6 +21,8 @@
 #include <ossim/base/ossimTrace.h>
 #include <ossim/base/ossimKeywordNames.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 

cnes/src/ossimRadarSat2Model.cpp

@@ -33,6 +33,8 @@
 #include <otb/RefPoint.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 // Keyword constants:

cnes/src/ossimRadarSat2ProductDoc.h

@@ -19,7 +19,6 @@
 #include <list>
 #include <vector>
 #include <sstream>
-#include <vector>
 
 class ossimDpt;
 class ossimGpt;
@@ -29,7 +28,6 @@ class ossimXmlNode;
 class ossimString;
 
 
-using namespace std;
 
 typedef struct
 {
@@ -47,10 +45,10 @@ typedef struct
    double latitudeScale;
    double longitudeScale;
    double heightScale;
-   vector<double> lineNumeratorCoefficients;
-   vector<double> lineDenominatorCoefficients;
-   vector<double> pixelNumeratorCoefficients;
-   vector<double> pixelDenominatorCoefficients;
+   std::vector<double> lineNumeratorCoefficients;
+   std::vector<double> lineDenominatorCoefficients;
+   std::vector<double> pixelNumeratorCoefficients;
+   std::vector<double> pixelDenominatorCoefficients;
 
 }RPCModel;
 

cnes/src/ossimRadarSat2RPCModel.cpp

@@ -35,6 +35,8 @@
 #include <otb/SensorParams.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 

cnes/src/ossimRadarSat2TiffReader.cpp

@@ -25,6 +25,8 @@
 #include <ossim/projection/ossimProjection.h>
 #include <ossim/projection/ossimProjectionFactoryRegistry.h>
 
+using namespace std;
+
 // Keyword constants:
 static const char PRODUCT_XML_FILE_KW[] = "product_xml_filename";
 

cnes/src/ossimRadarSatModel.cpp

@@ -38,6 +38,8 @@
 #include <RadarSat/CommonRecord/ProcessingParameters.h>
 #include <RadarSat/Leader/PlatformPositionData.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 RTTI_DEF1(ossimRadarSatModel, "ossimRadarSatModel", ossimGeometricSarSensorModel);

cnes/src/ossimSpot6DimapSupportData.cpp

@@ -46,6 +46,8 @@
 #include <iterator>
 #include <sstream>
 
+using namespace std;
+
 
 // Define Trace flags for use within this file:
 static ossimTrace traceExec  ("ossimSpot6DimapSupportData:exec");

cnes/src/ossimSpot6DimapSupportData.h

@@ -43,13 +43,9 @@
 #include <ossim/base/ossimDrect.h>
 #include <ossim/base/ossimGpt.h>
 
-
 #include <vector>
 #include <iostream>
 
-using namespace std;
-
-
 class ossimKeywordlist;
 class ossimXmlDocument;
 
@@ -84,7 +80,7 @@ namespace ossimplugins
       //---
       // Convenient method to print important image info:
       //---
-      void  printInfo (ostream& os) const;
+      void  printInfo (std::ostream& os) const;
 
       /**
        * Method to save the state of the object to a keyword list.

cnes/src/ossimSpot6Model.cpp

@@ -44,6 +44,8 @@
 #include <ossim/base/ossimXmlNode.h>
 #include <ossim/support_data/ossimSupportFilesList.h>
 
+using namespace std;
+
 
 namespace ossimplugins
 {

cnes/src/ossimTerraSarModel.cpp

@@ -33,6 +33,8 @@
 #include <iostream>
 #include <sstream>
 
+using namespace std;
+
 
 // Keyword constants:
 static const char NUMBER_SRGR_COEFFICIENTS_KW[] = "sr_gr_coeffs_count";

cnes/src/ossimTerraSarModel.h

@@ -105,7 +105,7 @@ namespace ossimplugins
       //---
    	  // Convenient method to print important image info:
       //---
-      void  printInfo (ostream& os) const;
+      void  printInfo (std::ostream& os) const;
 
       private:
 

cnes/src/ossimTerraSarProductDoc.cpp

@@ -35,6 +35,8 @@
 #include <ossim/base/ossimXmlDocument.h>
 #include <ossim/base/ossimXmlNode.h>
 
+using namespace std;
+
 // Static trace for debugging
 static ossimTrace traceDebug("ossimTerraSarProductDoc:debug");
 

cnes/src/ossimTerraSarTiffReader.cpp

@@ -24,6 +24,8 @@
 #include <ossim/projection/ossimProjectionFactoryRegistry.h>
 #include <ossim/support_data/ossimGeoTiff.h>
 
+using namespace std;
+
 // Keyword constants:
 static const char PRODUCT_XML_FILE_KW[] = "product_xml_filename";
 

gdal/src/ossimGdalOgrVectorAnnotation.cpp

@@ -46,6 +46,8 @@
 #include <ogr_api.h>
 #include <sstream>
 
+using namespace std;
+
 RTTI_DEF2(ossimGdalOgrVectorAnnotation,
           "ossimGdalOgrVectorAnnotation",
           ossimAnnotationSource,

gdal/src/ossimGdalOgrVectorAnnotation.h

@@ -26,7 +26,6 @@
 #include <ossim/imaging/ossimImageGeometry.h>
 #include <ossim/projection/ossimProjection.h>
 
-using namespace std;
 
 class ossimProjection;
 class ossimMapProjection;
@@ -94,7 +93,7 @@ class OSSIM_PLUGINS_DLL ossimGdalOgrVectorAnnotation :
    //OGRLayer::GetExtent() returns the MBR (minimal bounding rect) of the data in the layer. 
    //So when only do ossim-info, it is not necessary to go through each feature to calculate
    //the bounding which cause the memory allocate problem when the shape file is large.
-   void initializeBoundingRec(vector<ossimGpt> points);
+   void initializeBoundingRec(std::vector<ossimGpt> points);
 
    bool setCurrentEntry(ossim_uint32 entryIdx);
 
@@ -104,7 +103,7 @@ class OSSIM_PLUGINS_DLL ossimGdalOgrVectorAnnotation :
    ossimFilename                       theFilename;
    OGREnvelope                         theBoundingExtent;
    ossimRefPtr<ossimImageGeometry>     theImageGeometry;
-   vector<bool>                        theLayersToRenderFlagList;
+   std::vector<bool>                        theLayersToRenderFlagList;
    std::vector<ossimOgrGdalLayerNode*> theLayerTable;
    ossimRgbVector                      thePenColor;
    ossimRgbVector                      theBrushColor;
@@ -139,7 +138,7 @@ class OSSIM_PLUGINS_DLL ossimGdalOgrVectorAnnotation :
 
    void getFeatures(std::list<long>& result,
                     const ossimIrect& rect);
-   void getFeature(vector<ossimAnnotationObject*>& featureList,
+   void getFeature(std::vector<ossimAnnotationObject*>& featureList,
                    long id);
    ossimProjection* createProjFromReference(OGRSpatialReference* reference)const;
    void initializeTables();

gdal/src/ossimGdalTileSource.cpp

@@ -47,6 +47,8 @@
 
 #include <sstream>
 
+using namespace std;
+
 RTTI_DEF1(ossimGdalTileSource, "ossimGdalTileSource", ossimImageHandler)
 
 static ossimOgcWktTranslator wktTranslator;