MRG

Code/FeatureExtraction/otbAngularSecondMomentumTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class AngularSecondMomentumTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbClusterProminenceTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class ClusterProminenceTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbClusterShadeTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class ClusterShadeTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbContrastTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class ContrastTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbCorrelationTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class CorrelationTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbDifferenceEntropyTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class DifferenceEntropyTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToAdvancedTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbDifferenceVarianceTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class DifferenceVarianceTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToAdvancedTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbEnergyTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class EnergyTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbEntropyTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class EntropyTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbInformationMeasureOfCorrelation1TextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class InformationMeasureOfCorrelation1TextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToAdvancedTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbInformationMeasureOfCorrelation2TextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class InformationMeasureOfCorrelation2TextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToAdvancedTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbInverseDifferenceMomentTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class InverseDifferenceMomentTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbMeanTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class MeanTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbPanTexTextureFunctor.h

@@ -18,6 +18,7 @@
 #ifndef __otbPanTexTextureFunctor_h
 #define __otbPanTexTextureFunctor_h
 
+#include "vcl_deprecated_header.h"
 #include "otbContrastTextureFunctor.h"
 
 namespace otb
@@ -25,17 +26,10 @@ namespace otb
 namespace Functor
 {
 /** \class PanTexTextureFunctor
- *  \brief This functor calculates the contrast image texture according to Haralick descriptors.
+ *  \brief <b>DEPRECATED<\b>
  *
- *  Computes contrast using joint histogram (neighborhood and offset neighborhood).
- *  The formula is:
- *  \f$ \sum_{n}n^2.p_{x-y}(n)^2 \f$
- *  TIterInput is an iterator, TOutput is a PixelType.
- *
- *  \sa TextureFunctorBase
- *  \ingroup Functor
- *  \ingroup Statistics
-   * \ingroup Textures
+ * \deprecated in OTB 3.4, please use
+ * otbScalarImageToPanTexTextureFilter instead.
  */
 
 template <class TScalarInputPixelType, class TScalarOutputPixelType>

Code/FeatureExtraction/otbPanTexTextureImageFilter.h

@@ -18,6 +18,7 @@
 #ifndef __otbPanTexTextureImageFilter_h
 #define __otbPanTexTextureImageFilter_h
 
+#include "vcl_deprecated_header.h"
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "otbPanTexTextureFunctor.h"
 #include "itkConstNeighborhoodIterator.h"
@@ -26,14 +27,11 @@ namespace otb
 {
 
 /** \class PanTexTextureImageFilter
-  * \brief This filter computes the panchromatic Texture measure.
-  *
-  * It is the min value of the contrast in 8 directions.
-  *
-  * \sa ContrastTextureFunctor
-  *
-   * \ingroup Textures
-  */
+  *  \brief <b>DEPRECATED<\b>
+ *
+ * \deprecated in OTB 3.4, please use
+ * otbScalarImageToPanTexTextureFilter instead.
+ */
 
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT PanTexTextureImageFilter :

Code/FeatureExtraction/otbPanTexTextureImageFilter.txx

@@ -18,6 +18,7 @@
 #ifndef __otbPanTexTextureImageFilter_txx
 #define __otbPanTexTextureImageFilter_txx
 
+#include "vcl_deprecated_header.h"
 #include "otbPanTexTextureImageFilter.h"
 
 namespace otb

Code/FeatureExtraction/otbPanTexTextureImageFunctionFilter.h

@@ -18,6 +18,7 @@
 #ifndef __otbPanTexTextureImageFunctionFilter_h
 #define __otbPanTexTextureImageFunctionFilter_h
 
+#include "vcl_deprecated_header.h"
 #include "itkNumericTraits.h"
 #include "itkVariableLengthVector.h"
 #include "itkConstNeighborhoodIterator.h"
@@ -30,13 +31,10 @@ namespace otb
 
 /**
  * \class PanTexTextureImageFunction
- * \brief Calculate a texture over an image.
+ *  \brief <b>DEPRECATED<\b>
  *
- * This class is templated with the input image and the Functor
- * that will compute the texture.
- *
- * \ingroup ImageFunctions
-   * \ingroup Textures
+ * \deprecated in OTB 3.4, please use
+ * otbScalarImageToPanTexTextureFilter instead.
  */
 
 template <class TInputImage, class TOutputImage, class TCoordRep = float>

Code/FeatureExtraction/otbSumAverageTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class SumAverageTextureFunctor
   *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToAdvancedTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbSumEntropyTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class SumEntropyTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToAdvancedTexturesFilter instead.
  */
 

Code/FeatureExtraction/otbSumVarianceTextureFunctor.h

@@ -28,7 +28,7 @@ namespace Functor
 /** \class SumVarianceTextureFunctor
  *  \brief <b>DEPRECATED<\b>
  *
- * \deprecated in OTB 3.2.2, please use
+ * \deprecated in OTB 3.4, please use
  * otbScalarImageToAdvancedTexturesFilter instead.
  */