diff --git a/Utilities/otbossimplugins/ossim/erssar/ErsSarRecordHeader.cpp b/Utilities/otbossimplugins/ossim/erssar/ErsSarRecordHeader.cpp index 8f3bd0dfa93ca8a96a2974e52120e4d3f3b2f8a8..55996ab5cf37c3321567ff00f200e21aa037f859 100644 --- a/Utilities/otbossimplugins/ossim/erssar/ErsSarRecordHeader.cpp +++ b/Utilities/otbossimplugins/ossim/erssar/ErsSarRecordHeader.cpp @@ -15,7 +15,14 @@ namespace ossimplugins { -ErsSarRecordHeader::ErsSarRecordHeader() +ErsSarRecordHeader::ErsSarRecordHeader(): + _rec_seq(0), + _rec_sub1(0), + _rec_type(0), + _rec_sub2(0), + _rec_sub3(0), + _length(0) + { } @@ -52,7 +59,8 @@ ErsSarRecordHeader::ErsSarRecordHeader(const ErsSarRecordHeader& rhs): _rec_sub1(rhs._rec_sub1), _rec_type(rhs._rec_type), _rec_sub2(rhs._rec_sub2), - _rec_sub3(rhs._rec_sub3) + _rec_sub3(rhs._rec_sub3), + _length(rhs._length) { } @@ -63,6 +71,7 @@ ErsSarRecordHeader& ErsSarRecordHeader::operator=(const ErsSarRecordHeader& rhs) _rec_type = rhs._rec_type; _rec_sub2 = rhs._rec_sub2; _rec_sub3 = rhs._rec_sub3; + _length = rhs._length; return *this; } diff --git a/Utilities/otbossimplugins/ossim/ossimGeometricSarSensorModel.cpp b/Utilities/otbossimplugins/ossim/ossimGeometricSarSensorModel.cpp index a111712063d23c80e67887e55a8b71accfced1af..8798af3dad2155c00c58a175f036f8e7b3ab6a57 100644 --- a/Utilities/otbossimplugins/ossim/ossimGeometricSarSensorModel.cpp +++ b/Utilities/otbossimplugins/ossim/ossimGeometricSarSensorModel.cpp @@ -570,6 +570,8 @@ namespace ossimplugins std::ostream& ossimGeometricSarSensorModel::print(std::ostream& out) const { + std::ios::fmtflags f(out.flags()); + out << setprecision(15) << setiosflags(ios::fixed) << "\nossimGeometricSarSensorModel class data members:\n"; @@ -606,6 +608,8 @@ std::ostream& ossimGeometricSarSensorModel::print(std::ostream& out) const out << kwl; + out.flags(f); + return ossimSensorModel::print(out); } diff --git a/Utilities/otbossimplugins/ossim/ossimRadarSat2RPCModel.cpp b/Utilities/otbossimplugins/ossim/ossimRadarSat2RPCModel.cpp index de872568aa842ac6a6058ed3e7fd6b7196dbe882..213ec3a8e7f1de664e709d2094bb058d1ca52300 100644 --- a/Utilities/otbossimplugins/ossim/ossimRadarSat2RPCModel.cpp +++ b/Utilities/otbossimplugins/ossim/ossimRadarSat2RPCModel.cpp @@ -52,6 +52,7 @@ ossimRadarSat2RPCModel::ossimRadarSat2RPCModel() : ossimRpcModel(), theDecimation(1.0), + _sensor(NULL), theProductXmlFile(ossimFilename::NIL) { } @@ -60,6 +61,7 @@ ossimRadarSat2RPCModel::ossimRadarSat2RPCModel(const ossimRadarSat2RPCModel& rhs : ossimRpcModel(rhs), theDecimation(1.0), + _sensor(NULL), theProductXmlFile(rhs.theProductXmlFile) { diff --git a/Utilities/otbossimplugins/ossim/ossimTileMapModel.cpp b/Utilities/otbossimplugins/ossim/ossimTileMapModel.cpp index 04783892e204392aacc0be5c48aef798a321e206..844089e7563cd238673a912874f4ede635b700d3 100644 --- a/Utilities/otbossimplugins/ossim/ossimTileMapModel.cpp +++ b/Utilities/otbossimplugins/ossim/ossimTileMapModel.cpp @@ -273,6 +273,8 @@ namespace ossimplugins //***************************************************************************** void ossimTileMapModel::writeGeomTemplate(ostream& os) { + std::ios::fmtflags f(os.flags()); + if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimTileMapModel::writeGeomTemplate: entering..." << std::endl; os << @@ -283,6 +285,9 @@ namespace ossimplugins if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimTileMapModel::writeGeomTemplate: returning..." << std::endl; + + os.flags(f); + return; } } // End: namespace ossimplugins diff --git a/Utilities/otbossimplugins/ossim/ossimTileMapModel.h b/Utilities/otbossimplugins/ossim/ossimTileMapModel.h index 019049f7a8deb08640d10160c2f69c4b198f34b5..0f1c7084aa735d3d76d6949828c478a113209dc0 100644 --- a/Utilities/otbossimplugins/ossim/ossimTileMapModel.h +++ b/Utilities/otbossimplugins/ossim/ossimTileMapModel.h @@ -114,53 +114,9 @@ public: protected: - - - //*** - // Image constant parameters: - //*** - double theIllumAzimuth; - double theIllumElevation; - double theOrbitAltitude; - double theOrbitInclination; - int theMapZone; - ossimDpt theMapOffset; - int theWrsPathNumber; - int theWrsRowNumber; - double theMeridianalAngle; - double thePositionError; - - ProjectionType theProjectionType; - ossimRefPtr<ossimMapProjection> theMapProjection; - - double theMapAzimAngle; - double theMapAzimCos; - double theMapAzimSin; - double theMap2IcRotAngle; - double theMap2IcRotCos; - double theMap2IcRotSin; - // - // //*** - // // Adjustable parameters: - // //*** - double theIntrackOffset; - double theCrtrackOffset; - double theLineGsdCorr; - double theSampGsdCorr; - double theRollOffset; - double theYawOffset; - double theYawRate; - double theMapRotation; - // - // //*** - // // Quantities derived from the adjustable parameters: - // //*** - NEWMAT::Matrix theRollRotMat; - unsigned int qDepth; TYPE_DATA - }; } // End: namespace ossimplugins #endif diff --git a/Utilities/otbossimplugins/ossim/otb/Equation.cpp b/Utilities/otbossimplugins/ossim/otb/Equation.cpp index f0bf02c7b5d1a0a3665188c161a56d50326206ba..c907b712d26ec231c325043a5ac841447c98c079 100644 --- a/Utilities/otbossimplugins/ossim/otb/Equation.cpp +++ b/Utilities/otbossimplugins/ossim/otb/Equation.cpp @@ -21,7 +21,10 @@ Equation::Equation(): _coefficients(NULL), _degree(0), _nbrSol(0), - _solutions(NULL) + _solutions(NULL), + _normalisationType(Equation::GreatValues), + _normalisationCoefficient(1.), + _trueDegree(0) { _order.clear(); } @@ -38,7 +41,10 @@ Equation::Equation(int degree, std::complex<double>* coefficients): _coefficients(NULL), _degree(0), _nbrSol(0), - _solutions(NULL) + _solutions(NULL), + _normalisationType(Equation::GreatValues), + _normalisationCoefficient(1.), + _trueDegree(0) { _order.clear(); CreateEquation(degree, coefficients); @@ -65,7 +71,14 @@ void Equation::CreateEquation(int degree, std::complex<double>* coefficients) } } -Equation::Equation(const Equation& rhs) +Equation::Equation(const Equation& rhs): + _coefficients(NULL), + _degree(0), + _nbrSol(0), + _solutions(NULL), + _normalisationType(Equation::GreatValues), + _normalisationCoefficient(1.), + _trueDegree(0) { CreateEquation(rhs._degree, rhs._coefficients); } diff --git a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp index 263f972395b8f2347b021d909556ab5393a7525e..b4f88c8bbdc73afbb851a242fc145c0a2e05cdec 100644 --- a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp +++ b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp @@ -42,6 +42,7 @@ GMSTDateTime::GMSTDateTime(double tms, Ori_TSM_Green origine): GMSTDateTime::GMSTDateTime(CivilDateTime& rhs) { rhs.AsGMSTDateTime(this); + _origine = GMSTDateTime::AN1900; } GMSTDateTime& GMSTDateTime::operator=(const GMSTDateTime& rhs)