diff --git a/Code/IO/otbPointSetFileReader.txx b/Code/IO/otbPointSetFileReader.txx index 0c04e45193de55febdb6a3a650b445f4db784492..7361501617f05080b5a1136ef3d77bf84de7fadf 100644 --- a/Code/IO/otbPointSetFileReader.txx +++ b/Code/IO/otbPointSetFileReader.txx @@ -172,7 +172,6 @@ void PointSetFileReader<TOutputPointSet> point[1] = p.GetY(); point[2] = p.GetZ(); - unsigned long i = output->GetNumberOfPoints(); output->SetPoint( i, point ); diff --git a/Code/Projections/otbCompositeTransform.h b/Code/Projections/otbCompositeTransform.h index 06e97cbd794991112b63c73d897821568031c49b..601786b2606431f7c93b18420e3f56ea745be93f 100644 --- a/Code/Projections/otbCompositeTransform.h +++ b/Code/Projections/otbCompositeTransform.h @@ -39,15 +39,15 @@ namespace otb * \ingroup Transform */ -typedef enum -{ - PROJDEFAULT=0, - PROJIDENTITY=1, - PROJMAPFORWARD=2, - PROJMAPINVERSE=3, - PROJSENSORFORWARD=4, - PROJSENSORINVERSE=5 -} ProjectionTypeEnum; +//typedef enum +//{ +// PROJDEFAULT=0, +// PROJIDENTITY=1, +// PROJMAPFORWARD=2, +// PROJMAPINVERSE=3, +// PROJSENSORFORWARD=4, +// PROJSENSORINVERSE=5 +//} ProjectionTypeEnum; template <class TFirstTransform, class TSecondTransform, diff --git a/Code/Projections/otbCompositeTransform.txx b/Code/Projections/otbCompositeTransform.txx index 9ddf5c53de43444a19030fe276c2f8002d2b1785..4bdd5026c2ad46aa68d53a697419dfcdbcab11f7 100644 --- a/Code/Projections/otbCompositeTransform.txx +++ b/Code/Projections/otbCompositeTransform.txx @@ -82,7 +82,7 @@ NOutputDimensions> SecondTransformOutputPointType outputPoint; outputPoint=m_SecondTransform->TransformPoint(geoPoint); -// otbMsgDevMacro(<< "Converting: " << point1 << " -> " << geoPoint<< " -> " << outputPoint); +// otbMsgDevMacro(<< std::setprecision(15) << "Converting: " << point1 << " -> " << geoPoint<< " -> " << outputPoint); return outputPoint; } diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx index 19843d07ceb19b3aa9a6f40b55a05a808ef3ef58..7ec3532d15ff564bb4e96d635a835d76d34a3e37 100644 --- a/Code/Projections/otbGenericRSTransform.txx +++ b/Code/Projections/otbGenericRSTransform.txx @@ -265,6 +265,8 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions> outputPoint[0] = (outputPoint[0] - m_OutputOrigin[0]) / m_OutputSpacing[0]; outputPoint[1] = (outputPoint[1] - m_OutputOrigin[1]) / m_OutputSpacing[1]; +// otbMsgDevMacro("GenericRSTransform: " << point << " -> " << outputPoint); + return outputPoint; } diff --git a/Code/Projections/otbInverseSensorModel.txx b/Code/Projections/otbInverseSensorModel.txx index 4e1fdc1e7c834d9f875ec99fe158596d13e65892..6dbcaf21461ec075b670fee5ef434b78085181b0 100644 --- a/Code/Projections/otbInverseSensorModel.txx +++ b/Code/Projections/otbInverseSensorModel.txx @@ -86,7 +86,10 @@ InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions> outputPoint[0]=ossimDPoint.x; outputPoint[1]=ossimDPoint.y; - + if (OutputPointType::PointDimension == 3) + { + outputPoint[2] = ossimGPoint.height(); + } // otbMsgDevMacro(<< "Point in sensor geometry: (" << outputPoint[0] << "," << outputPoint[1] << ")"); return outputPoint; diff --git a/Code/Projections/otbSensorModelBase.txx b/Code/Projections/otbSensorModelBase.txx index 9c573783071288a5e8f46b3bd84699c54b2bacfe..03fccd16992052396426186bc9c115edca67474b 100644 --- a/Code/Projections/otbSensorModelBase.txx +++ b/Code/Projections/otbSensorModelBase.txx @@ -37,7 +37,7 @@ template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions > SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions> -::SensorModelBase() +::SensorModelBase(): Superclass(OutputSpaceDimension, 0) { m_Model = NULL; m_DEMHandler = DEMHandlerType::New();