Merge from V6_3_1_WIN (Win32 porting) 19/07/2011

diff --git a/src/PIPELINE/VISU_CellDataToPointData.hxx b/src/PIPELINE/VISU_CellDataToPointData.hxx
index ed4fb38c63132f51e909a4ea84f79baf9c968678..f6600a5562e84ef15fcc7a3fedbe7d64e72c03d2 100644 (file)
--- a/src/PIPELINE/VISU_CellDataToPointData.hxx
+++ b/src/PIPELINE/VISU_CellDataToPointData.hxx
@@ -36,11 +36,12 @@
 #ifndef __VISU_CellDataToPointData_h
 #define __VISU_CellDataToPointData_h
 
+#include "VISUPipeline.hxx"
 #include <vtkDataSetAlgorithm.h>
 
 class vtkDataSet;
 
-class VTK_GRAPHICS_EXPORT VISU_CellDataToPointData : public vtkDataSetAlgorithm
+class VISU_PIPELINE_EXPORT VISU_CellDataToPointData : public vtkDataSetAlgorithm
 {
 public:
   static VISU_CellDataToPointData *New();

diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index dd065a5263cf3ad7a36ba9846ff70edd9ef213f2..ce49f1cdfe5c256ca77dc844a32b92f0191c800d 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -28,7 +28,6 @@
 
 #ifdef WNT
 #include <windows.h>
-#include <vfw.h>
 #include <QMessageBox>
 #endif