X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvGlyph2D.cxx;h=1856dd272602231ebce81c60c099174390e7c24b;hb=2a55297d4d57c41a40f74413940519d251d21f71;hp=d8ecf5ad77e4c332684e7843875d158eb0ec96e6;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git diff --git a/vv/vvGlyph2D.cxx b/vv/vvGlyph2D.cxx index d8ecf5a..1856dd2 100644 --- a/vv/vvGlyph2D.cxx +++ b/vv/vvGlyph2D.cxx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,9 +14,10 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #include "vvGlyph2D.h" +#include #include "vtkCell.h" #include "vtkDataSet.h" #include "vtkFloatArray.h" @@ -32,7 +33,6 @@ #include "vtkTransform.h" #include "vtkUnsignedCharArray.h" -vtkCxxRevisionMacro(vvGlyph2D, "DummyRevision"); vtkStandardNewMacro(vvGlyph2D); vvGlyph2D::vvGlyph2D() @@ -171,9 +171,14 @@ int vvGlyph2D::RequestData( defaultPointIds[0] = 0; defaultPointIds[1] = 1; defaultSource->SetPoints(defaultPoints); - defaultSource->InsertNextCell(VTK_LINE, 2, defaultPointIds); + defaultSource->InsertNextCell(VTK_LINE, 2, defaultPointIds); +#if VTK_MAJOR_VERSION <= 5 defaultSource->SetUpdateExtent(0, 1, 0); this->SetSource(defaultSource); +#else + this->SetUpdateExtent(0, 1, 0); + this->SetSourceData(defaultSource); +#endif defaultSource->Delete(); defaultSource = NULL; defaultPoints->Delete();