Porting to VTK 6.

[modules/visu.git] / src / PIPELINE / VISU_Extractor.cxx

diff --git a/src/PIPELINE/VISU_Extractor.cxx b/src/PIPELINE/VISU_Extractor.cxx
index 455e284a29440dc7de4040185fb103f8308c36bb..8488e6818811413924458cea2c0dff37310ba958 100644 (file)
--- a/src/PIPELINE/VISU_Extractor.cxx
+++ b/src/PIPELINE/VISU_Extractor.cxx
@@ -264,33 +264,33 @@ ExecuteScalars(vtkIdType theNbOfTuples,
     vtkDataArray* aFieldArrayMOD = theInputData->GetArray("VISU_FIELD_GAUSS_MOD");
     if (aFieldArrayMOD) {
       switch (anInputDataType) {
-        vtkTemplateMacro4(Module2ScalarsMOD,
+        vtkTemplateMacro(Module2ScalarsMOD(
                           aFieldArrayMOD,
                           (VTK_TT *)(anOutputPtr),
                           theNbOfTuples,
-                          theGaussMetric);
+                          theGaussMetric));
       default:
         break;
       }
     }
     else {
       switch (anInputDataType) {
-        vtkTemplateMacro3(Module2Scalars,
+        vtkTemplateMacro(Module2Scalars(
                           aFieldArray,
                           (VTK_TT *)(anOutputPtr),
-                          theNbOfTuples);
+                          theNbOfTuples));
       default:
         break;
       }
     }
   } else {
     switch (anInputDataType) {
-      vtkTemplateMacro5(Component2Scalars,
+      vtkTemplateMacro(Component2Scalars(
                         aFieldArray,
                         (VTK_TT *)(anInputPtr),
                         (VTK_TT *)(anOutputPtr),
                         theNbOfTuples,
-                        theScalarMode - 1);
+                        theScalarMode - 1));
     default:
       break;
     }
@@ -320,10 +320,10 @@ CutScalars(vtkIdType theNbOfTuples,
   int aDecimals = std::abs( aResourceMgr->integerValue("VISU", "visual_data_precision", 6) );
 
   switch(aDataType) {
-    vtkTemplateMacro3(CutScalarsTempl,
+    vtkTemplateMacro(CutScalarsTempl(
                       (VTK_TT *)(aPtr),
                       theNbOfTuples,
-                      aDecimals);
+                      aDecimals));
   default:
     break;
   }