MRG

Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.h

@@ -18,7 +18,7 @@
 #ifndef __otbMultiChannelRAndBAndNIRVegetationIndexImageFilter_h
 #define __otbMultiChannelRAndBAndNIRVegetationIndexImageFilter_h
 
-#define DEPRECATED "This class is deprecated"
+#define DEPRECATED "This class is deprecated, use MultiChannelRAndBAndNIRIndexImageFilter"
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"

Code/Radiometry/otbMultiChannelRAndGAndNIRVegetationIndexImageFilter.h

@@ -18,7 +18,7 @@
 #ifndef __otbMultiChannelRAndGAndNIRVegetationIndexImageFilter_h
 #define __otbMultiChannelRAndGAndNIRVegetationIndexImageFilter_h
 
-#define DEPRECATED "This class is deprecated"
+#define DEPRECATED "This class is deprecated, use MultiChannelRAndGAndNIRIndexImageFilter"
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"

Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.h

@@ -18,7 +18,7 @@
 #ifndef __otbMultiChannelRAndNIRVegetationIndexImageFilter_h
 #define __otbMultiChannelRAndNIRVegetationIndexImageFilter_h
 
-#define DEPRECATED "This class is deprecated"
+#define DEPRECATED "This class is deprecated, use MultiChannelRAndNIRIndexImageFilter"
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"

Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.h

@@ -17,7 +17,8 @@
 =========================================================================*/
 #ifndef __otbRAndBAndNIRVegetationIndexImageFilter_h
 #define __otbRAndBAndNIRVegetationIndexImageFilter_h
-#define DEPRECATED "This class is deprecated"
+
+#define DEPRECATED "This class is deprecated, use RAndBAndNIRIndexImageFilter"
 
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
@@ -78,7 +79,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndBAndNIRIndexImageFilter.txx"
+#include "otbRAndBAndNIRVegetationIndexImageFilter.txx"
 #endif
 
 

Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilter.h

@@ -17,7 +17,7 @@
 =========================================================================*/
 #ifndef __otbRAndGAndNIRVegetationIndexImageFilter_h
 #define __otbRAndGAndNIRVegetationIndexImageFilter_h
-#define DEPRECATED "This class is deprecated"
+#define DEPRECATED "This class is deprecated, use RAndGAndNIRIndexImageFilter"
 
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
@@ -78,7 +78,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndGAndNIRIndexImageFilter.txx"
+#include "otbRAndGAndNIRVegetationIndexImageFilter.txx"
 #endif
 
 

Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.h

@@ -18,6 +18,9 @@
 #ifndef __otbRAndNIRVegetationIndexImageFilter_h
 #define __otbRAndNIRVegetationIndexImageFilter_h
 
+#define DEPRECATED "This class is deprecated, use RAndNIRIndexImageFilter"
+#pragma deprecated(RAndNIRVegetationIndexImageFilter)
+
 #include "itkBinaryFunctorImageFilter.h"
 #include "otbVegetationIndicesFunctor.h"
 
@@ -28,7 +31,7 @@ namespace otb
  * \brief
  *
  */
-#pragma deprecated(RAndNIRVegetationIndexImageFilter)
+
 template <class TInputImageR, class TInputImageNIR, class TOutputImage,
 class TFunction = Functor::NDVI<              typename TInputImageR::PixelType,
 typename TInputImageNIR::PixelType,
@@ -81,7 +84,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndNIRIndexImageFilter.txx"
+#include "otbRAndNIRVegetationIndexImageFilter.txx"
 #endif
 
 

Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx

@@ -21,7 +21,7 @@
 
 #include "itkExceptionObject.h"
 
-#include "otbRAndNIRVegetationIndexImageFilter.h"
+#include "otbRAndNIRIndexImageFilter.h"
 #include "itkImage.h"
 #include "otbImage.h"