diff -aur VISU_SRC_5.1.2.old/src/CONVERTOR/VISU_MergeFilterUtilities.cxx VISU_SRC_5.1.2/src/CONVERTOR/VISU_MergeFilterUtilities.cxx --- VISU_SRC_5.1.2.old/src/CONVERTOR/VISU_MergeFilterUtilities.cxx 2009-09-19 23:50:54.000000000 +0200 +++ VISU_SRC_5.1.2/src/CONVERTOR/VISU_MergeFilterUtilities.cxx 2009-09-19 23:52:02.000000000 +0200 @@ -437,7 +437,7 @@ { CopyArray(theInput->GetArray(theFieldName), theOutput, - &vtkDataSetAttributes::AddArray, + (TSetAttribute) &vtkDataSetAttributes::AddArray, theFixedNbTuples); } diff -aur VISU_SRC_5.1.2.old/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx VISU_SRC_5.1.2/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx --- VISU_SRC_5.1.2.old/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx 2009-09-19 23:50:54.000000000 +0200 +++ VISU_SRC_5.1.2/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx 2009-09-20 00:42:33.000000000 +0200 @@ -143,7 +143,7 @@ myCellDataToPointData, GetMergedInput()); - myScalars = GetMergedInput(); + myScalars = (vtkUnstructuredGrid *) GetMergedInput(); UpdateScalars(); @@ -258,7 +258,7 @@ if(GetScalars() == theScalars) return; - myScalars = theScalars; + myScalars = (vtkUnstructuredGrid *) theScalars; UpdateScalars(); } diff -aur VISU_SRC_5.1.2.old/src/PIPELINE/VISU_XYPlotActor.cxx VISU_SRC_5.1.2/src/PIPELINE/VISU_XYPlotActor.cxx --- VISU_SRC_5.1.2.old/src/PIPELINE/VISU_XYPlotActor.cxx 2009-09-19 23:50:54.000000000 +0200 +++ VISU_SRC_5.1.2/src/PIPELINE/VISU_XYPlotActor.cxx 2009-09-20 12:28:48.000000000 +0200 @@ -747,8 +747,9 @@ this->TitleTextProperty); } - vtkAxisActor2D::SetFontSize(viewport, - this->TitleMapper, + vtkAxisActor2D::SetMultipleFontSize(viewport, + &(this->TitleMapper), + 1, size, 1.0, stringSize); @@ -1715,13 +1716,13 @@ // Estimate the padding around the X and Y axes tprop->ShallowCopy(axisX->GetTitleTextProperty()); textMapper->SetInput(axisX->GetTitle()); - vtkAxisActor2D::SetFontSize( - viewport, textMapper, size, fontFactorX, titleSizeX); + vtkAxisActor2D::SetMultipleFontSize( + viewport, &textMapper, 1, size, fontFactorX, titleSizeX); tprop->ShallowCopy(axisY->GetTitleTextProperty()); textMapper->SetInput(axisY->GetTitle()); - vtkAxisActor2D::SetFontSize( - viewport, textMapper, size, fontFactorY, titleSizeY); + vtkAxisActor2D::SetMultipleFontSize( + viewport, &textMapper, 1, size, fontFactorY, titleSizeY); // At this point the thing to do would be to actually ask the Y axis // actor to return the largest label. @@ -1730,16 +1731,16 @@ sprintf(str2, axisY->GetLabelFormat(), axisY->GetAdjustedRange()[1]); tprop->ShallowCopy(axisY->GetLabelTextProperty()); textMapper->SetInput(strlen(str1) > strlen(str2) ? str1 : str2); - vtkAxisActor2D::SetFontSize( - viewport, textMapper, size, labelFactorY * fontFactorY, labelSizeY); + vtkAxisActor2D::SetMultipleFontSize( + viewport, &textMapper, 1, size, labelFactorY * fontFactorY, labelSizeY); // We do only care of the height of the label in the X axis, so let's // use the min for example sprintf(str1, axisX->GetLabelFormat(), axisX->GetAdjustedRange()[0]); tprop->ShallowCopy(axisX->GetLabelTextProperty()); textMapper->SetInput(str1); - vtkAxisActor2D::SetFontSize( - viewport, textMapper, size, labelFactorX * fontFactorX, labelSizeX); + vtkAxisActor2D::SetMultipleFontSize( + viewport, &textMapper, 1, size, labelFactorX * fontFactorX, labelSizeX); tickOffsetX = axisX->GetTickOffset(); tickOffsetY = axisY->GetTickOffset();