From 4f7363e7902121642a6eed2bc8e235b78f428b2f Mon Sep 17 00:00:00 2001 From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org> Date: Fri, 20 Aug 2010 15:22:30 +0800 Subject: [PATCH] ENH: compilation warning when using the old deprecated visu --- Code/Visu/otbFixedSizeFullImageWidget.h | 1 + Code/Visu/otbFullResolutionImageWidget.h | 2 ++ Code/Visu/otbGluPolygonDrawingHelper.h | 2 ++ Code/Visu/otbHistogramAndTransferFunctionWidget.h | 2 ++ Code/Visu/otbImageAlternateViewer.h | 2 ++ Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h | 2 ++ Code/Visu/otbImageViewer.h | 2 ++ Code/Visu/otbImageViewerBase.h | 2 ++ Code/Visu/otbImageViewerFullResolutionEventsInterface.h | 2 ++ Code/Visu/otbImageViewerFullWidget.h | 2 ++ Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h | 2 ++ Code/Visu/otbImageViewerScrollWidget.h | 2 ++ Code/Visu/otbImageViewerZoomWidget.h | 2 ++ Code/Visu/otbImageWidgetBase.h | 2 ++ Code/Visu/otbImageWidgetBoxForm.h | 2 ++ Code/Visu/otbImageWidgetCircleForm.h | 2 ++ Code/Visu/otbImageWidgetFormBase.h | 2 ++ Code/Visu/otbImageWidgetPointForm.h | 2 ++ Code/Visu/otbImageWidgetPolygonForm.h | 2 ++ Code/Visu/otbImageWidgetPolylineForm.h | 2 ++ Code/Visu/otbImageWidgetRectangleForm.h | 2 ++ Code/Visu/otbImageWidgetTransferFunction.h | 2 ++ Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h | 2 ++ Code/Visu/otbZoomableImageWidget.h | 2 ++ 24 files changed, 47 insertions(+) diff --git a/Code/Visu/otbFixedSizeFullImageWidget.h b/Code/Visu/otbFixedSizeFullImageWidget.h index 0b3ae5b6a2..a0ba9883c0 100644 --- a/Code/Visu/otbFixedSizeFullImageWidget.h +++ b/Code/Visu/otbFixedSizeFullImageWidget.h @@ -18,6 +18,7 @@ #ifndef __otbFixedSizeFullImageWidget_h #define __otbFixedSizeFullImageWidget_h +#include "vcl_deprecated_header.h" #include "otbImageWidgetBase.h" namespace otb diff --git a/Code/Visu/otbFullResolutionImageWidget.h b/Code/Visu/otbFullResolutionImageWidget.h index f54df8df4c..0703e1d220 100644 --- a/Code/Visu/otbFullResolutionImageWidget.h +++ b/Code/Visu/otbFullResolutionImageWidget.h @@ -18,6 +18,8 @@ #ifndef __otbFullResolutionImageWidget_h #define __otbFullResolutionImageWidget_h +#include "vcl_deprecated_header.h" + #include "otbImageWidgetBase.h" namespace otb diff --git a/Code/Visu/otbGluPolygonDrawingHelper.h b/Code/Visu/otbGluPolygonDrawingHelper.h index f8811ce44d..f676de49d1 100644 --- a/Code/Visu/otbGluPolygonDrawingHelper.h +++ b/Code/Visu/otbGluPolygonDrawingHelper.h @@ -18,6 +18,8 @@ #ifndef __otbGluPolygonDrawingHelper_h #define __otbGluPolygonDrawingHelper_h +#include "vcl_deprecated_header.h" + #include <FL/gl.h> # ifdef __APPLE__ # include <OpenGL/glu.h> diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.h b/Code/Visu/otbHistogramAndTransferFunctionWidget.h index 971fbf82bf..8c96f4c113 100644 --- a/Code/Visu/otbHistogramAndTransferFunctionWidget.h +++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.h @@ -18,6 +18,8 @@ #ifndef __otbHistogramAndTransferFunctionWidget_h #define __otbHistogramAndTransferFunctionWidget_h +#include "vcl_deprecated_header.h" + #include "itkProcessObject.h" #include "itkFixedArray.h" #include "otbImageWidgetTransferFunction.h" diff --git a/Code/Visu/otbImageAlternateViewer.h b/Code/Visu/otbImageAlternateViewer.h index 377ee83a90..8cb3ed3b51 100644 --- a/Code/Visu/otbImageAlternateViewer.h +++ b/Code/Visu/otbImageAlternateViewer.h @@ -18,6 +18,8 @@ #ifndef __otbImageAlternateViewer_h #define __otbImageAlternateViewer_h +#include "vcl_deprecated_header.h" + #include "FL/Fl_Gl_Window.H" #include "itkObject.h" #include "otbImageList.h" diff --git a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h index f57d541b5e..f7bda90296 100644 --- a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h +++ b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h @@ -18,6 +18,8 @@ #ifndef __otbImageToGrayscaleAnaglyphImageFilter_h #define __otbImageToGrayscaleAnaglyphImageFilter_h +#include "vcl_deprecated_header.h" + #include "itkBinaryFunctorImageFilter.h" #include "itkNumericTraits.h" diff --git a/Code/Visu/otbImageViewer.h b/Code/Visu/otbImageViewer.h index 57981bd3b9..7923ff2b89 100644 --- a/Code/Visu/otbImageViewer.h +++ b/Code/Visu/otbImageViewer.h @@ -18,6 +18,8 @@ #ifndef __otbImageViewer_h #define __otbImageViewer_h +#include "vcl_deprecated_header.h" + #include "otbImageViewerBase.h" #include <FL/Fl_Multiline_Output.H> diff --git a/Code/Visu/otbImageViewerBase.h b/Code/Visu/otbImageViewerBase.h index 296a7351aa..2816965866 100644 --- a/Code/Visu/otbImageViewerBase.h +++ b/Code/Visu/otbImageViewerBase.h @@ -18,6 +18,8 @@ #ifndef __otbImageViewerBase_h #define __otbImageViewerBase_h +#include "vcl_deprecated_header.h" + #include <string> #include "itkObject.h" #include "otbImageViewerScrollWidget.h" diff --git a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h index 6fd04f2d27..603794a987 100644 --- a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h +++ b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h @@ -18,6 +18,8 @@ #ifndef __otbImageViewerFullResolutionEventsInterface_h #define __otbImageViewerFullResolutionEventsInterface_h +#include "vcl_deprecated_header.h" + #include "itkObject.h" #include "itkImageRegion.h" #include "otbMacro.h" diff --git a/Code/Visu/otbImageViewerFullWidget.h b/Code/Visu/otbImageViewerFullWidget.h index 449fd3a826..1162736ec2 100644 --- a/Code/Visu/otbImageViewerFullWidget.h +++ b/Code/Visu/otbImageViewerFullWidget.h @@ -18,6 +18,8 @@ #ifndef __otbImageViewerFullWidget_h #define __otbImageViewerFullWidget_h +#include "vcl_deprecated_header.h" + #include "otbFullResolutionImageWidget.h" #include "otbImageViewerFullResolutionEventsInterface.h" #include "otbImageWidgetBoxForm.h" diff --git a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h index 1e08fed512..dd5553c0df 100644 --- a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h +++ b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h @@ -18,6 +18,8 @@ #ifndef __otbImageViewerHistogramAndTransferFunctionWidget_h #define __otbImageViewerHistogramAndTransferFunctionWidget_h +#include "vcl_deprecated_header.h" + #include "otbHistogramAndTransferFunctionWidget.h" namespace otb diff --git a/Code/Visu/otbImageViewerScrollWidget.h b/Code/Visu/otbImageViewerScrollWidget.h index 852085428e..c1193dcb2f 100644 --- a/Code/Visu/otbImageViewerScrollWidget.h +++ b/Code/Visu/otbImageViewerScrollWidget.h @@ -18,6 +18,8 @@ #ifndef __otbImageViewerScrollWidget_h #define __otbImageViewerScrollWidget_h +#include "vcl_deprecated_header.h" + #include "otbFixedSizeFullImageWidget.h" #include "otbImageWidgetRectangleForm.h" #include "otbImageWidgetBoxForm.h" diff --git a/Code/Visu/otbImageViewerZoomWidget.h b/Code/Visu/otbImageViewerZoomWidget.h index dd23f85ee7..6141d0a8f8 100644 --- a/Code/Visu/otbImageViewerZoomWidget.h +++ b/Code/Visu/otbImageViewerZoomWidget.h @@ -18,6 +18,8 @@ #ifndef __otbImageViewerZoomWidget_h #define __otbImageViewerZoomWidget_h +#include "vcl_deprecated_header.h" + #include "otbZoomableImageWidget.h" #include "otbImageWidgetRectangleForm.h" #include "otbImageWidgetBoxForm.h" diff --git a/Code/Visu/otbImageWidgetBase.h b/Code/Visu/otbImageWidgetBase.h index 3a5baebfc6..ff25c20a33 100644 --- a/Code/Visu/otbImageWidgetBase.h +++ b/Code/Visu/otbImageWidgetBase.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetBase_h #define __otbImageWidgetBase_h +#include "vcl_deprecated_header.h" + #include <FL/gl.h> #include "FL/Fl_Gl_Window.H" #include "otbVectorImage.h" diff --git a/Code/Visu/otbImageWidgetBoxForm.h b/Code/Visu/otbImageWidgetBoxForm.h index 402ce9a878..658bc242e6 100644 --- a/Code/Visu/otbImageWidgetBoxForm.h +++ b/Code/Visu/otbImageWidgetBoxForm.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetBoxForm_h #define __otbImageWidgetBoxForm_h +#include "vcl_deprecated_header.h" + #include "itkSize.h" #include "itkIndex.h" #include "otbImageWidgetFormBase.h" diff --git a/Code/Visu/otbImageWidgetCircleForm.h b/Code/Visu/otbImageWidgetCircleForm.h index 345276f68d..da211823a8 100644 --- a/Code/Visu/otbImageWidgetCircleForm.h +++ b/Code/Visu/otbImageWidgetCircleForm.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetCircleForm_h #define __otbImageWidgetCircleForm_h +#include "vcl_deprecated_header.h" + #include "itkSize.h" #include "itkIndex.h" #include "otbImageWidgetFormBase.h" diff --git a/Code/Visu/otbImageWidgetFormBase.h b/Code/Visu/otbImageWidgetFormBase.h index 5c3d2355da..d5525aafff 100644 --- a/Code/Visu/otbImageWidgetFormBase.h +++ b/Code/Visu/otbImageWidgetFormBase.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetFormBase_h #define __otbImageWidgetFormBase_h +#include "vcl_deprecated_header.h" + #include "itkDataObject.h" #include "itkObjectFactory.h" #include "itkFixedArray.h" diff --git a/Code/Visu/otbImageWidgetPointForm.h b/Code/Visu/otbImageWidgetPointForm.h index 6854bcd9fe..1881301cfa 100644 --- a/Code/Visu/otbImageWidgetPointForm.h +++ b/Code/Visu/otbImageWidgetPointForm.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetPointForm_h #define __otbImageWidgetPointForm_h +#include "vcl_deprecated_header.h" + #include "itkIndex.h" #include "otbImageWidgetFormBase.h" diff --git a/Code/Visu/otbImageWidgetPolygonForm.h b/Code/Visu/otbImageWidgetPolygonForm.h index 557537ae53..75d33aa11d 100644 --- a/Code/Visu/otbImageWidgetPolygonForm.h +++ b/Code/Visu/otbImageWidgetPolygonForm.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetPolygonForm_h #define __otbImageWidgetPolygonForm_h +#include "vcl_deprecated_header.h" + #include "itkSize.h" #include "itkIndex.h" #include "otbImageWidgetFormBase.h" diff --git a/Code/Visu/otbImageWidgetPolylineForm.h b/Code/Visu/otbImageWidgetPolylineForm.h index 2f2c57ca08..6c2e7700db 100644 --- a/Code/Visu/otbImageWidgetPolylineForm.h +++ b/Code/Visu/otbImageWidgetPolylineForm.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetPolylineForm_h #define __otbImageWidgetPolylineForm_h +#include "vcl_deprecated_header.h" + #include "itkSize.h" #include "itkIndex.h" #include "otbImageWidgetFormBase.h" diff --git a/Code/Visu/otbImageWidgetRectangleForm.h b/Code/Visu/otbImageWidgetRectangleForm.h index 41c0e461bf..242b9ecce2 100644 --- a/Code/Visu/otbImageWidgetRectangleForm.h +++ b/Code/Visu/otbImageWidgetRectangleForm.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetRectangleForm_h #define __otbImageWidgetRectangleForm_h +#include "vcl_deprecated_header.h" + #include "otbImageWidgetFormBase.h" #include "otbMacro.h" diff --git a/Code/Visu/otbImageWidgetTransferFunction.h b/Code/Visu/otbImageWidgetTransferFunction.h index 7c2fe6f477..847a49fafd 100644 --- a/Code/Visu/otbImageWidgetTransferFunction.h +++ b/Code/Visu/otbImageWidgetTransferFunction.h @@ -18,6 +18,8 @@ #ifndef __otbImageWidgetTransferFunction_h #define __otbImageWidgetTransferFunction_h +#include "vcl_deprecated_header.h" + #include "itkProcessObject.h" #include "itkMacro.h" #include "otbMath.h" diff --git a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h index 6818ab677f..69ff2e5881 100644 --- a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h +++ b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h @@ -18,6 +18,8 @@ #ifndef __otbVectorImageToColorAnaglyphVectorImageFilter_h #define __otbVectorImageToColorAnaglyphVectorImageFilter_h +#include "vcl_deprecated_header.h" + #include "itkBinaryFunctorImageFilter.h" #include "itkNumericTraits.h" diff --git a/Code/Visu/otbZoomableImageWidget.h b/Code/Visu/otbZoomableImageWidget.h index afe8761b9f..c79b485cd9 100644 --- a/Code/Visu/otbZoomableImageWidget.h +++ b/Code/Visu/otbZoomableImageWidget.h @@ -18,6 +18,8 @@ #ifndef __otbZoomableImageWidget_h #define __otbZoomableImageWidget_h +#include "vcl_deprecated_header.h" + #include "otbImageWidgetBase.h" namespace otb -- GitLab