diff --git a/Filtering/vtkAnnotationLayers.cxx b/Filtering/vtkAnnotationLayers.cxx index abc0d46eb7f5f34b113fa008f80efd5fb97bd885..12fab7e080e85f2d573ecc869b03e0b03cf15d58 100644 --- a/Filtering/vtkAnnotationLayers.cxx +++ b/Filtering/vtkAnnotationLayers.cxx @@ -31,7 +31,7 @@ #include <vtkstd/algorithm> #include <vtkstd/vector> -vtkCxxRevisionMacro(vtkAnnotationLayers, "1.4"); +vtkCxxRevisionMacro(vtkAnnotationLayers, "1.5"); vtkStandardNewMacro(vtkAnnotationLayers); vtkCxxSetObjectMacro(vtkAnnotationLayers, CurrentAnnotation, vtkAnnotation); @@ -191,6 +191,16 @@ void vtkAnnotationLayers::PrintSelf(ostream& os, vtkIndent indent) os << "(none)\n"; } } + os << indent << "CurrentAnnotation: "; + if (this->CurrentAnnotation) + { + os << "\n"; + this->CurrentAnnotation->PrintSelf(os, indent.GetNextIndent()); + } + else + { + os << "(none)\n"; + } } vtkAnnotationLayers* vtkAnnotationLayers::GetData(vtkInformation* info) diff --git a/Infovis/vtkSplineGraphEdges.cxx b/Infovis/vtkSplineGraphEdges.cxx index 9382b3db385719b7ea3ad4841ee8c311800958a8..19b3e0d99e71ed681773b4b3e5a4902dc461c3d4 100644 --- a/Infovis/vtkSplineGraphEdges.cxx +++ b/Infovis/vtkSplineGraphEdges.cxx @@ -37,7 +37,7 @@ #include "vtkTree.h" #include "vtkVariantArray.h" -vtkCxxRevisionMacro(vtkSplineGraphEdges, "1.1"); +vtkCxxRevisionMacro(vtkSplineGraphEdges, "1.2"); vtkStandardNewMacro(vtkSplineGraphEdges); vtkSplineGraphEdges::vtkSplineGraphEdges() @@ -95,8 +95,8 @@ int vtkSplineGraphEdges::RequestData( vtkPoints* pts = splined->GetPoints(); double pt[3]; lines->InitTraversal(); - vtkIdType numCellPts; - vtkIdType* cellPts; + vtkIdType numCellPts = 0; + vtkIdType* cellPts = 0; for (vtkIdType i = 0; i < numLines; ++i) { lines->GetNextCell(numCellPts, cellPts);