Skip to content
Snippets Groups Projects

REFACT: Deprecate `auto_ptr`

Merged Luc Hermitte requested to merge lhermitte/otb:deprecate_auto_ptr into develop
2 files
+ 75
75
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -56,16 +56,16 @@ class OTBOSSIMAdapters_EXPORT SarSensorModelAdapter: public itk::Object
{
public:
/** Standard class typedefs. */
typedef SarSensorModelAdapter Self;
typedef itk::Object Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
using Self = SarSensorModelAdapter;
using Superclass = itk::Object;
using Pointer = itk::SmartPointer<Self>;
using ConstPointer = itk::SmartPointer<const Self>;
typedef std::auto_ptr<ossimplugins::ossimSarSensorModel> InternalModelPointer;
using InternalModelPointer = std::unique_ptr<ossimplugins::ossimSarSensorModel>;
using Point2DType = itk::Point<double,2>;
using Point3DType = itk::Point<double,3>;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -77,32 +77,32 @@ public:
/** Save keyword list from model */
bool SaveState(ImageKeywordlist & image_kwl);
/** Is sensor model valid method. return false if the m_SensorModel is null*/
bool IsValidSensorModel() const;
/** Deburst metadata if possible and return lines to keep in image file */
bool Deburst(std::vector<std::pair<unsigned long, unsigned long> > & lines,
std::pair<unsigned long,unsigned long> & samples, bool onlyValidSample=false);
std::pair<unsigned long,unsigned long> & samples, bool onlyValidSample=false);
/** Burst extraction and return lines/samples to keep into image file (the required burst) */
bool BurstExtraction(const unsigned int burst_index, std::pair<unsigned long,unsigned long> & lines,
std::pair<unsigned long,unsigned long> & samples, bool allPixels=false);
bool BurstExtraction(const unsigned int burst_index, std::pair<unsigned long,unsigned long> & lines,
std::pair<unsigned long,unsigned long> & samples, bool allPixels=false);
/** Deburst metadata if possible and prepare the burst concatenation */
/** Deburst metadata if possible and prepare the burst concatenation */
bool DeburstAndConcatenate(std::vector<std::pair<unsigned long, unsigned long> > & linesBursts,
std::vector<std::pair<unsigned long,unsigned long> > & samplesBursts,
unsigned int & linesOffset, unsigned int first_burstInd,
bool inputWithInvalidPixels=false);
/** Specify overlap area between two bursts */
bool Overlap(std::pair<unsigned long,unsigned long> & linesUp,
std::pair<unsigned long,unsigned long> & linesLow,
std::pair<unsigned long,unsigned long> & samplesUp,
std::pair<unsigned long,unsigned long> & samplesLow,
unsigned int burstIndUp,
bool inputWithInvalidPixels=false);
std::vector<std::pair<unsigned long,unsigned long> > & samplesBursts,
unsigned int & linesOffset, unsigned int first_burstInd,
bool inputWithInvalidPixels=false);
/** Specify overlap area between two bursts */
bool Overlap(std::pair<unsigned long,unsigned long> & linesUp,
std::pair<unsigned long,unsigned long> & linesLow,
std::pair<unsigned long,unsigned long> & samplesUp,
std::pair<unsigned long,unsigned long> & samplesLow,
unsigned int burstIndUp,
bool inputWithInvalidPixels=false);
/** Transform world point (lat,lon,hgt) to input image point
(col,row) and YZ frame */
@@ -113,12 +113,12 @@ public:
bool WorldToLineSample(const Point3DType & inGEoPOint, Point2DType & cr) const;
/** Transform world point (lat,lon,hgt) to satellite position (x,y,z) and satellite velocity */
bool WorldToSatPositionAndVelocity(const Point3DType & inGeoPoint, Point3DType & satellitePosition,
Point3DType & satelliteVelocity) const;
bool WorldToSatPositionAndVelocity(const Point3DType & inGeoPoint, Point3DType & satellitePosition,
Point3DType & satelliteVelocity) const;
/** Transform line index to satellite position (x,y,z) and satellite velocity */
bool LineToSatPositionAndVelocity(const double line, Point3DType & satellitePosition,
Point3DType & satelliteVelocity) const;
bool LineToSatPositionAndVelocity(const double line, Point3DType & satellitePosition,
Point3DType & satelliteVelocity) const;
/** Transform world point (lat,lon,hgt) to cartesian point (x,y,z) */
static bool WorldToCartesian(const Point3DType & inGeoPoint, Point3DType & outCartesianPoint);
@@ -127,8 +127,8 @@ public:
static void DeburstLineToImageLine(const std::vector<std::pair<unsigned long,unsigned long> >& lines, unsigned long deburstLine, unsigned long & imageLine);
protected:
SarSensorModelAdapter();
virtual ~SarSensorModelAdapter() override;
Loading