diff -crB VTK/Charts/vtkColorTransferControlPointsItem.cxx VTKNew/Charts/vtkColorTransferControlPointsItem.cxx *** VTK/Charts/vtkColorTransferControlPointsItem.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkColorTransferControlPointsItem.cxx 2013-09-24 12:01:58.915764100 +0200 *************** *** 77,83 **** } //----------------------------------------------------------------------------- ! unsigned long int vtkColorTransferControlPointsItem::GetControlPointsMTime() { if (this->ColorTransferFunction) { --- 77,83 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkColorTransferControlPointsItem::GetControlPointsMTime() { if (this->ColorTransferFunction) { diff -crB VTK/Charts/vtkColorTransferControlPointsItem.h VTKNew/Charts/vtkColorTransferControlPointsItem.h *** VTK/Charts/vtkColorTransferControlPointsItem.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkColorTransferControlPointsItem.h 2013-09-24 12:01:58.881762100 +0200 *************** *** 87,93 **** virtual void emitEvent(unsigned long event, void* params); ! virtual unsigned long int GetControlPointsMTime(); virtual void DrawPoint(vtkContext2D* painter, vtkIdType index); virtual void EditPoint(float tX, float tY); --- 87,93 ---- virtual void emitEvent(unsigned long event, void* params); ! virtual vtkTimeStamp GetControlPointsMTime(); virtual void DrawPoint(vtkContext2D* painter, vtkIdType index); virtual void EditPoint(float tX, float tY); diff -crB VTK/Charts/vtkCompositeControlPointsItem.cxx VTKNew/Charts/vtkCompositeControlPointsItem.cxx *** VTK/Charts/vtkCompositeControlPointsItem.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkCompositeControlPointsItem.cxx 2013-09-24 12:05:54.719251200 +0200 *************** *** 99,107 **** } //----------------------------------------------------------------------------- ! unsigned long int vtkCompositeControlPointsItem::GetControlPointsMTime() { ! unsigned long int mTime = this->Superclass::GetControlPointsMTime(); if (this->OpacityFunction) { mTime = std::max(mTime, this->OpacityFunction->GetMTime()); --- 99,107 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkCompositeControlPointsItem::GetControlPointsMTime() { ! vtkTimeStamp mTime = this->Superclass::GetControlPointsMTime(); if (this->OpacityFunction) { mTime = std::max(mTime, this->OpacityFunction->GetMTime()); diff -crB VTK/Charts/vtkCompositeControlPointsItem.h VTKNew/Charts/vtkCompositeControlPointsItem.h *** VTK/Charts/vtkCompositeControlPointsItem.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkCompositeControlPointsItem.h 2013-09-24 12:05:54.641246800 +0200 *************** *** 104,110 **** virtual void emitEvent(unsigned long event, void* params); ! virtual unsigned long int GetControlPointsMTime(); virtual vtkIdType GetNumberOfPoints()const; virtual void DrawPoint(vtkContext2D* painter, vtkIdType index); --- 104,110 ---- virtual void emitEvent(unsigned long event, void* params); ! virtual vtkTimeStamp GetControlPointsMTime(); virtual vtkIdType GetNumberOfPoints()const; virtual void DrawPoint(vtkContext2D* painter, vtkIdType index); diff -crB VTK/Charts/vtkContextInteractorStyle.cxx VTKNew/Charts/vtkContextInteractorStyle.cxx *** VTK/Charts/vtkContextInteractorStyle.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkContextInteractorStyle.cxx 2013-09-24 12:05:54.713250900 +0200 *************** *** 38,44 **** this->InteractorCallbackCommand->SetClientData(this); this->InteractorCallbackCommand->SetCallback( vtkContextInteractorStyle::ProcessInteractorEvents); - this->LastSceneRepaintMTime = 0; this->TimerId = 0; this->TimerCallbackInitialized = false; } --- 38,43 ---- diff -crB VTK/Charts/vtkContextInteractorStyle.h VTKNew/Charts/vtkContextInteractorStyle.h *** VTK/Charts/vtkContextInteractorStyle.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkContextInteractorStyle.h 2013-09-24 12:01:58.863761100 +0200 *************** *** 141,147 **** vtkNew SceneCallbackCommand; vtkNew InteractorCallbackCommand; int ProcessingEvents; ! unsigned long int LastSceneRepaintMTime; unsigned long int TimerId; bool TimerCallbackInitialized; --- 141,147 ---- vtkNew SceneCallbackCommand; vtkNew InteractorCallbackCommand; int ProcessingEvents; ! vtkTimeStamp LastSceneRepaintMTime; unsigned long int TimerId; bool TimerCallbackInitialized; diff -crB VTK/Charts/vtkControlPointsItem.h VTKNew/Charts/vtkControlPointsItem.h *** VTK/Charts/vtkControlPointsItem.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkControlPointsItem.h 2013-09-24 12:02:55.041974300 +0200 *************** *** 298,304 **** // Must be reimplemented by subclasses to calculate the points to draw. // It's subclass responsibility to call ComputePoints() via the callback virtual void ComputePoints(); ! virtual unsigned long int GetControlPointsMTime() =0; // Description: // Returns true if the supplied x, y coordinate is on a control point. --- 298,304 ---- // Must be reimplemented by subclasses to calculate the points to draw. // It's subclass responsibility to call ComputePoints() via the callback virtual void ComputePoints(); ! virtual vtkTimeStamp GetControlPointsMTime() =0; // Description: // Returns true if the supplied x, y coordinate is on a control point. diff -crB VTK/Charts/vtkPiecewiseControlPointsItem.cxx VTKNew/Charts/vtkPiecewiseControlPointsItem.cxx *** VTK/Charts/vtkPiecewiseControlPointsItem.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkPiecewiseControlPointsItem.cxx 2013-09-24 12:01:58.905763500 +0200 *************** *** 76,82 **** } //----------------------------------------------------------------------------- ! unsigned long int vtkPiecewiseControlPointsItem::GetControlPointsMTime() { if (this->PiecewiseFunction) { --- 76,82 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkPiecewiseControlPointsItem::GetControlPointsMTime() { if (this->PiecewiseFunction) { diff -crB VTK/Charts/vtkPiecewiseControlPointsItem.h VTKNew/Charts/vtkPiecewiseControlPointsItem.h *** VTK/Charts/vtkPiecewiseControlPointsItem.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkPiecewiseControlPointsItem.h 2013-09-24 12:01:58.842759900 +0200 *************** *** 70,76 **** virtual void emitEvent(unsigned long event, void* params = 0); ! virtual unsigned long int GetControlPointsMTime(); virtual vtkIdType GetNumberOfPoints()const; virtual void GetControlPoint(vtkIdType index, double *point)const; --- 70,76 ---- virtual void emitEvent(unsigned long event, void* params = 0); ! virtual vtkTimeStamp GetControlPointsMTime(); virtual vtkIdType GetNumberOfPoints()const; virtual void GetControlPoint(vtkIdType index, double *point)const; diff -crB VTK/Charts/vtkPlotPoints.cxx VTKNew/Charts/vtkPlotPoints.cxx *** VTK/Charts/vtkPlotPoints.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkPlotPoints.cxx 2013-09-24 12:01:58.901763300 +0200 *************** *** 133,139 **** this->UpdateTableCache(table); } else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) || ! (this->YAxis && this->YAxis->GetMaximum() > this->BuildTime)) { if (this->LogX != this->XAxis->GetLogScale() || this->LogY != this->YAxis->GetLogScale()) --- 133,139 ---- this->UpdateTableCache(table); } else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) || ! (this->YAxis && this->YAxis->GetMTime() > this->BuildTime)) { if (this->LogX != this->XAxis->GetLogScale() || this->LogY != this->YAxis->GetLogScale()) diff -crB VTK/Charts/vtkPlotStacked.cxx VTKNew/Charts/vtkPlotStacked.cxx *** VTK/Charts/vtkPlotStacked.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Charts/vtkPlotStacked.cxx 2013-09-24 12:05:54.708250600 +0200 *************** *** 614,620 **** this->UpdateTableCache(table); } else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) || ! (this->YAxis && this->YAxis->GetMaximum() > this->BuildTime)) { if (this->LogX != this->XAxis->GetLogScale() || this->LogY != this->YAxis->GetLogScale()) --- 614,620 ---- this->UpdateTableCache(table); } else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) || ! (this->YAxis && this->YAxis->GetMTime() > this->BuildTime)) { if (this->LogX != this->XAxis->GetLogScale() || this->LogY != this->YAxis->GetLogScale()) diff -crB VTK/Common/vtkAbstractTransform.cxx VTKNew/Common/vtkAbstractTransform.cxx *** VTK/Common/vtkAbstractTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAbstractTransform.cxx 2013-09-24 09:09:22.065386100 +0200 *************** *** 312,323 **** //---------------------------------------------------------------------------- // Need to check inverse's MTime if we are an inverse transform ! unsigned long vtkAbstractTransform::GetMTime() { ! unsigned long mtime = this->vtkObject::GetMTime(); if (this->DependsOnInverse) { ! unsigned long inverseMTime = this->MyInverse->GetMTime(); if (inverseMTime > mtime) { return inverseMTime; --- 312,323 ---- //---------------------------------------------------------------------------- // Need to check inverse's MTime if we are an inverse transform ! vtkTimeStamp vtkAbstractTransform::GetMTime() { ! vtkTimeStamp mtime = this->vtkObject::GetMTime(); if (this->DependsOnInverse) { ! vtkTimeStamp inverseMTime = this->MyInverse->GetMTime(); if (inverseMTime > mtime) { return inverseMTime; *************** *** 709,718 **** } //---------------------------------------------------------------------------- ! unsigned long vtkTransformConcatenation::GetMaxMTime() { ! unsigned long result = 0; ! unsigned long mtime; for (int i = 0; i < this->NumberOfTransforms; i++) { --- 709,718 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkTransformConcatenation::GetMaxMTime() { ! vtkTimeStamp result; ! vtkTimeStamp mtime; for (int i = 0; i < this->NumberOfTransforms; i++) { diff -crB VTK/Common/vtkAbstractTransform.h VTKNew/Common/vtkAbstractTransform.h *** VTK/Common/vtkAbstractTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAbstractTransform.h 2013-09-24 09:11:21.305206200 +0200 *************** *** 234,240 **** // Description: // Override GetMTime necessary because of inverse transforms. ! unsigned long GetMTime(); // Description: // Needs a special UnRegister() implementation to avoid --- 234,240 ---- // Description: // Override GetMTime necessary because of inverse transforms. ! vtkTimeStamp GetMTime(); // Description: // Needs a special UnRegister() implementation to avoid *************** *** 373,379 **** // Description: // get maximum MTime of all transforms ! unsigned long GetMaxMTime(); void PrintSelf(ostream& os, vtkIndent indent); --- 373,379 ---- // Description: // get maximum MTime of all transforms ! vtkTimeStamp GetMaxMTime(); void PrintSelf(ostream& os, vtkIndent indent); diff -crB VTK/Common/vtkAssemblyNode.cxx VTKNew/Common/vtkAssemblyNode.cxx *** VTK/Common/vtkAssemblyNode.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAssemblyNode.cxx 2013-09-24 09:02:24.220486700 +0200 *************** *** 61,70 **** this->Matrix = newMatrix; } ! unsigned long vtkAssemblyNode::GetMTime() { ! unsigned long propMTime=0; ! unsigned long matrixMTime=0; if ( this->ViewProp != NULL ) { --- 61,70 ---- this->Matrix = newMatrix; } ! vtkTimeStamp vtkAssemblyNode::GetMTime() { ! vtkTimeStamp propMTime; ! vtkTimeStamp matrixMTime; if ( this->ViewProp != NULL ) { diff -crB VTK/Common/vtkAssemblyNode.h VTKNew/Common/vtkAssemblyNode.h *** VTK/Common/vtkAssemblyNode.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAssemblyNode.h 2013-09-24 08:55:54.888218200 +0200 *************** *** 74,80 **** // Description: // Override the standard GetMTime() to check for the modified times // of the prop and matrix. ! virtual unsigned long GetMTime(); // Disable warnings about qualifiers on return types. #if defined(_COMPILER_VERSION) --- 74,80 ---- // Description: // Override the standard GetMTime() to check for the modified times // of the prop and matrix. ! virtual vtkTimeStamp GetMTime(); // Disable warnings about qualifiers on return types. #if defined(_COMPILER_VERSION) diff -crB VTK/Common/vtkAssemblyPath.cxx VTKNew/Common/vtkAssemblyPath.cxx *** VTK/Common/vtkAssemblyPath.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAssemblyPath.cxx 2013-09-24 08:55:55.210236600 +0200 *************** *** 109,118 **** } } ! unsigned long vtkAssemblyPath::GetMTime() { ! unsigned long mtime=this->vtkCollection::GetMTime(); ! unsigned long nodeMTime; vtkAssemblyNode *node; for ( this->InitTraversal(); (node = this->GetNextNode()); ) --- 109,118 ---- } } ! vtkTimeStamp vtkAssemblyPath::GetMTime() { ! vtkTimeStamp mtime=this->vtkCollection::GetMTime(); ! vtkTimeStamp nodeMTime; vtkAssemblyNode *node; for ( this->InitTraversal(); (node = this->GetNextNode()); ) diff -crB VTK/Common/vtkAssemblyPath.h VTKNew/Common/vtkAssemblyPath.h *** VTK/Common/vtkAssemblyPath.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAssemblyPath.h 2013-09-24 08:55:54.596201500 +0200 *************** *** 84,90 **** // Description: // Override the standard GetMTime() to check for the modified times // of the nodes in this path. ! virtual unsigned long GetMTime(); //BTX // Description: --- 84,90 ---- // Description: // Override the standard GetMTime() to check for the modified times // of the nodes in this path. ! virtual vtkTimeStamp GetMTime(); //BTX // Description: diff -crB VTK/Common/vtkAssemblyPaths.cxx VTKNew/Common/vtkAssemblyPaths.cxx *** VTK/Common/vtkAssemblyPaths.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAssemblyPaths.cxx 2013-09-24 08:55:55.204236300 +0200 *************** *** 17,26 **** vtkStandardNewMacro(vtkAssemblyPaths); ! unsigned long vtkAssemblyPaths::GetMTime() { ! unsigned long mtime=this->vtkCollection::GetMTime(); ! unsigned long pathMTime; vtkAssemblyPath *path; for ( this->InitTraversal(); (path = this->GetNextItem()); ) --- 17,26 ---- vtkStandardNewMacro(vtkAssemblyPaths); ! vtkTimeStamp vtkAssemblyPaths::GetMTime() { ! vtkTimeStamp mtime=this->vtkCollection::GetMTime(); ! vtkTimeStamp pathMTime; vtkAssemblyPath *path; for ( this->InitTraversal(); (path = this->GetNextItem()); ) diff -crB VTK/Common/vtkAssemblyPaths.h VTKNew/Common/vtkAssemblyPaths.h *** VTK/Common/vtkAssemblyPaths.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkAssemblyPaths.h 2013-09-24 08:55:54.450193200 +0200 *************** *** 56,62 **** // Description: // Override the standard GetMTime() to check for the modified times // of the paths. ! virtual unsigned long GetMTime(); //BTX // Description: --- 56,62 ---- // Description: // Override the standard GetMTime() to check for the modified times // of the paths. ! virtual vtkTimeStamp GetMTime(); //BTX // Description: diff -crB VTK/Common/vtkFastNumericConversion.h VTKNew/Common/vtkFastNumericConversion.h *** VTK/Common/vtkFastNumericConversion.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkFastNumericConversion.h 2013-09-24 08:55:54.002167500 +0200 *************** *** 282,288 **** // the conversion safe with respect to rounding mode. This is the // same as the difference between QuickFloor and SafeFloor. bits++; ! unsigned long mtime = this->GetMTime(); this->SetinternalReservedFracBits(bits); if (mtime != this->GetMTime()) { --- 282,288 ---- // the conversion safe with respect to rounding mode. This is the // same as the difference between QuickFloor and SafeFloor. bits++; ! vtkTimeStamp mtime = this->GetMTime(); this->SetinternalReservedFracBits(bits); if (mtime != this->GetMTime()) { diff -crB VTK/Common/vtkGeneralTransform.cxx VTKNew/Common/vtkGeneralTransform.cxx *** VTK/Common/vtkGeneralTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkGeneralTransform.cxx 2013-09-24 09:02:24.215486400 +0200 *************** *** 302,311 **** } //---------------------------------------------------------------------------- ! unsigned long vtkGeneralTransform::GetMTime() { ! unsigned long mtime = this->vtkAbstractTransform::GetMTime(); ! unsigned long mtime2; if (this->Input) { --- 302,311 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGeneralTransform::GetMTime() { ! vtkTimeStamp mtime = this->vtkAbstractTransform::GetMTime(); ! vtkTimeStamp mtime2; if (this->Input) { diff -crB VTK/Common/vtkGeneralTransform.h VTKNew/Common/vtkGeneralTransform.h *** VTK/Common/vtkGeneralTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkGeneralTransform.h 2013-09-24 09:02:24.066477900 +0200 *************** *** 211,217 **** // Description: // Override GetMTime to account for input and concatenation. ! unsigned long GetMTime(); protected: vtkGeneralTransform(); --- 211,217 ---- // Description: // Override GetMTime to account for input and concatenation. ! vtkTimeStamp GetMTime(); protected: vtkGeneralTransform(); diff -crB VTK/Common/vtkImplicitFunction.cxx VTKNew/Common/vtkImplicitFunction.cxx *** VTK/Common/vtkImplicitFunction.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkImplicitFunction.cxx 2013-09-24 09:02:24.209486100 +0200 *************** *** 114,123 **** // Overload standard modified time function. If Transform is modified, // then this object is modified as well. ! unsigned long vtkImplicitFunction::GetMTime() { ! unsigned long mTime=this->vtkObject::GetMTime(); ! unsigned long TransformMTime; if ( this->Transform != NULL ) { --- 114,123 ---- // Overload standard modified time function. If Transform is modified, // then this object is modified as well. ! vtkTimeStamp vtkImplicitFunction::GetMTime() { ! vtkTimeStamp mTime=this->vtkObject::GetMTime(); ! vtkTimeStamp TransformMTime; if ( this->Transform != NULL ) { diff -crB VTK/Common/vtkImplicitFunction.h VTKNew/Common/vtkImplicitFunction.h *** VTK/Common/vtkImplicitFunction.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkImplicitFunction.h 2013-09-24 08:55:54.284183700 +0200 *************** *** 60,66 **** // Description: // Overload standard modified time function. If Transform is modified, // then this object is modified as well. ! unsigned long GetMTime(); // Description: // Evaluate function at position x-y-z and return value. Point x[3] is --- 60,66 ---- // Description: // Overload standard modified time function. If Transform is modified, // then this object is modified as well. ! vtkTimeStamp GetMTime(); // Description: // Evaluate function at position x-y-z and return value. Point x[3] is diff -crB VTK/Common/vtkMatrixToHomogeneousTransform.cxx VTKNew/Common/vtkMatrixToHomogeneousTransform.cxx *** VTK/Common/vtkMatrixToHomogeneousTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkMatrixToHomogeneousTransform.cxx 2013-09-24 09:02:24.205485900 +0200 *************** *** 90,102 **** //---------------------------------------------------------------------------- // Get the MTime ! unsigned long vtkMatrixToHomogeneousTransform::GetMTime() { ! unsigned long mtime = this->vtkHomogeneousTransform::GetMTime(); if (this->Input) { ! unsigned long matrixMTime = this->Input->GetMTime(); if (matrixMTime > mtime) { return matrixMTime; --- 90,102 ---- //---------------------------------------------------------------------------- // Get the MTime ! vtkTimeStamp vtkMatrixToHomogeneousTransform::GetMTime() { ! vtkTimeStamp mtime = this->vtkHomogeneousTransform::GetMTime(); if (this->Input) { ! vtkTimeStamp matrixMTime = this->Input->GetMTime(); if (matrixMTime > mtime) { return matrixMTime; diff -crB VTK/Common/vtkMatrixToHomogeneousTransform.h VTKNew/Common/vtkMatrixToHomogeneousTransform.h *** VTK/Common/vtkMatrixToHomogeneousTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkMatrixToHomogeneousTransform.h 2013-09-24 09:02:23.946471100 +0200 *************** *** 49,55 **** // Description: // Get the MTime: this is the bit of magic that makes everything work. ! unsigned long GetMTime(); // Description: // Make a new transform of the same type. --- 49,55 ---- // Description: // Get the MTime: this is the bit of magic that makes everything work. ! vtkTimeStamp GetMTime(); // Description: // Make a new transform of the same type. diff -crB VTK/Common/vtkMatrixToLinearTransform.cxx VTKNew/Common/vtkMatrixToLinearTransform.cxx *** VTK/Common/vtkMatrixToLinearTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkMatrixToLinearTransform.cxx 2013-09-24 09:02:24.201485600 +0200 *************** *** 89,101 **** //---------------------------------------------------------------------------- // Get the MTime ! unsigned long vtkMatrixToLinearTransform::GetMTime() { ! unsigned long mtime = this->vtkLinearTransform::GetMTime(); if (this->Input) { ! unsigned long matrixMTime = this->Input->GetMTime(); if (matrixMTime > mtime) { return matrixMTime; --- 89,101 ---- //---------------------------------------------------------------------------- // Get the MTime ! vtkTimeStamp vtkMatrixToLinearTransform::GetMTime() { ! vtkTimeStamp mtime = this->vtkLinearTransform::GetMTime(); if (this->Input) { ! vtkTimeStamp matrixMTime = this->Input->GetMTime(); if (matrixMTime > mtime) { return matrixMTime; diff -crB VTK/Common/vtkMatrixToLinearTransform.h VTKNew/Common/vtkMatrixToLinearTransform.h *** VTK/Common/vtkMatrixToLinearTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkMatrixToLinearTransform.h 2013-09-24 09:02:23.890467900 +0200 *************** *** 50,56 **** // Description: // Get the MTime: this is the bit of magic that makes everything work. ! unsigned long GetMTime(); // Description: // Make a new transform of the same type. --- 50,56 ---- // Description: // Get the MTime: this is the bit of magic that makes everything work. ! vtkTimeStamp GetMTime(); // Description: // Make a new transform of the same type. diff -crB VTK/Common/vtkObject.cxx VTKNew/Common/vtkObject.cxx *** VTK/Common/vtkObject.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkObject.cxx 2013-09-24 09:09:56.061330600 +0200 *************** *** 165,173 **** //---------------------------------------------------------------------------- // Return the modification for this object. ! unsigned long int vtkObject::GetMTime() { ! return this->MTime.GetMTime(); } // Chaining method to print an object's instance variables, as well as --- 165,173 ---- //---------------------------------------------------------------------------- // Return the modification for this object. ! vtkTimeStamp vtkObject::GetMTime() { ! return this->MTime; } // Chaining method to print an object's instance variables, as well as diff -crB VTK/Common/vtkObject.h VTKNew/Common/vtkObject.h *** VTK/Common/vtkObject.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkObject.h 2013-09-24 08:47:57.057887900 +0200 *************** *** 92,98 **** // Description: // Return this object's modified time. ! virtual unsigned long GetMTime(); // Description: // Methods invoked by print to print information about the object --- 92,98 ---- // Description: // Return this object's modified time. ! virtual vtkTimeStamp GetMTime(); // Description: // Methods invoked by print to print information about the object diff -crB VTK/Common/vtkPerspectiveTransform.cxx VTKNew/Common/vtkPerspectiveTransform.cxx *** VTK/Common/vtkPerspectiveTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkPerspectiveTransform.cxx 2013-09-24 09:02:24.197485400 +0200 *************** *** 133,142 **** } //---------------------------------------------------------------------------- ! unsigned long vtkPerspectiveTransform::GetMTime() { ! unsigned long mtime = this->vtkHomogeneousTransform::GetMTime(); ! unsigned long mtime2; if (this->Input) { --- 133,142 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkPerspectiveTransform::GetMTime() { ! vtkTimeStamp mtime = this->vtkHomogeneousTransform::GetMTime(); ! vtkTimeStamp mtime2; if (this->Input) { diff -crB VTK/Common/vtkPerspectiveTransform.h VTKNew/Common/vtkPerspectiveTransform.h *** VTK/Common/vtkPerspectiveTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkPerspectiveTransform.h 2013-09-24 09:02:23.831464500 +0200 *************** *** 313,319 **** // Description: // Override GetMTime to account for input and concatenation. ! unsigned long GetMTime(); protected: vtkPerspectiveTransform(); --- 313,319 ---- // Description: // Override GetMTime to account for input and concatenation. ! vtkTimeStamp GetMTime(); protected: vtkPerspectiveTransform(); diff -crB VTK/Common/vtkProp.h VTKNew/Common/vtkProp.h *** VTK/Common/vtkProp.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkProp.h 2013-09-24 08:55:54.743209900 +0200 *************** *** 84,90 **** // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, textures // etc. ! virtual unsigned long GetRedrawMTime() {return this->GetMTime();} // Description: // In case the Visibility flag is true, tell if the bounds of this prop --- 84,90 ---- // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, textures // etc. ! virtual vtkTimeStamp GetRedrawMTime() {return this->GetMTime();} // Description: // In case the Visibility flag is true, tell if the bounds of this prop diff -crB VTK/Common/vtkTimeStamp.cxx VTKNew/Common/vtkTimeStamp.cxx *** VTK/Common/vtkTimeStamp.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkTimeStamp.cxx 2013-09-17 12:22:40.928528300 +0200 *************** *** 41,48 **** { // Windows optimization #if defined(WIN32) || defined(_WIN32) ! static LONG vtkTimeStampTime = 0; ! this->ModifiedTime = (unsigned long)InterlockedIncrement(&vtkTimeStampTime); // Mac optimization #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050) --- 41,48 ---- { // Windows optimization #if defined(WIN32) || defined(_WIN32) ! static LONGLONG vtkTimeStampTime = 0; ! this->ModifiedTime = (uint64_t)InterlockedIncrement64(&vtkTimeStampTime); // Mac optimization #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050) diff -crB VTK/Common/vtkTimeStamp.h VTKNew/Common/vtkTimeStamp.h *** VTK/Common/vtkTimeStamp.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkTimeStamp.h 2013-09-24 12:33:20.680394800 +0200 *************** *** 23,28 **** --- 23,29 ---- #ifndef __vtkTimeStamp_h #define __vtkTimeStamp_h + #include #include "vtkSystemIncludes.h" class VTK_COMMON_EXPORT vtkTimeStamp *************** *** 45,65 **** // Description: // Return this object's Modified time. ! unsigned long GetMTime() const {return this->ModifiedTime;}; // Description: // Support comparisons of time stamp objects directly. ! bool operator>(vtkTimeStamp& ts) { return (this->ModifiedTime > ts.ModifiedTime);}; ! bool operator<(vtkTimeStamp& ts) { return (this->ModifiedTime < ts.ModifiedTime);}; // Description: // Allow for typecasting to unsigned long. ! operator unsigned long() const {return this->ModifiedTime;}; private: ! unsigned long ModifiedTime; }; #endif --- 46,89 ---- // Description: // Return this object's Modified time. ! vtkTimeStamp GetMTime() const {return *this;}; // Description: // Support comparisons of time stamp objects directly. ! bool operator>(const vtkTimeStamp& ts) const { return (this->ModifiedTime > ts.ModifiedTime);}; ! bool operator<(const vtkTimeStamp& ts) const { return (this->ModifiedTime < ts.ModifiedTime);}; + bool operator>=(const vtkTimeStamp& ts) const { + return (this->ModifiedTime >= ts.ModifiedTime);}; + bool operator<=(const vtkTimeStamp& ts) const { + return (this->ModifiedTime <= ts.ModifiedTime);}; + + bool operator!=(const vtkTimeStamp& ts) const { + return (this->ModifiedTime != ts.ModifiedTime);}; + bool operator==(const vtkTimeStamp& ts) const { + return (this->ModifiedTime == ts.ModifiedTime);}; + + void Decrease() { --this->ModifiedTime; } + void Reset() { this->ModifiedTime = 0; } + void SetToMaximum() { this->ModifiedTime = UINT64_MAX; } + double toDouble() { return static_cast(this->ModifiedTime); } + + // Description: // Allow for typecasting to unsigned long. ! // operator vtkTimeStampType() const {return this->ModifiedTime;}; private: ! uint64_t ModifiedTime; ! ! friend std::ostream & operator<<(std::ostream &os, const vtkTimeStamp& p); }; + inline std::ostream& operator<<(std::ostream& os, const vtkTimeStamp& obj) + { + return os << obj.ModifiedTime; + } + #endif diff -crB VTK/Common/vtkTransform.cxx VTKNew/Common/vtkTransform.cxx *** VTK/Common/vtkTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkTransform.cxx 2013-09-24 09:26:52.594472900 +0200 *************** *** 154,160 **** if (transform->Matrix->GetMTime() > transform->MatrixUpdateMTime) { // this copies the legacy hack flag to the transform vtkWarningMacro(<<"InternalDeepCopy: Legacy Hack deprecated in VTK 4.2. May be removed in a future version."); ! this->MatrixUpdateMTime--; } #endif } --- 154,160 ---- if (transform->Matrix->GetMTime() > transform->MatrixUpdateMTime) { // this copies the legacy hack flag to the transform vtkWarningMacro(<<"InternalDeepCopy: Legacy Hack deprecated in VTK 4.2. May be removed in a future version."); ! this->MatrixUpdateMTime.Decrease(); } #endif } *************** *** 305,314 **** } //---------------------------------------------------------------------------- ! unsigned long vtkTransform::GetMTime() { ! unsigned long mtime = this->vtkLinearTransform::GetMTime(); ! unsigned long mtime2; // checking the matrix MTime is part of the legacy hack in InternalUpdate if ((mtime2 = this->Matrix->GetMTime()) > this->MatrixUpdateMTime) --- 305,314 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkTransform::GetMTime() { ! vtkTimeStamp mtime = this->vtkLinearTransform::GetMTime(); ! vtkTimeStamp mtime2; // checking the matrix MTime is part of the legacy hack in InternalUpdate if ((mtime2 = this->Matrix->GetMTime()) > this->MatrixUpdateMTime) diff -crB VTK/Common/vtkTransform.h VTKNew/Common/vtkTransform.h *** VTK/Common/vtkTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkTransform.h 2013-09-24 09:02:24.124481200 +0200 *************** *** 307,313 **** // Description: // Override GetMTime to account for input and concatenation. ! unsigned long GetMTime(); // Description: // Use this method only if you wish to compute the transformation in --- 307,313 ---- // Description: // Override GetMTime to account for input and concatenation. ! vtkTimeStamp GetMTime(); // Description: // Use this method only if you wish to compute the transformation in *************** *** 332,338 **** // this allows us to check whether people have been fooling // around with our matrix ! unsigned long MatrixUpdateMTime; float Point[4]; double DoublePoint[4]; --- 332,338 ---- // this allows us to check whether people have been fooling // around with our matrix ! vtkTimeStamp MatrixUpdateMTime; float Point[4]; double DoublePoint[4]; diff -crB VTK/Common/vtkTransform2D.cxx VTKNew/Common/vtkTransform2D.cxx *** VTK/Common/vtkTransform2D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkTransform2D.cxx 2013-09-24 09:02:24.191485100 +0200 *************** *** 74,80 **** } //---------------------------------------------------------------------------- ! unsigned long vtkTransform2D::GetMTime() { return this->Matrix->GetMTime(); } --- 74,80 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkTransform2D::GetMTime() { return this->Matrix->GetMTime(); } diff -crB VTK/Common/vtkTransform2D.h VTKNew/Common/vtkTransform2D.h *** VTK/Common/vtkTransform2D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Common/vtkTransform2D.h 2013-09-24 09:02:23.767460800 +0200 *************** *** 103,109 **** // Description: // Override GetMTime to account for input and concatenation. ! unsigned long GetMTime(); // Description: // Apply the transformation to a series of points, and append the --- 103,109 ---- // Description: // Override GetMTime to account for input and concatenation. ! vtkTimeStamp GetMTime(); // Description: // Apply the transformation to a series of points, and append the diff -crB VTK/Examples/Medical/Cxx/Medical4.cxx VTKNew/Examples/Medical/Cxx/Medical4.cxx *** VTK/Examples/Medical/Cxx/Medical4.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Examples/Medical/Cxx/Medical4.cxx 2012-10-05 09:13:59.634466800 +0200 *************** *** 7,15 **** All rights reserved. See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ! This software is distributed WITHOUT ANY WARRANTY; without even ! the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ! PURPOSE. See the above copyright notice for more information. =========================================================================*/ --- 7,15 ---- All rights reserved. See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ! This software is distributed WITHOUT ANY WARRANTY; without even ! the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ! PURPOSE. See the above copyright notice for more information. =========================================================================*/ *************** *** 22,158 **** #include #include #include #include ! #include #include #include #include #include #include ! int main (int argc, char *argv[]) { ! if (argc < 2) { ! cout << "Usage: " << argv[0] << " DATADIR/headsq/quarter" << endl; ! return EXIT_FAILURE; } - // Create the renderer, the render window, and the interactor. The renderer - // draws into the render window, the interactor enables mouse- and - // keyboard-based interaction with the scene. - vtkSmartPointer ren = - vtkSmartPointer::New(); - vtkSmartPointer renWin = - vtkSmartPointer::New(); - renWin->AddRenderer(ren); - vtkSmartPointer iren = - vtkSmartPointer::New(); - iren->SetRenderWindow(renWin); - - // The following reader is used to read a series of 2D slices (images) - // that compose the volume. The slice dimensions are set, and the - // pixel spacing. The data Endianness must also be specified. The reader - // uses the FilePrefix in combination with the slice number to construct - // filenames using the format FilePrefix.%d. (In this case the FilePrefix - // is the root name of the file: quarter.) - vtkSmartPointer v16 = - vtkSmartPointer::New(); - v16->SetDataDimensions(64, 64); - v16->SetImageRange(1, 93); - v16->SetDataByteOrderToLittleEndian(); - v16->SetFilePrefix(argv[1]); - v16->SetDataSpacing(3.2, 3.2, 1.5); - - // The volume will be displayed by ray-cast alpha compositing. - // A ray-cast mapper is needed to do the ray-casting, and a - // compositing function is needed to do the compositing along the ray. - vtkSmartPointer rayCastFunction = - vtkSmartPointer::New(); - - vtkSmartPointer volumeMapper = - vtkSmartPointer::New(); - volumeMapper->SetInput(v16->GetOutput()); - volumeMapper->SetVolumeRayCastFunction(rayCastFunction); - - // The color transfer function maps voxel intensities to colors. - // It is modality-specific, and often anatomy-specific as well. - // The goal is to one color for flesh (between 500 and 1000) - // and another color for bone (1150 and over). - vtkSmartPointervolumeColor = - vtkSmartPointer::New(); - volumeColor->AddRGBPoint(0, 0.0, 0.0, 0.0); - volumeColor->AddRGBPoint(500, 1.0, 0.5, 0.3); - volumeColor->AddRGBPoint(1000, 1.0, 0.5, 0.3); - volumeColor->AddRGBPoint(1150, 1.0, 1.0, 0.9); - - // The opacity transfer function is used to control the opacity - // of different tissue types. - vtkSmartPointer volumeScalarOpacity = - vtkSmartPointer::New(); - volumeScalarOpacity->AddPoint(0, 0.00); - volumeScalarOpacity->AddPoint(500, 0.15); - volumeScalarOpacity->AddPoint(1000, 0.15); - volumeScalarOpacity->AddPoint(1150, 0.85); - - // The gradient opacity function is used to decrease the opacity - // in the "flat" regions of the volume while maintaining the opacity - // at the boundaries between tissue types. The gradient is measured - // as the amount by which the intensity changes over unit distance. - // For most medical data, the unit distance is 1mm. - vtkSmartPointer volumeGradientOpacity = - vtkSmartPointer::New(); - volumeGradientOpacity->AddPoint(0, 0.0); - volumeGradientOpacity->AddPoint(90, 0.5); - volumeGradientOpacity->AddPoint(100, 1.0); - - // The VolumeProperty attaches the color and opacity functions to the - // volume, and sets other volume properties. The interpolation should - // be set to linear to do a high-quality rendering. The ShadeOn option - // turns on directional lighting, which will usually enhance the - // appearance of the volume and make it look more "3D". However, - // the quality of the shading depends on how accurately the gradient - // of the volume can be calculated, and for noisy data the gradient - // estimation will be very poor. The impact of the shading can be - // decreased by increasing the Ambient coefficient while decreasing - // the Diffuse and Specular coefficient. To increase the impact - // of shading, decrease the Ambient and increase the Diffuse and Specular. - vtkSmartPointer volumeProperty = - vtkSmartPointer::New(); - volumeProperty->SetColor(volumeColor); - volumeProperty->SetScalarOpacity(volumeScalarOpacity); - volumeProperty->SetGradientOpacity(volumeGradientOpacity); - volumeProperty->SetInterpolationTypeToLinear(); - volumeProperty->ShadeOn(); - volumeProperty->SetAmbient(0.4); - volumeProperty->SetDiffuse(0.6); - volumeProperty->SetSpecular(0.2); - - // The vtkVolume is a vtkProp3D (like a vtkActor) and controls the position - // and orientation of the volume in world coordinates. - vtkSmartPointer volume = - vtkSmartPointer::New(); - volume->SetMapper(volumeMapper); - volume->SetProperty(volumeProperty); - - // Finally, add the volume to the renderer - ren->AddViewProp(volume); - - // Set up an initial view of the volume. The focal point will be the - // center of the volume, and the camera position will be 400mm to the - // patient's left (which is our right). - vtkCamera *camera = ren->GetActiveCamera(); - double *c = volume->GetCenter(); - camera->SetFocalPoint(c[0], c[1], c[2]); - camera->SetPosition(c[0] + 400, c[1], c[2]); - camera->SetViewUp(0, 0, -1); - - // Increase the size of the render window - renWin->SetSize(640, 480); - - // Interact with the data. - iren->Initialize(); - iren->Start(); ! return EXIT_SUCCESS; } --- 22,314 ---- #include #include #include + #include #include ! #include #include + #include #include #include + #include #include #include + #include + #include + #include + /* + #include "vtkVRPNTracker.h" + */ + #include ! void CallbackFunction(vtkObject* caller, long unsigned int vtkNotUsed(eventId), void* clientData, void* vtkNotUsed(callData) ) { ! vtkRenderer* renderer = static_cast(caller); ! ! double timeInSeconds = renderer->GetLastRenderTimeInSeconds(); ! double fps = 1.0/timeInSeconds; ! std::cout << "FPS: " << fps << std::endl; ! } ! /* ! class MouseInteractorStyle : public vtkInteractorStyleTrackballCamera ! { ! public: ! static MouseInteractorStyle* New(); ! vtkTypeRevisionMacro(MouseInteractorStyle,vtkInteractorStyleTrackballCamera); ! ! MouseInteractorStyle::MouseInteractorStyle() ! { ! this->DeviceCallback = vtkCallbackCommand::New(); ! this->DeviceCallback->SetClientData(this); ! this->DeviceCallback->SetCallback(MouseInteractorStyle::ProcessEvents2); ! } ! ! static void ProcessEvents2(vtkObject* caller, unsigned long eid, void* clientdata, void* calldata) ! { ! MouseInteractorStyle* self = static_cast(clientdata); ! self->OnEvent(caller, eid, calldata); ! } ! ! void OnEvent(vtkObject* caller, unsigned long eid, void* callData) ! { ! std::cout << "OnEvent" << std::endl; ! vtkVRPNTracker* tracker = static_cast(caller); ! ! switch(eid) ! { ! case vtkVRPNDevice::TrackerEvent: ! this->OnTracker(tracker); ! break; ! } ! } ! ! virtual void OnLeftButtonDown() { ! cout << "Pressed left mouse button." << endl; ! this->MyRenderWindow->Render(); ! // forward events ! vtkInteractorStyleTrackballCamera::OnLeftButtonDown(); } ! void Update() ! { ! } ! ! void OnTracker(vtkVRPNTracker* tracker) ! { ! cout << "Tracker data " << std::endl; ! } ! ! void SetTracker(vtkSmartPointer tracker) ! { ! tracker->AddObserver(vtkVRPNDevice::TrackerEvent, this->DeviceCallback); ! } ! ! void SetMyRenderWindow(vtkSmartPointer renderWindow) ! { ! this->MyRenderWindow = renderWindow; ! } ! ! private: ! vtkSmartPointer MyRenderWindow; ! vtkCallbackCommand* DeviceCallback; ! ! }; ! ! vtkCxxRevisionMacro(MouseInteractorStyle, "$Revision: 1.1 $"); ! vtkStandardNewMacro(MouseInteractorStyle); ! */ ! ! ! class vtkTimerCallback2 : public vtkCommand ! { ! public: ! static vtkTimerCallback2 *New() ! { ! vtkTimerCallback2 *cb = new vtkTimerCallback2; ! cb->TimerCount = 0; ! return cb; ! } ! ! virtual void Execute(vtkObject *caller, unsigned long eventId, ! void * vtkNotUsed(callData)) ! { ! if (vtkCommand::TimerEvent == eventId) ! { ! ++this->TimerCount; ! } ! std::cout << this->TimerCount << std::endl; ! actor->SetOrientation(0,0,this->TimerCount); ! vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::SafeDownCast(caller); ! iren->GetRenderWindow()->Render(); ! } ! ! private: ! int TimerCount; ! public: ! vtkActor* actor; ! }; ! ! ! int main (int argc, char *argv[]) ! { ! /* // VRPN ! std::cout << "Setting up vrpn interface" << std::endl; ! vtkSmartPointer device = vtkSmartPointer::New(); ! std::cout << "Set device name" << std::endl; ! device->SetDeviceName("pstrack0@127.0.0.1"); ! std::cout << "Initialize" << std::endl; ! device->Initialize();*/ ! ! /* vtkSmartPointer cb1 = vtkSmartPointer::New(); ! cb1->SetCallback(TrackFunction); ! device->AddObserver(vtkVRPNDevice::TrackerEvent, cb1);*/ ! ! std::string path = "C:\\Users\\arjenvr\\Programming\\vtk-5.10.0\\VTKData\\Data\\headsq\\quarter"; ! ! // Create the renderer, the render window, and the interactor. The renderer ! // draws into the render window, the interactor enables mouse- and ! // keyboard-based interaction with the scene. ! vtkSmartPointer ren = vtkSmartPointer::New(); ! vtkSmartPointer renWin = vtkSmartPointer::New(); ! renWin->AddRenderer(ren); ! vtkSmartPointer iren = vtkSmartPointer::New(); ! iren->SetRenderWindow(renWin); ! ! /* ! vtkSmartPointer style = vtkSmartPointer::New(); ! style->SetMyRenderWindow(renWin); ! style->SetTracker(device); ! iren->SetInteractorStyle( style );*/ ! ! // renWin->SetStereoTypeToInterlaced(); ! //renWin->SetStereoRender(1); ! ! // The following reader is used to read a series of 2D slices (images) ! // that compose the volume. The slice dimensions are set, and the ! // pixel spacing. The data Endianness must also be specified. The reader ! // uses the FilePrefix in combination with the slice number to construct ! // filenames using the format FilePrefix.%d. (In this case the FilePrefix ! // is the root name of the file: quarter.) ! vtkSmartPointer reader = vtkSmartPointer::New(); ! reader->SetDataByteOrderToLittleEndian(); ! reader->SetDataExtent(0,63,0,63,1,93); ! reader->SetDataSpacing(3.2, 3.2, 1.5); ! reader->SetFilePrefix(path.c_str()); ! reader->SetDataScalarTypeToUnsignedShort(); ! reader->SetHeaderSize(0); ! /* ! vtkSmartPointer iss = vtkSmartPointer::New(); ! iss->AddInputConnection(reader->GetOutputPort()); ! // iss->SetInput( reader->GetOutputDataObject(0) ); ! iss->SetOutputScalarTypeToUnsignedChar(); ! iss->SetShift(0); ! iss->SetScale(1.0/256.0);*/ ! ! // The volume will be displayed by ray-cast alpha compositing. ! // A ray-cast mapper is needed to do the ray-casting, and a ! // compositing function is needed to do the compositing along the ray. ! // vtkSmartPointer rayCastFunction = vtkSmartPointer::New(); ! vtkSmartPointer volumeMapper = vtkSmartPointer::New(); ! volumeMapper->AddInputConnection(reader->GetOutputPort()); ! volumeMapper->SetMaxMemoryInBytes( 512 * 1024 * 1024 ); ! volumeMapper->SetMaxMemoryFraction( 0.8 ); ! volumeMapper->SetBlendModeToComposite(); ! volumeMapper->SetAutoAdjustSampleDistances( 1 ); ! ! /* vtkSmartPointer volumeMapper = vtkSmartPointer::New(); ! volumeMapper->SetInput(reader->GetOutput()); ! volumeMapper->SetBlendModeToComposite();*/ ! ! ! // The color transfer function maps voxel intensities to colors. ! // It is modality-specific, and often anatomy-specific as well. ! // The goal is to one color for flesh (between 500 and 1000) ! // and another color for bone (1150 and over). ! vtkSmartPointervolumeColor = vtkSmartPointer::New(); ! volumeColor->AddRGBPoint(0, 0.0, 0.0, 0.0); ! volumeColor->AddRGBPoint(500, 1.0, 0.5, 0.3); ! volumeColor->AddRGBPoint(1000, 1.0, 0.5, 0.3); ! volumeColor->AddRGBPoint(1150, 1.0, 1.0, 0.9); ! ! // The opacity transfer function is used to control the opacity ! // of different tissue types. ! vtkSmartPointer volumeScalarOpacity = vtkSmartPointer::New(); ! volumeScalarOpacity->AddPoint(0, 0.00); ! volumeScalarOpacity->AddPoint(500, 0.15); ! volumeScalarOpacity->AddPoint(1000, 0.15); ! volumeScalarOpacity->AddPoint(1150, 0.85); ! ! // The gradient opacity function is used to decrease the opacity ! // in the "flat" regions of the volume while maintaining the opacity ! // at the boundaries between tissue types. The gradient is measured ! // as the amount by which the intensity changes over unit distance. ! // For most medical data, the unit distance is 1mm. ! vtkSmartPointer volumeGradientOpacity = vtkSmartPointer::New(); ! volumeGradientOpacity->AddPoint(0, 0.0); ! volumeGradientOpacity->AddPoint(90, 0.5); ! volumeGradientOpacity->AddPoint(100, 1.0); ! ! // The VolumeProperty attaches the color and opacity functions to the ! // volume, and sets other volume properties. The interpolation should ! // be set to linear to do a high-quality rendering. The ShadeOn option ! // turns on directional lighting, which will usually enhance the ! // appearance of the volume and make it look more "3D". However, ! // the quality of the shading depends on how accurately the gradient ! // of the volume can be calculated, and for noisy data the gradient ! // estimation will be very poor. The impact of the shading can be ! // decreased by increasing the Ambient coefficient while decreasing ! // the Diffuse and Specular coefficient. To increase the impact ! // of shading, decrease the Ambient and increase the Diffuse and Specular. ! vtkSmartPointer volumeProperty = vtkSmartPointer::New(); ! volumeProperty->SetColor(volumeColor); ! volumeProperty->SetScalarOpacity(volumeScalarOpacity); ! volumeProperty->SetGradientOpacity(volumeGradientOpacity); ! volumeProperty->SetInterpolationTypeToLinear(); ! volumeProperty->ShadeOn(); ! volumeProperty->SetAmbient(0.4); ! volumeProperty->SetDiffuse(0.6); ! volumeProperty->SetSpecular(0.2); ! ! // The vtkVolume is a vtkProp3D (like a vtkActor) and controls the position ! // and orientation of the volume in world coordinates. ! vtkSmartPointer volume = vtkSmartPointer::New(); ! volume->SetMapper(volumeMapper); ! volume->SetProperty(volumeProperty); ! volume->SetOrigin(volume->GetCenter()); ! ! // Finally, add the volume to the renderer ! ren->AddViewProp(volume); ! ! vtkSmartPointer callback = vtkSmartPointer::New(); ! callback->SetCallback(CallbackFunction); ! ren->AddObserver(vtkCommand::EndEvent, callback); ! ! // Set up an initial view of the volume. The focal point will be the ! // center of the volume, and the camera position will be 400mm to the ! // patient's left (which is our right). ! vtkCamera *camera = ren->GetActiveCamera(); ! double *c = volume->GetCenter(); ! camera->SetFocalPoint(c[0], c[1], c[2]); ! camera->SetPosition(c[0] + 400, c[1], c[2]); ! camera->SetViewUp(0, 0, -1); ! ! // Increase the size of the render window ! renWin->SetSize(640, 480); ! ! // Interact with the data. ! iren->Initialize(); ! ! vtkSmartPointer cb = vtkSmartPointer::New(); ! cb->actor = (vtkActor*) volume.GetPointer(); ! iren->AddObserver(vtkCommand::TimerEvent, cb); ! ! int timerId = iren->CreateRepeatingTimer(10); ! ! vtkSmartPointer style = vtkSmartPointer::New(); ! iren->SetInteractorStyle(style); ! ! iren->Start(); ! ! return EXIT_SUCCESS; } diff -crB VTK/Filtering/vtkAbstractMapper.cxx VTKNew/Filtering/vtkAbstractMapper.cxx *** VTK/Filtering/vtkAbstractMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAbstractMapper.cxx 2013-09-24 09:02:24.235487600 +0200 *************** *** 48,57 **** // Description: // Override Modifiedtime as we have added Clipping planes ! unsigned long vtkAbstractMapper::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long clipMTime; if ( this->ClippingPlanes != NULL ) { --- 48,57 ---- // Description: // Override Modifiedtime as we have added Clipping planes ! vtkTimeStamp vtkAbstractMapper::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp clipMTime; if ( this->ClippingPlanes != NULL ) { diff -crB VTK/Filtering/vtkAbstractMapper.h VTKNew/Filtering/vtkAbstractMapper.h *** VTK/Filtering/vtkAbstractMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAbstractMapper.h 2013-09-24 09:02:23.587450500 +0200 *************** *** 53,59 **** // Description: // Override Modifiedtime as we have added Clipping planes ! virtual unsigned long GetMTime(); // Description: // Release any graphics resources that are being consumed by this mapper. --- 53,59 ---- // Description: // Override Modifiedtime as we have added Clipping planes ! virtual vtkTimeStamp GetMTime(); // Description: // Release any graphics resources that are being consumed by this mapper. diff -crB VTK/Filtering/vtkActor2D.cxx VTKNew/Filtering/vtkActor2D.cxx *** VTK/Filtering/vtkActor2D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkActor2D.cxx 2013-09-24 09:02:24.240487900 +0200 *************** *** 174,183 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkActor2D::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; time = this->PositionCoordinate->GetMTime(); mTime = ( time > mTime ? time : mTime ); --- 174,183 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkActor2D::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; time = this->PositionCoordinate->GetMTime(); mTime = ( time > mTime ? time : mTime ); diff -crB VTK/Filtering/vtkActor2D.h VTKNew/Filtering/vtkActor2D.h *** VTK/Filtering/vtkActor2D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkActor2D.h 2013-09-24 09:02:23.530447300 +0200 *************** *** 101,107 **** // Description: // Return this objects MTime. ! virtual unsigned long GetMTime(); // Description: // For some exporters and other other operations we must be --- 101,107 ---- // Description: // Return this objects MTime. ! virtual vtkTimeStamp GetMTime(); // Description: // For some exporters and other other operations we must be diff -crB VTK/Filtering/vtkAlgorithm.cxx VTKNew/Filtering/vtkAlgorithm.cxx *** VTK/Filtering/vtkAlgorithm.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAlgorithm.cxx 2013-09-24 09:02:24.231487400 +0200 *************** *** 689,695 **** vtkInformationVector**, vtkInformationVector*, int /* requestFromOutputPort */, ! unsigned long* mtime) { // By default algorithms contribute only their own modified time. *mtime = this->GetMTime(); --- 689,695 ---- vtkInformationVector**, vtkInformationVector*, int /* requestFromOutputPort */, ! vtkTimeStamp* mtime) { // By default algorithms contribute only their own modified time. *mtime = this->GetMTime(); diff -crB VTK/Filtering/vtkAlgorithm.h VTKNew/Filtering/vtkAlgorithm.h *** VTK/Filtering/vtkAlgorithm.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAlgorithm.h 2013-09-24 09:25:48.464804900 +0200 *************** *** 110,116 **** vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! unsigned long* mtime); // Description: // This method gives the algorithm a chance to modify the contents of a --- 110,116 ---- vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! vtkTimeStamp* mtime); // Description: // This method gives the algorithm a chance to modify the contents of a diff -crB VTK/Filtering/vtkAnnotation.cxx VTKNew/Filtering/vtkAnnotation.cxx *** VTK/Filtering/vtkAnnotation.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAnnotation.cxx 2013-09-24 09:09:22.074386600 +0200 *************** *** 163,174 **** } } ! unsigned long vtkAnnotation::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); if (this->Selection) { ! unsigned long stime = this->Selection->GetMTime(); if (stime > mtime) { mtime = stime; --- 163,174 ---- } } ! vtkTimeStamp vtkAnnotation::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); if (this->Selection) { ! vtkTimeStamp stime = this->Selection->GetMTime(); if (stime > mtime) { mtime = stime; diff -crB VTK/Filtering/vtkAnnotation.h VTKNew/Filtering/vtkAnnotation.h *** VTK/Filtering/vtkAnnotation.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAnnotation.h 2013-09-24 09:09:21.626361000 +0200 *************** *** 105,111 **** // Description: // Get the modified time of this object. ! virtual unsigned long GetMTime(); //BTX protected: --- 105,111 ---- // Description: // Get the modified time of this object. ! virtual vtkTimeStamp GetMTime(); //BTX protected: diff -crB VTK/Filtering/vtkAnnotationLayers.cxx VTKNew/Filtering/vtkAnnotationLayers.cxx *** VTK/Filtering/vtkAnnotationLayers.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAnnotationLayers.cxx 2013-09-24 09:09:22.070386400 +0200 *************** *** 167,181 **** } } ! unsigned long vtkAnnotationLayers::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); for (unsigned int a = 0; a < this->GetNumberOfAnnotations(); ++a) { vtkAnnotation* ann = this->GetAnnotation(a); if (ann) { ! unsigned long atime = ann->GetMTime(); if (atime > mtime) { mtime = atime; --- 167,181 ---- } } ! vtkTimeStamp vtkAnnotationLayers::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); for (unsigned int a = 0; a < this->GetNumberOfAnnotations(); ++a) { vtkAnnotation* ann = this->GetAnnotation(a); if (ann) { ! vtkTimeStamp atime = ann->GetMTime(); if (atime > mtime) { mtime = atime; *************** *** 185,191 **** vtkAnnotation* s = this->GetCurrentAnnotation(); if (s) { ! unsigned long stime = this->GetCurrentAnnotation()->GetMTime(); if (stime > mtime) { mtime = stime; --- 185,191 ---- vtkAnnotation* s = this->GetCurrentAnnotation(); if (s) { ! vtkTimeStamp stime = this->GetCurrentAnnotation()->GetMTime(); if (stime > mtime) { mtime = stime; diff -crB VTK/Filtering/vtkAnnotationLayers.h VTKNew/Filtering/vtkAnnotationLayers.h *** VTK/Filtering/vtkAnnotationLayers.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkAnnotationLayers.h 2013-09-24 09:09:21.329344000 +0200 *************** *** 90,96 **** // Description: // The modified time for this object. ! virtual unsigned long GetMTime(); //BTX protected: --- 90,96 ---- // Description: // The modified time for this object. ! virtual vtkTimeStamp GetMTime(); //BTX protected: diff -crB VTK/Filtering/vtkBSPIntersections.h VTKNew/Filtering/vtkBSPIntersections.h *** VTK/Filtering/vtkBSPIntersections.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkBSPIntersections.h 2013-09-24 09:02:23.166426400 +0200 *************** *** 140,146 **** vtkBSPIntersections(); ~vtkBSPIntersections(); ! vtkGetMacro(RegionListBuildTime, unsigned long); int BuildRegionList(); --- 140,146 ---- vtkBSPIntersections(); ~vtkBSPIntersections(); ! vtkGetMacro(RegionListBuildTime, vtkTimeStamp); int BuildRegionList(); diff -crB VTK/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx VTKNew/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx *** VTK/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx 2013-09-24 10:20:34.601761200 +0200 *************** *** 85,96 **** } this->Data = new vtkDataObject* [size]; ! this->Times = new unsigned long [size]; for (idx = 0; idx < size; ++idx) { this->Data[idx] = NULL; ! this->Times[idx] = 0; } } --- 85,96 ---- } this->Data = new vtkDataObject* [size]; ! this->Times = new vtkTimeStamp [size]; for (idx = 0; idx < size; ++idx) { this->Data[idx] = NULL; ! this->Times[idx].Reset(); } } *************** *** 164,177 **** // First look through the cached data to see if it is still valid. int i; ! unsigned long pmt = this->GetPipelineMTime(); for (i = 0; i < this->CacheSize; ++i) { if (this->Data[i] && this->Times[i] < pmt) { this->Data[i]->Delete(); this->Data[i] = NULL; ! this->Times[i] = 0; } } --- 164,177 ---- // First look through the cached data to see if it is still valid. int i; ! vtkTimeStamp pmt = this->GetPipelineMTime(); for (i = 0; i < this->CacheSize; ++i) { if (this->Data[i] && this->Times[i] < pmt) { this->Data[i]->Delete(); this->Data[i] = NULL; ! this->Times[i].Reset(); } } *************** *** 280,286 **** int result = this->Superclass::ExecuteData(request, inInfoVec, outInfoVec); // then save the newly generated data ! unsigned long bestTime = VTK_LARGE_INTEGER; int bestIdx = 0; // Save the image in cache. --- 280,287 ---- int result = this->Superclass::ExecuteData(request, inInfoVec, outInfoVec); // then save the newly generated data ! vtkTimeStamp bestTime; ! bestTime.SetToMaximum(); int bestIdx = 0; // Save the image in cache. *************** *** 290,296 **** if (this->Data[i] == NULL) { bestIdx = i; ! bestTime = 0; break; } if (this->Times[i] < bestTime) --- 291,297 ---- if (this->Data[i] == NULL) { bestIdx = i; ! bestTime.Reset(); break; } if (this->Times[i] < bestTime) diff -crB VTK/Filtering/vtkCachedStreamingDemandDrivenPipeline.h VTKNew/Filtering/vtkCachedStreamingDemandDrivenPipeline.h *** VTK/Filtering/vtkCachedStreamingDemandDrivenPipeline.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkCachedStreamingDemandDrivenPipeline.h 2013-09-24 10:12:40.714656400 +0200 *************** *** 59,65 **** int CacheSize; vtkDataObject **Data; ! unsigned long *Times; private: vtkCachedStreamingDemandDrivenPipelineInternals* CachedStreamingDemandDrivenInternal; --- 59,65 ---- int CacheSize; vtkDataObject **Data; ! vtkTimeStamp *Times; private: vtkCachedStreamingDemandDrivenPipelineInternals* CachedStreamingDemandDrivenInternal; diff -crB VTK/Filtering/vtkDataObject.cxx VTKNew/Filtering/vtkDataObject.cxx *** VTK/Filtering/vtkDataObject.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkDataObject.cxx 2013-09-24 10:20:34.595760900 +0200 *************** *** 364,377 **** //---------------------------------------------------------------------------- // Determine the modified time of this object ! unsigned long int vtkDataObject::GetMTime() { ! unsigned long result; result = vtkObject::GetMTime(); if ( this->FieldData ) { ! unsigned long mtime = this->FieldData->GetMTime(); result = ( mtime > result ? mtime : result); } --- 364,377 ---- //---------------------------------------------------------------------------- // Determine the modified time of this object ! vtkTimeStamp vtkDataObject::GetMTime() { ! vtkTimeStamp result; result = vtkObject::GetMTime(); if ( this->FieldData ) { ! vtkTimeStamp mtime = this->FieldData->GetMTime(); result = ( mtime > result ? mtime : result); } *************** *** 832,838 **** } //---------------------------------------------------------------------------- ! unsigned long vtkDataObject::GetUpdateTime() { return this->UpdateTime.GetMTime(); } --- 832,838 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkDataObject::GetUpdateTime() { return this->UpdateTime.GetMTime(); } *************** *** 1418,1430 **** } //---------------------------------------------------------------------------- ! unsigned long vtkDataObject::GetPipelineMTime() { if(SDDP* sddp = this->TrySDDP("GetPipelineMTime")) { return sddp->GetPipelineMTime(); } ! return 0; } //---------------------------------------------------------------------------- --- 1418,1430 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkDataObject::GetPipelineMTime() { if(SDDP* sddp = this->TrySDDP("GetPipelineMTime")) { return sddp->GetPipelineMTime(); } ! return vtkTimeStamp(); } //---------------------------------------------------------------------------- diff -crB VTK/Filtering/vtkDataObject.h VTKNew/Filtering/vtkDataObject.h *** VTK/Filtering/vtkDataObject.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkDataObject.h 2013-09-24 10:05:17.530307700 +0200 *************** *** 90,96 **** // Description: // Data objects are composite objects and need to check each part for MTime. // The information object also needs to be considered. ! unsigned long int GetMTime(); // Description: // Restore data object to initial state, --- 90,96 ---- // Description: // Data objects are composite objects and need to check each part for MTime. // The information object also needs to be considered. ! vtkTimeStamp GetMTime(); // Description: // Restore data object to initial state, *************** *** 220,226 **** // Description: // Used by Threaded ports to determine if they should initiate an // asynchronous update (still in development). ! unsigned long GetUpdateTime(); // Description: // If the whole input extent is required to generate the requested output --- 220,226 ---- // Description: // Used by Threaded ports to determine if they should initiate an // asynchronous update (still in development). ! vtkTimeStamp GetUpdateTime(); // Description: // If the whole input extent is required to generate the requested output *************** *** 232,238 **** // Description: // Get the cumulative modified time of everything upstream. Does // not include the MTime of this object. ! unsigned long GetPipelineMTime(); // Description: // Return the actual size of the data in kilobytes. This number --- 232,238 ---- // Description: // Get the cumulative modified time of everything upstream. Does // not include the MTime of this object. ! vtkTimeStamp GetPipelineMTime(); // Description: // Return the actual size of the data in kilobytes. This number diff -crB VTK/Filtering/vtkDataSet.cxx VTKNew/Filtering/vtkDataSet.cxx *** VTK/Filtering/vtkDataSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkDataSet.cxx 2013-09-24 09:15:40.930055900 +0200 *************** *** 223,231 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkDataSet::GetMTime() { ! unsigned long mtime, result; result = vtkDataObject::GetMTime(); --- 223,231 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkDataSet::GetMTime() { ! vtkTimeStamp mtime, result; result = vtkDataObject::GetMTime(); diff -crB VTK/Filtering/vtkDataSet.h VTKNew/Filtering/vtkDataSet.h *** VTK/Filtering/vtkDataSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkDataSet.h 2013-09-24 09:09:21.917377600 +0200 *************** *** 203,209 **** // Description: // Datasets are composite objects and need to check each part for MTime // THIS METHOD IS THREAD SAFE ! unsigned long int GetMTime(); // Description: // Return a pointer to this dataset's cell data. --- 203,209 ---- // Description: // Datasets are composite objects and need to check each part for MTime // THIS METHOD IS THREAD SAFE ! vtkTimeStamp GetMTime(); // Description: // Return a pointer to this dataset's cell data. diff -crB VTK/Filtering/vtkDemandDrivenPipeline.cxx VTKNew/Filtering/vtkDemandDrivenPipeline.cxx *** VTK/Filtering/vtkDemandDrivenPipeline.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkDemandDrivenPipeline.cxx 2013-09-24 10:12:41.023674100 +0200 *************** *** 53,59 **** this->InfoRequest = 0; this->DataObjectRequest = 0; this->DataRequest = 0; - this->PipelineMTime = 0; } //---------------------------------------------------------------------------- --- 53,58 ---- *************** *** 87,93 **** vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! unsigned long* mtime) { // The pipeline's MTime starts with this algorithm's MTime. // Invoke the request on the algorithm. --- 86,92 ---- vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! vtkTimeStamp* mtime) { // The pipeline's MTime starts with this algorithm's MTime. // Invoke the request on the algorithm. *************** *** 136,142 **** vtkExecutive::PRODUCER()->Get(info,e,producerPort); if(e) { ! unsigned long pmtime; if(!e->ComputePipelineMTime(request, e->GetInputInformation(), e->GetOutputInformation(), --- 135,141 ---- vtkExecutive::PRODUCER()->Get(info,e,producerPort); if(e) { ! vtkTimeStamp pmtime; if(!e->ComputePipelineMTime(request, e->GetInputInformation(), e->GetOutputInformation(), *************** *** 339,345 **** } // Send the request for pipeline modified time. ! unsigned long mtime; this->ComputePipelineMTime(0, this->GetInputInformation(), this->GetOutputInformation(), --- 338,344 ---- } // Send the request for pipeline modified time. ! vtkTimeStamp mtime; this->ComputePipelineMTime(0, this->GetInputInformation(), this->GetOutputInformation(), diff -crB VTK/Filtering/vtkDemandDrivenPipeline.h VTKNew/Filtering/vtkDemandDrivenPipeline.h *** VTK/Filtering/vtkDemandDrivenPipeline.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkDemandDrivenPipeline.h 2013-09-24 09:25:48.409801800 +0200 *************** *** 55,61 **** vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! unsigned long* mtime); // Description: // Bring the algorithm's outputs up-to-date. Returns 1 for success --- 55,61 ---- vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! vtkTimeStamp* mtime); // Description: // Bring the algorithm's outputs up-to-date. Returns 1 for success *************** *** 65,71 **** // Description: // Get the PipelineMTime for this exective. ! vtkGetMacro(PipelineMTime, unsigned long); // Description: // Set whether the given output port releases data when it is --- 65,71 ---- // Description: // Get the PipelineMTime for this exective. ! vtkGetMacro(PipelineMTime, vtkTimeStamp); // Description: // Set whether the given output port releases data when it is *************** *** 196,202 **** // Largest MTime of any algorithm on this executive or preceding // executives. ! unsigned long PipelineMTime; // Time when information or data were last generated. vtkTimeStamp DataObjectTime; --- 196,202 ---- // Largest MTime of any algorithm on this executive or preceding // executives. ! vtkTimeStamp PipelineMTime; // Time when information or data were last generated. vtkTimeStamp DataObjectTime; diff -crB VTK/Filtering/vtkExecutive.cxx VTKNew/Filtering/vtkExecutive.cxx *** VTK/Filtering/vtkExecutive.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkExecutive.cxx 2013-09-24 10:12:41.017673700 +0200 *************** *** 585,591 **** int vtkExecutive::ComputePipelineMTime(vtkInformation*, vtkInformationVector**, vtkInformationVector*, ! int, unsigned long*) { // Demand-driven executives that use this request should implement // this method. --- 585,591 ---- int vtkExecutive::ComputePipelineMTime(vtkInformation*, vtkInformationVector**, vtkInformationVector*, ! int, vtkTimeStamp*) { // Demand-driven executives that use this request should implement // this method. diff -crB VTK/Filtering/vtkExecutive.h VTKNew/Filtering/vtkExecutive.h *** VTK/Filtering/vtkExecutive.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkExecutive.h 2013-09-24 10:12:40.572648300 +0200 *************** *** 72,78 **** vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! unsigned long* mtime); // Description: // Bring the algorithm's outputs up-to-date. Returns 1 for success --- 72,78 ---- vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! vtkTimeStamp* mtime); // Description: // Bring the algorithm's outputs up-to-date. Returns 1 for success diff -crB VTK/Filtering/vtkFieldData.cxx VTKNew/Filtering/vtkFieldData.cxx *** VTK/Filtering/vtkFieldData.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkFieldData.cxx 2013-09-24 09:09:22.091387600 +0200 *************** *** 606,615 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkFieldData::GetMTime() { ! unsigned long int mTime = this->MTime; ! unsigned long int otherMTime; vtkAbstractArray* aa; for(int i=0; i < this->NumberOfActiveArrays; i++) --- 606,615 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkFieldData::GetMTime() { ! vtkTimeStamp mTime = this->MTime; ! vtkTimeStamp otherMTime; vtkAbstractArray* aa; for(int i=0; i < this->NumberOfActiveArrays; i++) diff -crB VTK/Filtering/vtkFieldData.h VTKNew/Filtering/vtkFieldData.h *** VTK/Filtering/vtkFieldData.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkFieldData.h 2013-09-24 09:02:23.709457500 +0200 *************** *** 233,239 **** // Description: // Check object's components for modified times. ! unsigned long int GetMTime(); // Description: // Get a field from a list of ids. Supplied field f should have same --- 233,239 ---- // Description: // Check object's components for modified times. ! vtkTimeStamp GetMTime(); // Description: // Get a field from a list of ids. Supplied field f should have same diff -crB VTK/Filtering/vtkGenericAttributeCollection.cxx VTKNew/Filtering/vtkGenericAttributeCollection.cxx *** VTK/Filtering/vtkGenericAttributeCollection.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkGenericAttributeCollection.cxx 2013-09-24 09:09:22.096387900 +0200 *************** *** 360,369 **** //---------------------------------------------------------------------------- // Description: // Collection is composite object and need to check each part for MTime. ! unsigned long int vtkGenericAttributeCollection::GetMTime() { ! unsigned long result; ! unsigned long mtime; result = vtkObject::GetMTime(); --- 360,369 ---- //---------------------------------------------------------------------------- // Description: // Collection is composite object and need to check each part for MTime. ! vtkTimeStamp vtkGenericAttributeCollection::GetMTime() { ! vtkTimeStamp result; ! vtkTimeStamp mtime; result = vtkObject::GetMTime(); diff -crB VTK/Filtering/vtkGenericAttributeCollection.h VTKNew/Filtering/vtkGenericAttributeCollection.h *** VTK/Filtering/vtkGenericAttributeCollection.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkGenericAttributeCollection.h 2013-09-24 09:07:49.994119900 +0200 *************** *** 139,145 **** // Description: // vtkAttributeCollection is a composite object and needs to check each // member of its collection for modified time. ! virtual unsigned long int GetMTime(); // *** ALL THE FOLLOWING METHODS SHOULD BE REMOVED WHEN when the // new pipeline update mechanism is checked in. --- 139,145 ---- // Description: // vtkAttributeCollection is a composite object and needs to check each // member of its collection for modified time. ! virtual vtkTimeStamp GetMTime(); // *** ALL THE FOLLOWING METHODS SHOULD BE REMOVED WHEN when the // new pipeline update mechanism is checked in. diff -crB VTK/Filtering/vtkGenericDataSet.cxx VTKNew/Filtering/vtkGenericDataSet.cxx *** VTK/Filtering/vtkGenericDataSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkGenericDataSet.cxx 2013-09-24 09:09:22.102388200 +0200 *************** *** 167,176 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkGenericDataSet::GetMTime() { ! unsigned long result; ! unsigned long mtime; result = this->Superclass::GetMTime(); --- 167,176 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGenericDataSet::GetMTime() { ! vtkTimeStamp result; ! vtkTimeStamp mtime; result = this->Superclass::GetMTime(); diff -crB VTK/Filtering/vtkGenericDataSet.h VTKNew/Filtering/vtkGenericDataSet.h *** VTK/Filtering/vtkGenericDataSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkGenericDataSet.h 2013-09-24 09:09:21.183335600 +0200 *************** *** 159,165 **** // Description: // Datasets are composite objects and need to check each part for their // modified time. ! virtual unsigned long int GetMTime(); // Description: // Compute the geometry bounding box. --- 159,165 ---- // Description: // Datasets are composite objects and need to check each part for their // modified time. ! virtual vtkTimeStamp GetMTime(); // Description: // Compute the geometry bounding box. diff -crB VTK/Filtering/vtkGraph.cxx VTKNew/Filtering/vtkGraph.cxx *** VTK/Filtering/vtkGraph.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkGraph.cxx 2013-09-24 09:09:22.107388500 +0200 *************** *** 213,221 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkGraph::GetMTime() { ! unsigned long int doTime = vtkDataObject::GetMTime(); if ( this->VertexData->GetMTime() > doTime ) { --- 213,221 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGraph::GetMTime() { ! vtkTimeStamp doTime = vtkDataObject::GetMTime(); if ( this->VertexData->GetMTime() > doTime ) { diff -crB VTK/Filtering/vtkGraph.h VTKNew/Filtering/vtkGraph.h *** VTK/Filtering/vtkGraph.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkGraph.h 2013-09-24 09:09:21.773369400 +0200 *************** *** 321,327 **** // Description: // The modified time of the graph. ! unsigned long int GetMTime(); // Description: // Initializes the out edge iterator to iterate over --- 321,327 ---- // Description: // The modified time of the graph. ! vtkTimeStamp GetMTime(); // Description: // Initializes the out edge iterator to iterate over diff -crB VTK/Filtering/vtkImplicitBoolean.cxx VTKNew/Filtering/vtkImplicitBoolean.cxx *** VTK/Filtering/vtkImplicitBoolean.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitBoolean.cxx 2013-09-24 09:25:48.538809100 +0200 *************** *** 33,42 **** this->FunctionList->Delete(); } ! unsigned long int vtkImplicitBoolean::GetMTime() { ! unsigned long int fMtime; ! unsigned long int mtime = this->vtkImplicitFunction::GetMTime(); vtkImplicitFunction *f; vtkCollectionSimpleIterator sit; --- 33,42 ---- this->FunctionList->Delete(); } ! vtkTimeStamp vtkImplicitBoolean::GetMTime() { ! vtkTimeStamp fMtime; ! vtkTimeStamp mtime = this->vtkImplicitFunction::GetMTime(); vtkImplicitFunction *f; vtkCollectionSimpleIterator sit; diff -crB VTK/Filtering/vtkImplicitBoolean.h VTKNew/Filtering/vtkImplicitBoolean.h *** VTK/Filtering/vtkImplicitBoolean.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitBoolean.h 2013-09-24 09:25:48.387800500 +0200 *************** *** 63,69 **** // Description: // Override modified time retrieval because of object dependencies. ! unsigned long GetMTime(); // Description: // Add another implicit function to the list of functions. --- 63,69 ---- // Description: // Override modified time retrieval because of object dependencies. ! vtkTimeStamp GetMTime(); // Description: // Add another implicit function to the list of functions. diff -crB VTK/Filtering/vtkImplicitDataSet.cxx VTKNew/Filtering/vtkImplicitDataSet.cxx *** VTK/Filtering/vtkImplicitDataSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitDataSet.cxx 2013-09-24 09:25:48.534808900 +0200 *************** *** 96,105 **** } } ! unsigned long vtkImplicitDataSet::GetMTime() { ! unsigned long mTime=this->vtkImplicitFunction::GetMTime(); ! unsigned long DataSetMTime; if ( this->DataSet != NULL ) { --- 96,105 ---- } } ! vtkTimeStamp vtkImplicitDataSet::GetMTime() { ! vtkTimeStamp mTime=this->vtkImplicitFunction::GetMTime(); ! vtkTimeStamp DataSetMTime; if ( this->DataSet != NULL ) { diff -crB VTK/Filtering/vtkImplicitDataSet.h VTKNew/Filtering/vtkImplicitDataSet.h *** VTK/Filtering/vtkImplicitDataSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitDataSet.h 2013-09-24 09:25:48.367799400 +0200 *************** *** 54,60 **** // Description: // Return the MTime also considering the DataSet dependency. ! unsigned long GetMTime(); // Description // Evaluate the implicit function. This returns the interpolated scalar value --- 54,60 ---- // Description: // Return the MTime also considering the DataSet dependency. ! vtkTimeStamp GetMTime(); // Description // Evaluate the implicit function. This returns the interpolated scalar value diff -crB VTK/Filtering/vtkImplicitSelectionLoop.cxx VTKNew/Filtering/vtkImplicitSelectionLoop.cxx *** VTK/Filtering/vtkImplicitSelectionLoop.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitSelectionLoop.cxx 2013-09-24 09:25:48.544809500 +0200 *************** *** 175,184 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImplicitSelectionLoop::GetMTime() { ! unsigned long mTime=this->vtkImplicitFunction::GetMTime(); ! unsigned long time; if ( this->Loop != NULL ) { --- 175,184 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImplicitSelectionLoop::GetMTime() { ! vtkTimeStamp mTime=this->vtkImplicitFunction::GetMTime(); ! vtkTimeStamp time; if ( this->Loop != NULL ) { diff -crB VTK/Filtering/vtkImplicitSelectionLoop.h VTKNew/Filtering/vtkImplicitSelectionLoop.h *** VTK/Filtering/vtkImplicitSelectionLoop.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitSelectionLoop.h 2013-09-24 09:25:48.345798100 +0200 *************** *** 94,100 **** // Description: // Overload GetMTime() because we depend on the Loop ! unsigned long GetMTime(); protected: vtkImplicitSelectionLoop(); --- 94,100 ---- // Description: // Overload GetMTime() because we depend on the Loop ! vtkTimeStamp GetMTime(); protected: vtkImplicitSelectionLoop(); diff -crB VTK/Filtering/vtkImplicitSum.cxx VTKNew/Filtering/vtkImplicitSum.cxx *** VTK/Filtering/vtkImplicitSum.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitSum.cxx 2013-09-24 09:25:48.550809800 +0200 *************** *** 41,50 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImplicitSum::GetMTime() { ! unsigned long int fMtime; ! unsigned long int mtime = this->vtkImplicitFunction::GetMTime(); vtkImplicitFunction *f; fMtime = this->Weights->GetMTime(); --- 41,50 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImplicitSum::GetMTime() { ! vtkTimeStamp fMtime; ! vtkTimeStamp mtime = this->vtkImplicitFunction::GetMTime(); vtkImplicitFunction *f; fMtime = this->Weights->GetMTime(); diff -crB VTK/Filtering/vtkImplicitSum.h VTKNew/Filtering/vtkImplicitSum.h *** VTK/Filtering/vtkImplicitSum.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitSum.h 2013-09-24 09:25:48.325797000 +0200 *************** *** 49,55 **** // Description: // Override modified time retrieval because of object dependencies. ! unsigned long GetMTime(); // Description: // Add another implicit function to the list of functions, along with a --- 49,55 ---- // Description: // Override modified time retrieval because of object dependencies. ! vtkTimeStamp GetMTime(); // Description: // Add another implicit function to the list of functions, along with a diff -crB VTK/Filtering/vtkImplicitVolume.cxx VTKNew/Filtering/vtkImplicitVolume.cxx *** VTK/Filtering/vtkImplicitVolume.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitVolume.cxx 2013-09-24 09:25:48.529808600 +0200 *************** *** 88,97 **** } //---------------------------------------------------------------------------- ! unsigned long vtkImplicitVolume::GetMTime() { ! unsigned long mTime = this->vtkImplicitFunction::GetMTime(); ! unsigned long volumeMTime; if ( this->Volume != NULL ) { --- 88,97 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImplicitVolume::GetMTime() { ! vtkTimeStamp mTime = this->vtkImplicitFunction::GetMTime(); ! vtkTimeStamp volumeMTime; if ( this->Volume != NULL ) { diff -crB VTK/Filtering/vtkImplicitVolume.h VTKNew/Filtering/vtkImplicitVolume.h *** VTK/Filtering/vtkImplicitVolume.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitVolume.h 2013-09-24 09:25:48.303795700 +0200 *************** *** 57,63 **** // Returns the mtime also considering the volume. This also calls Update // on the volume, and it therefore must be called before the function is // evaluated. ! unsigned long GetMTime(); // Description // Evaluate the ImplicitVolume. This returns the interpolated scalar value --- 57,63 ---- // Returns the mtime also considering the volume. This also calls Update // on the volume, and it therefore must be called before the function is // evaluated. ! vtkTimeStamp GetMTime(); // Description // Evaluate the ImplicitVolume. This returns the interpolated scalar value diff -crB VTK/Filtering/vtkImplicitWindowFunction.cxx VTKNew/Filtering/vtkImplicitWindowFunction.cxx *** VTK/Filtering/vtkImplicitWindowFunction.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitWindowFunction.cxx 2013-09-24 09:25:48.557810200 +0200 *************** *** 95,104 **** } } ! unsigned long int vtkImplicitWindowFunction::GetMTime() { ! unsigned long int fMtime; ! unsigned long int mtime = this->vtkImplicitFunction::GetMTime(); if ( this->ImplicitFunction ) { --- 95,104 ---- } } ! vtkTimeStamp vtkImplicitWindowFunction::GetMTime() { ! vtkTimeStamp fMtime; ! vtkTimeStamp mtime = this->vtkImplicitFunction::GetMTime(); if ( this->ImplicitFunction ) { diff -crB VTK/Filtering/vtkImplicitWindowFunction.h VTKNew/Filtering/vtkImplicitWindowFunction.h *** VTK/Filtering/vtkImplicitWindowFunction.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkImplicitWindowFunction.h 2013-09-24 09:25:48.281794400 +0200 *************** *** 72,78 **** // Description: // Override modified time retrieval because of object dependencies. ! unsigned long GetMTime(); // Description: // Participate in garbage collection. --- 72,78 ---- // Description: // Override modified time retrieval because of object dependencies. ! vtkTimeStamp GetMTime(); // Description: // Participate in garbage collection. diff -crB VTK/Filtering/vtkLocator.h VTKNew/Filtering/vtkLocator.h *** VTK/Filtering/vtkLocator.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkLocator.h 2013-09-24 09:02:23.650454100 +0200 *************** *** 120,126 **** // Description: // Return the time of the last data structure build. ! vtkGetMacro(BuildTime, unsigned long); // Description: // Handle the PointSet <-> Locator loop. --- 120,126 ---- // Description: // Return the time of the last data structure build. ! vtkGetMacro(BuildTime, vtkTimeStamp); // Description: // Handle the PointSet <-> Locator loop. diff -crB VTK/Filtering/vtkParametricSpline.cxx VTKNew/Filtering/vtkParametricSpline.cxx *** VTK/Filtering/vtkParametricSpline.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkParametricSpline.cxx 2013-09-24 10:05:17.556309200 +0200 *************** *** 39,46 **** this->RightConstraint = 1; this->RightValue = 0.0; this->ParameterizeByLength = 1; - - this->InitializeTime = 0; } //---------------------------------------------------------------------------- --- 39,44 ---- diff -crB VTK/Filtering/vtkParametricSpline.h VTKNew/Filtering/vtkParametricSpline.h *** VTK/Filtering/vtkParametricSpline.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkParametricSpline.h 2013-09-24 09:25:48.259793200 +0200 *************** *** 156,162 **** int ParameterizeByLength; // Initializing the spline ! unsigned long InitializeTime; int Initialize(); // Internal variable for managing parametric coordinates --- 156,162 ---- int ParameterizeByLength; // Initializing the spline ! vtkTimeStamp InitializeTime; int Initialize(); // Internal variable for managing parametric coordinates diff -crB VTK/Filtering/vtkPointSet.cxx VTKNew/Filtering/vtkPointSet.cxx *** VTK/Filtering/vtkPointSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkPointSet.cxx 2013-09-24 09:25:48.562810500 +0200 *************** *** 104,112 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkPointSet::GetMTime() { ! unsigned long int dsTime = vtkDataSet::GetMTime(); if ( this->Points ) { --- 104,112 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkPointSet::GetMTime() { ! vtkTimeStamp dsTime = vtkDataSet::GetMTime(); if ( this->Points ) { diff -crB VTK/Filtering/vtkPointSet.h VTKNew/Filtering/vtkPointSet.h *** VTK/Filtering/vtkPointSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkPointSet.h 2013-09-24 09:25:48.484806100 +0200 *************** *** 64,70 **** // Description: // Get MTime which also considers its vtkPoints MTime. ! unsigned long GetMTime(); // Description: // Compute the (X, Y, Z) bounds of the data. --- 64,70 ---- // Description: // Get MTime which also considers its vtkPoints MTime. ! vtkTimeStamp GetMTime(); // Description: // Compute the (X, Y, Z) bounds of the data. diff -crB VTK/Filtering/vtkPolyPlane.cxx VTKNew/Filtering/vtkPolyPlane.cxx *** VTK/Filtering/vtkPolyPlane.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkPolyPlane.cxx 2013-09-24 09:25:48.525808400 +0200 *************** *** 49,61 **** } //---------------------------------------------------------------------------- ! unsigned long vtkPolyPlane::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); if (this->PolyLine) { ! unsigned long p1Time; p1Time = this->PolyLine->GetMTime(); mTime = ( p1Time > mTime ? p1Time : mTime ); } --- 49,61 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkPolyPlane::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); if (this->PolyLine) { ! vtkTimeStamp p1Time; p1Time = this->PolyLine->GetMTime(); mTime = ( p1Time > mTime ? p1Time : mTime ); } diff -crB VTK/Filtering/vtkPolyPlane.h VTKNew/Filtering/vtkPolyPlane.h *** VTK/Filtering/vtkPolyPlane.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkPolyPlane.h 2013-09-24 09:25:48.240792100 +0200 *************** *** 59,65 **** // Description: // Override GetMTime to include the polyline ! virtual unsigned long GetMTime(); protected: vtkPolyPlane(); --- 59,65 ---- // Description: // Override GetMTime to include the polyline ! virtual vtkTimeStamp GetMTime(); protected: vtkPolyPlane(); diff -crB VTK/Filtering/vtkPropAssembly.cxx VTKNew/Filtering/vtkPropAssembly.cxx *** VTK/Filtering/vtkPropAssembly.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkPropAssembly.cxx 2013-09-24 09:25:48.568810900 +0200 *************** *** 312,321 **** } } ! unsigned long int vtkPropAssembly::GetMTime() { ! unsigned long mTime=this->vtkProp::GetMTime(); ! unsigned long time; vtkProp *part; vtkCollectionSimpleIterator pit; --- 312,321 ---- } } ! vtkTimeStamp vtkPropAssembly::GetMTime() { ! vtkTimeStamp mTime=this->vtkProp::GetMTime(); ! vtkTimeStamp time; vtkProp *part; vtkCollectionSimpleIterator pit; diff -crB VTK/Filtering/vtkPropAssembly.h VTKNew/Filtering/vtkPropAssembly.h *** VTK/Filtering/vtkPropAssembly.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkPropAssembly.h 2013-09-24 09:25:48.218790800 +0200 *************** *** 96,102 **** // Description: // Override default GetMTime method to also consider all of the // prop assembly's parts. ! unsigned long int GetMTime(); // Description: // Methods to traverse the paths (i.e., leaf nodes) of a prop --- 96,102 ---- // Description: // Override default GetMTime method to also consider all of the // prop assembly's parts. ! vtkTimeStamp GetMTime(); // Description: // Methods to traverse the paths (i.e., leaf nodes) of a prop diff -crB VTK/Filtering/vtkSelection.cxx VTKNew/Filtering/vtkSelection.cxx *** VTK/Filtering/vtkSelection.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkSelection.cxx 2013-09-24 09:25:48.521808200 +0200 *************** *** 260,269 **** } //---------------------------------------------------------------------------- ! unsigned long vtkSelection::GetMTime() { ! unsigned long mTime = this->MTime.GetMTime(); ! unsigned long nodeMTime; for (unsigned int n = 0; n < this->GetNumberOfNodes(); ++n) { vtkSelectionNode* node = this->GetNode(n); --- 260,269 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkSelection::GetMTime() { ! vtkTimeStamp mTime = this->MTime.GetMTime(); ! vtkTimeStamp nodeMTime; for (unsigned int n = 0; n < this->GetNumberOfNodes(); ++n) { vtkSelectionNode* node = this->GetNode(n); diff -crB VTK/Filtering/vtkSelection.h VTKNew/Filtering/vtkSelection.h *** VTK/Filtering/vtkSelection.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkSelection.h 2013-09-24 09:09:21.480352600 +0200 *************** *** 101,107 **** // Description: // Return the MTime taking into account changes to the properties ! unsigned long GetMTime(); // Description: // Dumps the contents of the selection, giving basic information only. --- 101,107 ---- // Description: // Return the MTime taking into account changes to the properties ! vtkTimeStamp GetMTime(); // Description: // Dumps the contents of the selection, giving basic information only. diff -crB VTK/Filtering/vtkSelectionNode.cxx VTKNew/Filtering/vtkSelectionNode.cxx *** VTK/Filtering/vtkSelectionNode.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkSelectionNode.cxx 2013-09-24 09:25:48.515807800 +0200 *************** *** 465,475 **** } //---------------------------------------------------------------------------- ! unsigned long vtkSelectionNode::GetMTime() { ! unsigned long mTime = this->MTime.GetMTime(); ! unsigned long propMTime; ! unsigned long fieldMTime; if (this->Properties) { propMTime = this->Properties->GetMTime(); --- 465,475 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkSelectionNode::GetMTime() { ! vtkTimeStamp mTime = this->MTime.GetMTime(); ! vtkTimeStamp propMTime; ! vtkTimeStamp fieldMTime; if (this->Properties) { propMTime = this->Properties->GetMTime(); diff -crB VTK/Filtering/vtkSelectionNode.h VTKNew/Filtering/vtkSelectionNode.h *** VTK/Filtering/vtkSelectionNode.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkSelectionNode.h 2013-09-24 09:02:23.471443900 +0200 *************** *** 93,99 **** // Description: // Return the MTime taking into account changes to the properties ! unsigned long GetMTime(); // vtkSelectionNode specific keys follow: // Description: --- 93,99 ---- // Description: // Return the MTime taking into account changes to the properties ! vtkTimeStamp GetMTime(); // vtkSelectionNode specific keys follow: // Description: diff -crB VTK/Filtering/vtkSpline.cxx VTKNew/Filtering/vtkSpline.cxx *** VTK/Filtering/vtkSpline.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkSpline.cxx 2013-09-24 10:05:17.551308900 +0200 *************** *** 22,28 **** // ClampValueOff vtkSpline::vtkSpline () { - this->ComputeTime = 0; this->ClampValue = 0; this->PiecewiseFunction = vtkPiecewiseFunction::New(); this->Intervals = NULL; --- 22,27 ---- *************** *** 171,180 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If data is modified, // then this object is modified as well. ! unsigned long vtkSpline::GetMTime() { ! unsigned long mTime=this->vtkObject::GetMTime(); ! unsigned long DataMTime; if ( this->PiecewiseFunction != NULL ) { --- 170,179 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If data is modified, // then this object is modified as well. ! vtkTimeStamp vtkSpline::GetMTime() { ! vtkTimeStamp mTime=this->vtkObject::GetMTime(); ! vtkTimeStamp DataMTime; if ( this->PiecewiseFunction != NULL ) { diff -crB VTK/Filtering/vtkSpline.h VTKNew/Filtering/vtkSpline.h *** VTK/Filtering/vtkSpline.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkSpline.h 2013-09-24 09:09:20.879318300 +0200 *************** *** 141,147 **** // Description: // Return the MTime also considering the Piecewise function. ! unsigned long GetMTime(); // Description: // Deep copy of spline data. --- 141,147 ---- // Description: // Return the MTime also considering the Piecewise function. ! vtkTimeStamp GetMTime(); // Description: // Deep copy of spline data. *************** *** 151,157 **** vtkSpline(); ~vtkSpline(); ! unsigned long ComputeTime; int ClampValue; double *Intervals; double *Coefficients; --- 151,157 ---- vtkSpline(); ~vtkSpline(); ! vtkTimeStamp ComputeTime; int ClampValue; double *Intervals; double *Coefficients; diff -crB VTK/Filtering/vtkTrivialProducer.cxx VTKNew/Filtering/vtkTrivialProducer.cxx *** VTK/Filtering/vtkTrivialProducer.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkTrivialProducer.cxx 2013-09-24 09:25:48.505807300 +0200 *************** *** 76,87 **** } //---------------------------------------------------------------------------- ! unsigned long vtkTrivialProducer::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); if(this->Output) { ! unsigned long omtime = this->Output->GetMTime(); if(omtime > mtime) { mtime = omtime; --- 76,87 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkTrivialProducer::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); if(this->Output) { ! vtkTimeStamp omtime = this->Output->GetMTime(); if(omtime > mtime) { mtime = omtime; diff -crB VTK/Filtering/vtkTrivialProducer.h VTKNew/Filtering/vtkTrivialProducer.h *** VTK/Filtering/vtkTrivialProducer.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Filtering/vtkTrivialProducer.h 2013-09-24 09:02:23.381438700 +0200 *************** *** 50,56 **** // Description: // The modified time of this producer is the newer of this object or // the assigned output. ! virtual unsigned long GetMTime(); protected: vtkTrivialProducer(); ~vtkTrivialProducer(); --- 50,56 ---- // Description: // The modified time of this producer is the newer of this object or // the assigned output. ! virtual vtkTimeStamp GetMTime(); protected: vtkTrivialProducer(); ~vtkTrivialProducer(); diff -crB VTK/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx VTKNew/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx *** VTK/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx 2013-09-24 11:52:49.035312700 +0200 *************** *** 485,494 **** //---------------------------------------------------------------------------- // Description: // Datasets are composite objects and need to check each part for MTime. ! unsigned long int vtkBridgeDataSet::GetMTime() { ! unsigned long result; ! unsigned long mtime; result = this->Superclass::GetMTime(); --- 485,494 ---- //---------------------------------------------------------------------------- // Description: // Datasets are composite objects and need to check each part for MTime. ! vtkTimeStamp vtkBridgeDataSet::GetMTime() { ! vtkTimeStamp result; ! vtkTimeStamp mtime; result = this->Superclass::GetMTime(); diff -crB VTK/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h VTKNew/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h *** VTK/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h 2013-09-24 11:52:49.236324200 +0200 *************** *** 129,135 **** // Description: // Datasets are composite objects and need to check each part for MTime. ! unsigned long int GetMTime(); // Description: // Compute the geometry bounding box. --- 129,135 ---- // Description: // Datasets are composite objects and need to check each part for MTime. ! vtkTimeStamp GetMTime(); // Description: // Compute the geometry bounding box. diff -crB VTK/GenericFiltering/vtkGenericClip.cxx VTKNew/GenericFiltering/vtkGenericClip.cxx *** VTK/GenericFiltering/vtkGenericClip.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericClip.cxx 2013-09-24 10:05:15.697202900 +0200 *************** *** 99,108 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! unsigned long vtkGenericClip::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->ClipFunction != NULL ) { --- 99,108 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! vtkTimeStamp vtkGenericClip::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->ClipFunction != NULL ) { diff -crB VTK/GenericFiltering/vtkGenericClip.h VTKNew/GenericFiltering/vtkGenericClip.h *** VTK/GenericFiltering/vtkGenericClip.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericClip.h 2013-09-24 10:05:16.229233300 +0200 *************** *** 144,150 **** // Description: // Return the mtime also considering the locator and clip function. ! unsigned long GetMTime(); // Description: // If you want to clip by an arbitrary array, then set its name here. --- 144,150 ---- // Description: // Return the mtime also considering the locator and clip function. ! vtkTimeStamp GetMTime(); // Description: // If you want to clip by an arbitrary array, then set its name here. diff -crB VTK/GenericFiltering/vtkGenericContourFilter.cxx VTKNew/GenericFiltering/vtkGenericContourFilter.cxx *** VTK/GenericFiltering/vtkGenericContourFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericContourFilter.cxx 2013-09-24 10:05:15.709203600 +0200 *************** *** 77,86 **** //----------------------------------------------------------------------------- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkGenericContourFilter::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if (this->ContourValues) { --- 77,86 ---- //----------------------------------------------------------------------------- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkGenericContourFilter::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->ContourValues) { diff -crB VTK/GenericFiltering/vtkGenericContourFilter.h VTKNew/GenericFiltering/vtkGenericContourFilter.h *** VTK/GenericFiltering/vtkGenericContourFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericContourFilter.h 2013-09-24 10:05:16.366241100 +0200 *************** *** 77,83 **** // Description: // Modified GetMTime Because we delegate to vtkContourValues ! unsigned long GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 77,83 ---- // Description: // Modified GetMTime Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/GenericFiltering/vtkGenericCutter.cxx VTKNew/GenericFiltering/vtkGenericCutter.cxx *** VTK/GenericFiltering/vtkGenericCutter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericCutter.cxx 2013-09-24 10:05:15.685202200 +0200 *************** *** 151,161 **** // Overload standard modified time function. If cut functions is modified, // or contour values modified, then this object is modified as well. // ! unsigned long vtkGenericCutter::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long contourValuesMTime = this->ContourValues->GetMTime(); ! unsigned long time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); --- 151,161 ---- // Overload standard modified time function. If cut functions is modified, // or contour values modified, then this object is modified as well. // ! vtkTimeStamp vtkGenericCutter::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp contourValuesMTime = this->ContourValues->GetMTime(); ! vtkTimeStamp time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); diff -crB VTK/GenericFiltering/vtkGenericCutter.h VTKNew/GenericFiltering/vtkGenericCutter.h *** VTK/GenericFiltering/vtkGenericCutter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericCutter.h 2013-09-24 10:55:03.663104700 +0200 *************** *** 107,113 **** // Description: // Override GetMTime because we delegate to vtkContourValues and refer to // vtkImplicitFunction. ! unsigned long GetMTime(); // Description // Specify the implicit function to perform the cutting. --- 107,113 ---- // Description: // Override GetMTime because we delegate to vtkContourValues and refer to // vtkImplicitFunction. ! vtkTimeStamp GetMTime(); // Description // Specify the implicit function to perform the cutting. diff -crB VTK/GenericFiltering/vtkGenericDataSetTessellator.cxx VTKNew/GenericFiltering/vtkGenericDataSetTessellator.cxx *** VTK/GenericFiltering/vtkGenericDataSetTessellator.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericDataSetTessellator.cxx 2013-09-24 10:05:15.691202500 +0200 *************** *** 283,292 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkGenericDataSetTessellator::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 283,292 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGenericDataSetTessellator::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/GenericFiltering/vtkGenericDataSetTessellator.h VTKNew/GenericFiltering/vtkGenericDataSetTessellator.h *** VTK/GenericFiltering/vtkGenericDataSetTessellator.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericDataSetTessellator.h 2013-09-24 10:05:16.209232200 +0200 *************** *** 78,84 **** // Description: // Return the MTime also considering the locator. ! unsigned long GetMTime(); protected: vtkGenericDataSetTessellator(); --- 78,84 ---- // Description: // Return the MTime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkGenericDataSetTessellator(); diff -crB VTK/GenericFiltering/vtkGenericGeometryFilter.cxx VTKNew/GenericFiltering/vtkGenericGeometryFilter.cxx *** VTK/GenericFiltering/vtkGenericGeometryFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericGeometryFilter.cxx 2013-09-24 10:05:15.703203200 +0200 *************** *** 472,481 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkGenericGeometryFilter::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 472,481 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGenericGeometryFilter::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/GenericFiltering/vtkGenericGeometryFilter.h VTKNew/GenericFiltering/vtkGenericGeometryFilter.h *** VTK/GenericFiltering/vtkGenericGeometryFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GenericFiltering/vtkGenericGeometryFilter.h 2013-09-24 10:05:16.345239900 +0200 *************** *** 124,130 **** // Description: // Return the MTime also considering the locator. ! unsigned long GetMTime(); // Description: // If on, the output polygonal dataset will have a celldata array that --- 124,130 ---- // Description: // Return the MTime also considering the locator. ! vtkTimeStamp GetMTime(); // Description: // If on, the output polygonal dataset will have a celldata array that diff -crB VTK/Geovis/vtkGeoAdaptiveArcs.cxx VTKNew/Geovis/vtkGeoAdaptiveArcs.cxx *** VTK/Geovis/vtkGeoAdaptiveArcs.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Geovis/vtkGeoAdaptiveArcs.cxx 2013-09-24 12:05:54.725251600 +0200 *************** *** 49,55 **** this->MaximumPixelSeparation = 10.0; this->MinimumPixelSeparation = 1.0; this->LastInput = 0; - this->LastInputMTime = 0; this->InputLatitude = vtkDoubleArray::New(); this->InputLongitude = vtkDoubleArray::New(); } --- 49,54 ---- *************** *** 289,300 **** } //------------------------------------------------------------------------- ! unsigned long vtkGeoAdaptiveArcs::GetMTime() { ! unsigned long retMTime = this->Superclass::GetMTime(); if ( this->Renderer ) { ! unsigned long tmpTime = this->Renderer->GetMTime(); if ( tmpTime > retMTime ) { retMTime = tmpTime; --- 288,299 ---- } //------------------------------------------------------------------------- ! vtkTimeStamp vtkGeoAdaptiveArcs::GetMTime() { ! vtkTimeStamp retMTime = this->Superclass::GetMTime(); if ( this->Renderer ) { ! vtkTimeStamp tmpTime = this->Renderer->GetMTime(); if ( tmpTime > retMTime ) { retMTime = tmpTime; diff -crB VTK/Geovis/vtkGeoAdaptiveArcs.h VTKNew/Geovis/vtkGeoAdaptiveArcs.h *** VTK/Geovis/vtkGeoAdaptiveArcs.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Geovis/vtkGeoAdaptiveArcs.h 2013-09-24 12:02:22.066088200 +0200 *************** *** 70,76 **** // Description: // Return the modified time of this object. ! virtual unsigned long GetMTime(); protected: vtkGeoAdaptiveArcs(); --- 70,76 ---- // Description: // Return the modified time of this object. ! virtual vtkTimeStamp GetMTime(); protected: vtkGeoAdaptiveArcs(); *************** *** 84,90 **** double GlobeRadius; double MaximumPixelSeparation; double MinimumPixelSeparation; ! unsigned long LastInputMTime; vtkPolyData* LastInput; vtkDoubleArray* InputLatitude; vtkDoubleArray* InputLongitude; --- 84,90 ---- double GlobeRadius; double MaximumPixelSeparation; double MinimumPixelSeparation; ! vtkTimeStamp LastInputMTime; vtkPolyData* LastInput; vtkDoubleArray* InputLatitude; vtkDoubleArray* InputLongitude; diff -crB VTK/Graphics/vtkAnnotationLink.cxx VTKNew/Graphics/vtkAnnotationLink.cxx *** VTK/Graphics/vtkAnnotationLink.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkAnnotationLink.cxx 2013-09-24 09:25:48.592812200 +0200 *************** *** 303,314 **** } //---------------------------------------------------------------------------- ! unsigned long vtkAnnotationLink::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); if (this->AnnotationLayers) { ! unsigned long atime = this->AnnotationLayers->GetMTime(); if (atime > mtime) { mtime = atime; --- 303,314 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkAnnotationLink::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); if (this->AnnotationLayers) { ! vtkTimeStamp atime = this->AnnotationLayers->GetMTime(); if (atime > mtime) { mtime = atime; *************** *** 317,323 **** if (this->DomainMaps) { ! unsigned long dtime = this->DomainMaps->GetMTime(); if (dtime > mtime) { mtime = dtime; --- 317,323 ---- if (this->DomainMaps) { ! vtkTimeStamp dtime = this->DomainMaps->GetMTime(); if (dtime > mtime) { mtime = dtime; diff -crB VTK/Graphics/vtkAnnotationLink.h VTKNew/Graphics/vtkAnnotationLink.h *** VTK/Graphics/vtkAnnotationLink.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkAnnotationLink.h 2013-09-24 10:05:17.509306500 +0200 *************** *** 77,83 **** // Description: // Get the mtime of this object. ! virtual unsigned long GetMTime(); protected: vtkAnnotationLink(); --- 77,83 ---- // Description: // Get the mtime of this object. ! virtual vtkTimeStamp GetMTime(); protected: vtkAnnotationLink(); diff -crB VTK/Graphics/vtkBandedPolyDataContourFilter.cxx VTKNew/Graphics/vtkBandedPolyDataContourFilter.cxx *** VTK/Graphics/vtkBandedPolyDataContourFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkBandedPolyDataContourFilter.cxx 2013-09-24 09:25:48.597812500 +0200 *************** *** 787,796 **** this->GetExecutive()->GetOutputData(1)); } ! unsigned long int vtkBandedPolyDataContourFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; time = this->ContourValues->GetMTime(); mTime = ( time > mTime ? time : mTime ); --- 787,796 ---- this->GetExecutive()->GetOutputData(1)); } ! vtkTimeStamp vtkBandedPolyDataContourFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; time = this->ContourValues->GetMTime(); mTime = ( time > mTime ? time : mTime ); diff -crB VTK/Graphics/vtkBandedPolyDataContourFilter.h VTKNew/Graphics/vtkBandedPolyDataContourFilter.h *** VTK/Graphics/vtkBandedPolyDataContourFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkBandedPolyDataContourFilter.h 2013-09-24 09:25:48.178788600 +0200 *************** *** 113,119 **** // Description: // Overload GetMTime because we delegate to vtkContourValues so its // modified time must be taken into account. ! unsigned long GetMTime(); protected: vtkBandedPolyDataContourFilter(); --- 113,119 ---- // Description: // Overload GetMTime because we delegate to vtkContourValues so its // modified time must be taken into account. ! vtkTimeStamp GetMTime(); protected: vtkBandedPolyDataContourFilter(); diff -crB VTK/Graphics/vtkBoxClipDataSet.cxx VTKNew/Graphics/vtkBoxClipDataSet.cxx *** VTK/Graphics/vtkBoxClipDataSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkBoxClipDataSet.cxx 2013-09-24 09:25:48.586811900 +0200 *************** *** 138,147 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! unsigned long vtkBoxClipDataSet::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 138,147 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! vtkTimeStamp vtkBoxClipDataSet::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/Graphics/vtkBoxClipDataSet.h VTKNew/Graphics/vtkBoxClipDataSet.h *** VTK/Graphics/vtkBoxClipDataSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkBoxClipDataSet.h 2013-09-24 09:25:48.157787400 +0200 *************** *** 125,131 **** // Description: // Return the mtime also considering the locator. ! unsigned long GetMTime(); // Description: // Tells if clipping happens with a box parallel with coordinate axis --- 125,131 ---- // Description: // Return the mtime also considering the locator. ! vtkTimeStamp GetMTime(); // Description: // Tells if clipping happens with a box parallel with coordinate axis diff -crB VTK/Graphics/vtkCleanPolyData.cxx VTKNew/Graphics/vtkCleanPolyData.cxx *** VTK/Graphics/vtkCleanPolyData.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkCleanPolyData.cxx 2013-09-24 09:25:48.603812900 +0200 *************** *** 684,693 **** } //-------------------------------------------------------------------------- ! unsigned long int vtkCleanPolyData::GetMTime() { ! unsigned long mTime=this->vtkObject::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { time = this->Locator->GetMTime(); --- 684,693 ---- } //-------------------------------------------------------------------------- ! vtkTimeStamp vtkCleanPolyData::GetMTime() { ! vtkTimeStamp mTime=this->vtkObject::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { time = this->Locator->GetMTime(); diff -crB VTK/Graphics/vtkCleanPolyData.h VTKNew/Graphics/vtkCleanPolyData.h *** VTK/Graphics/vtkCleanPolyData.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkCleanPolyData.h 2013-09-24 09:25:48.113784800 +0200 *************** *** 130,136 **** // Description: // Get the MTime of this object also considering the locator. ! unsigned long int GetMTime(); // Description: // Perform operation on a point --- 130,136 ---- // Description: // Get the MTime of this object also considering the locator. ! vtkTimeStamp GetMTime(); // Description: // Perform operation on a point diff -crB VTK/Graphics/vtkClipClosedSurface.cxx VTKNew/Graphics/vtkClipClosedSurface.cxx *** VTK/Graphics/vtkClipClosedSurface.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipClosedSurface.cxx 2013-09-24 09:25:48.580811600 +0200 *************** *** 183,198 **** vtkInformationVector** vtkNotUsed(inputVector), vtkInformationVector* vtkNotUsed(outputVector), int vtkNotUsed(requestFromOutputPort), ! unsigned long* mtime) { ! unsigned long mTime = this->GetMTime(); vtkPlaneCollection *planes = this->ClippingPlanes; vtkPlane *plane = 0; if (planes) { ! unsigned long planesMTime = planes->GetMTime(); if (planesMTime > mTime) { mTime = planesMTime; --- 183,198 ---- vtkInformationVector** vtkNotUsed(inputVector), vtkInformationVector* vtkNotUsed(outputVector), int vtkNotUsed(requestFromOutputPort), ! vtkTimeStamp* mtime) { ! vtkTimeStamp mTime = this->GetMTime(); vtkPlaneCollection *planes = this->ClippingPlanes; vtkPlane *plane = 0; if (planes) { ! vtkTimeStamp planesMTime = planes->GetMTime(); if (planesMTime > mTime) { mTime = planesMTime; *************** *** 202,208 **** planes->InitTraversal(iter); while ( (plane = planes->GetNextPlane(iter)) ) { ! unsigned long planeMTime = plane->GetMTime(); if (planeMTime > mTime) { mTime = planeMTime; --- 202,208 ---- planes->InitTraversal(iter); while ( (plane = planes->GetNextPlane(iter)) ) { ! vtkTimeStamp planeMTime = plane->GetMTime(); if (planeMTime > mTime) { mTime = planeMTime; diff -crB VTK/Graphics/vtkClipClosedSurface.h VTKNew/Graphics/vtkClipClosedSurface.h *** VTK/Graphics/vtkClipClosedSurface.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipClosedSurface.h 2013-09-24 10:05:17.489305400 +0200 *************** *** 185,191 **** virtual int ComputePipelineMTime( vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector, int requestFromOutputPort, ! unsigned long* mtime); virtual int RequestData( vtkInformation* request, vtkInformationVector** inputVector, --- 185,191 ---- virtual int ComputePipelineMTime( vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector, int requestFromOutputPort, ! vtkTimeStamp* mtime); virtual int RequestData( vtkInformation* request, vtkInformationVector** inputVector, diff -crB VTK/Graphics/vtkClipConvexPolyData.cxx VTKNew/Graphics/vtkClipConvexPolyData.cxx *** VTK/Graphics/vtkClipConvexPolyData.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipConvexPolyData.cxx 2013-09-24 09:25:48.609813200 +0200 *************** *** 76,87 **** // Description: // Redefines this method, as this filter depends on time of its components // (planes) ! unsigned long int vtkClipConvexPolyData::GetMTime() { ! unsigned long int result=Superclass::GetMTime(); if(this->Planes!=0) { ! unsigned long int planesTime=this->Planes->GetMTime(); if(planesTime>result) { result=planesTime; --- 76,87 ---- // Description: // Redefines this method, as this filter depends on time of its components // (planes) ! vtkTimeStamp vtkClipConvexPolyData::GetMTime() { ! vtkTimeStamp result=Superclass::GetMTime(); if(this->Planes!=0) { ! vtkTimeStamp planesTime=this->Planes->GetMTime(); if(planesTime>result) { result=planesTime; diff -crB VTK/Graphics/vtkClipConvexPolyData.h VTKNew/Graphics/vtkClipConvexPolyData.h *** VTK/Graphics/vtkClipConvexPolyData.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipConvexPolyData.h 2013-09-24 09:25:48.091783600 +0200 *************** *** 43,49 **** // Description: // Redefines this method, as this filter depends on time of its components // (planes) ! virtual unsigned long int GetMTime(); protected: vtkClipConvexPolyData(); --- 43,49 ---- // Description: // Redefines this method, as this filter depends on time of its components // (planes) ! virtual vtkTimeStamp GetMTime(); protected: vtkClipConvexPolyData(); diff -crB VTK/Graphics/vtkClipDataSet.cxx VTKNew/Graphics/vtkClipDataSet.cxx *** VTK/Graphics/vtkClipDataSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipDataSet.cxx 2013-09-24 09:25:48.574811200 +0200 *************** *** 114,123 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! unsigned long vtkClipDataSet::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->ClipFunction != NULL ) { --- 114,123 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! vtkTimeStamp vtkClipDataSet::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->ClipFunction != NULL ) { diff -crB VTK/Graphics/vtkClipDataSet.h VTKNew/Graphics/vtkClipDataSet.h *** VTK/Graphics/vtkClipDataSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipDataSet.h 2013-09-24 09:25:48.072782500 +0200 *************** *** 149,155 **** // Description: // Return the mtime also considering the locator and clip function. ! unsigned long GetMTime(); protected: vtkClipDataSet(vtkImplicitFunction *cf=NULL); --- 149,155 ---- // Description: // Return the mtime also considering the locator and clip function. ! vtkTimeStamp GetMTime(); protected: vtkClipDataSet(vtkImplicitFunction *cf=NULL); diff -crB VTK/Graphics/vtkClipHyperOctree.cxx VTKNew/Graphics/vtkClipHyperOctree.cxx *** VTK/Graphics/vtkClipHyperOctree.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipHyperOctree.cxx 2013-09-24 09:25:38.327225100 +0200 *************** *** 109,118 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! unsigned long vtkClipHyperOctree::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->ClipFunction != NULL ) { --- 109,118 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! vtkTimeStamp vtkClipHyperOctree::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->ClipFunction != NULL ) { diff -crB VTK/Graphics/vtkClipHyperOctree.h VTKNew/Graphics/vtkClipHyperOctree.h *** VTK/Graphics/vtkClipHyperOctree.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipHyperOctree.h 2013-09-24 09:25:48.000778400 +0200 *************** *** 144,150 **** // Description: // Return the mtime also considering the locator and clip function. ! unsigned long GetMTime(); protected: vtkClipHyperOctree(vtkImplicitFunction *cf=NULL); --- 144,150 ---- // Description: // Return the mtime also considering the locator and clip function. ! vtkTimeStamp GetMTime(); protected: vtkClipHyperOctree(vtkImplicitFunction *cf=NULL); diff -crB VTK/Graphics/vtkClipPolyData.cxx VTKNew/Graphics/vtkClipPolyData.cxx *** VTK/Graphics/vtkClipPolyData.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipPolyData.cxx 2013-09-24 10:05:16.074224400 +0200 *************** *** 68,77 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! unsigned long vtkClipPolyData::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->ClipFunction != NULL ) { --- 68,77 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! vtkTimeStamp vtkClipPolyData::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->ClipFunction != NULL ) { diff -crB VTK/Graphics/vtkClipPolyData.h VTKNew/Graphics/vtkClipPolyData.h *** VTK/Graphics/vtkClipPolyData.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipPolyData.h 2013-09-24 10:05:17.445302900 +0200 *************** *** 137,143 **** // Description: // Return the mtime also considering the locator and clip function. ! unsigned long GetMTime(); protected: vtkClipPolyData(vtkImplicitFunction *cf=NULL); --- 137,143 ---- // Description: // Return the mtime also considering the locator and clip function. ! vtkTimeStamp GetMTime(); protected: vtkClipPolyData(vtkImplicitFunction *cf=NULL); diff -crB VTK/Graphics/vtkClipVolume.cxx VTKNew/Graphics/vtkClipVolume.cxx *** VTK/Graphics/vtkClipVolume.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipVolume.cxx 2013-09-24 10:05:16.068224100 +0200 *************** *** 87,95 **** // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! unsigned long vtkClipVolume::GetMTime() { ! unsigned long mTime, time; mTime=this->Superclass::GetMTime(); --- 87,95 ---- // Overload standard modified time function. If Clip functions is modified, // then this object is modified as well. ! vtkTimeStamp vtkClipVolume::GetMTime() { ! vtkTimeStamp mTime, time; mTime=this->Superclass::GetMTime(); diff -crB VTK/Graphics/vtkClipVolume.h VTKNew/Graphics/vtkClipVolume.h *** VTK/Graphics/vtkClipVolume.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkClipVolume.h 2013-09-24 09:25:48.038780500 +0200 *************** *** 160,166 **** // Description: // Return the mtime also considering the locator and clip function. ! unsigned long int GetMTime(); protected: vtkClipVolume(vtkImplicitFunction *cf=NULL); --- 160,166 ---- // Description: // Return the mtime also considering the locator and clip function. ! vtkTimeStamp GetMTime(); protected: vtkClipVolume(vtkImplicitFunction *cf=NULL); diff -crB VTK/Graphics/vtkContourFilter.cxx VTKNew/Graphics/vtkContourFilter.cxx *** VTK/Graphics/vtkContourFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkContourFilter.cxx 2013-09-24 10:05:16.062223700 +0200 *************** *** 96,105 **** // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkContourFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if (this->ContourValues) { --- 96,105 ---- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkContourFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->ContourValues) { diff -crB VTK/Graphics/vtkContourFilter.h VTKNew/Graphics/vtkContourFilter.h *** VTK/Graphics/vtkContourFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkContourFilter.h 2013-09-24 10:05:17.404300500 +0200 *************** *** 79,85 **** // Description: // Modified GetMTime Because we delegate to vtkContourValues ! unsigned long GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 79,85 ---- // Description: // Modified GetMTime Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/Graphics/vtkContourGrid.cxx VTKNew/Graphics/vtkContourGrid.cxx *** VTK/Graphics/vtkContourGrid.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkContourGrid.cxx 2013-09-24 10:05:16.055223300 +0200 *************** *** 71,80 **** // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkContourGrid::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if (this->ContourValues) { --- 71,80 ---- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkContourGrid::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->ContourValues) { diff -crB VTK/Graphics/vtkContourGrid.h VTKNew/Graphics/vtkContourGrid.h *** VTK/Graphics/vtkContourGrid.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkContourGrid.h 2013-09-24 10:05:17.384299400 +0200 *************** *** 78,84 **** // Description: // Modified GetMTime Because we delegate to vtkContourValues ! unsigned long GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 78,84 ---- // Description: // Modified GetMTime Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/Graphics/vtkCutter.cxx VTKNew/Graphics/vtkCutter.cxx *** VTK/Graphics/vtkCutter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkCutter.cxx 2013-09-24 10:05:16.049223000 +0200 *************** *** 83,93 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If cut functions is modified, // or contour values modified, then this object is modified as well. ! unsigned long vtkCutter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long contourValuesMTime=this->ContourValues->GetMTime(); ! unsigned long time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); --- 83,93 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If cut functions is modified, // or contour values modified, then this object is modified as well. ! vtkTimeStamp vtkCutter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp contourValuesMTime=this->ContourValues->GetMTime(); ! vtkTimeStamp time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); diff -crB VTK/Graphics/vtkCutter.h VTKNew/Graphics/vtkCutter.h *** VTK/Graphics/vtkCutter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkCutter.h 2013-09-24 10:05:17.364298200 +0200 *************** *** 118,124 **** // Description: // Override GetMTime because we delegate to vtkContourValues and refer to // vtkImplicitFunction. ! unsigned long GetMTime(); // Description // Specify the implicit function to perform the cutting. --- 118,124 ---- // Description: // Override GetMTime because we delegate to vtkContourValues and refer to // vtkImplicitFunction. ! vtkTimeStamp GetMTime(); // Description // Specify the implicit function to perform the cutting. diff -crB VTK/Graphics/vtkDelaunay3D.cxx VTKNew/Graphics/vtkDelaunay3D.cxx *** VTK/Graphics/vtkDelaunay3D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkDelaunay3D.cxx 2013-09-24 10:05:16.042222600 +0200 *************** *** 997,1006 **** } } ! unsigned long int vtkDelaunay3D::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 997,1006 ---- } } ! vtkTimeStamp vtkDelaunay3D::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/Graphics/vtkDelaunay3D.h VTKNew/Graphics/vtkDelaunay3D.h *** VTK/Graphics/vtkDelaunay3D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkDelaunay3D.h 2013-09-24 10:05:17.235290800 +0200 *************** *** 181,187 **** // Description: // Return the MTime also considering the locator. ! unsigned long GetMTime(); protected: vtkDelaunay3D(); --- 181,187 ---- // Description: // Return the MTime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkDelaunay3D(); diff -crB VTK/Graphics/vtkExtractEdges.cxx VTKNew/Graphics/vtkExtractEdges.cxx *** VTK/Graphics/vtkExtractEdges.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractEdges.cxx 2013-09-24 10:05:16.036222300 +0200 *************** *** 264,273 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkExtractEdges::GetMTime() { ! unsigned long mTime=this-> Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 264,273 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkExtractEdges::GetMTime() { ! vtkTimeStamp mTime=this-> Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/Graphics/vtkExtractEdges.h VTKNew/Graphics/vtkExtractEdges.h *** VTK/Graphics/vtkExtractEdges.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractEdges.h 2013-09-24 10:05:17.134285100 +0200 *************** *** 46,52 **** // Description: // Return MTime also considering the locator. ! unsigned long GetMTime(); protected: vtkExtractEdges(); --- 46,52 ---- // Description: // Return MTime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkExtractEdges(); diff -crB VTK/Graphics/vtkExtractGeometry.cxx VTKNew/Graphics/vtkExtractGeometry.cxx *** VTK/Graphics/vtkExtractGeometry.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractGeometry.cxx 2013-09-24 10:05:16.031222000 +0200 *************** *** 51,60 **** // Overload standard modified time function. If implicit function is modified, // then this object is modified as well. ! unsigned long vtkExtractGeometry::GetMTime() { ! unsigned long mTime=this->MTime.GetMTime(); ! unsigned long impFuncMTime; if ( this->ImplicitFunction != NULL ) { --- 51,60 ---- // Overload standard modified time function. If implicit function is modified, // then this object is modified as well. ! vtkTimeStamp vtkExtractGeometry::GetMTime() { ! vtkTimeStamp mTime=this->MTime.GetMTime(); ! vtkTimeStamp impFuncMTime; if ( this->ImplicitFunction != NULL ) { diff -crB VTK/Graphics/vtkExtractGeometry.h VTKNew/Graphics/vtkExtractGeometry.h *** VTK/Graphics/vtkExtractGeometry.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractGeometry.h 2013-09-24 10:05:17.113283900 +0200 *************** *** 51,57 **** // Description: // Return the MTime taking into account changes to the implicit function ! unsigned long GetMTime(); // Description: // Specify the implicit function for inside/outside checks. --- 51,57 ---- // Description: // Return the MTime taking into account changes to the implicit function ! vtkTimeStamp GetMTime(); // Description: // Specify the implicit function for inside/outside checks. diff -crB VTK/Graphics/vtkExtractPolyDataGeometry.cxx VTKNew/Graphics/vtkExtractPolyDataGeometry.cxx *** VTK/Graphics/vtkExtractPolyDataGeometry.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractPolyDataGeometry.cxx 2013-09-24 10:05:16.024221600 +0200 *************** *** 48,57 **** // Overload standard modified time function. If implicit function is modified, // then this object is modified as well. ! unsigned long vtkExtractPolyDataGeometry::GetMTime() { ! unsigned long mTime=this->MTime.GetMTime(); ! unsigned long impFuncMTime; if ( this->ImplicitFunction != NULL ) { --- 48,57 ---- // Overload standard modified time function. If implicit function is modified, // then this object is modified as well. ! vtkTimeStamp vtkExtractPolyDataGeometry::GetMTime() { ! vtkTimeStamp mTime=this->MTime.GetMTime(); ! vtkTimeStamp impFuncMTime; if ( this->ImplicitFunction != NULL ) { diff -crB VTK/Graphics/vtkExtractPolyDataGeometry.h VTKNew/Graphics/vtkExtractPolyDataGeometry.h *** VTK/Graphics/vtkExtractPolyDataGeometry.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractPolyDataGeometry.h 2013-09-24 10:05:17.073281600 +0200 *************** *** 51,57 **** // Description: // Return the MTime taking into account changes to the implicit function ! unsigned long GetMTime(); // Description: // Specify the implicit function for inside/outside checks. --- 51,57 ---- // Description: // Return the MTime taking into account changes to the implicit function ! vtkTimeStamp GetMTime(); // Description: // Specify the implicit function for inside/outside checks. diff -crB VTK/Graphics/vtkExtractSelectedFrustum.cxx VTKNew/Graphics/vtkExtractSelectedFrustum.cxx *** VTK/Graphics/vtkExtractSelectedFrustum.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractSelectedFrustum.cxx 2013-09-24 10:05:16.019221300 +0200 *************** *** 92,101 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If implicit function is modified, // then this object is modified as well. ! unsigned long vtkExtractSelectedFrustum::GetMTime() { ! unsigned long mTime=this->MTime.GetMTime(); ! unsigned long impFuncMTime; if ( this->Frustum != NULL ) { --- 92,101 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If implicit function is modified, // then this object is modified as well. ! vtkTimeStamp vtkExtractSelectedFrustum::GetMTime() { ! vtkTimeStamp mTime=this->MTime.GetMTime(); ! vtkTimeStamp impFuncMTime; if ( this->Frustum != NULL ) { diff -crB VTK/Graphics/vtkExtractSelectedFrustum.h VTKNew/Graphics/vtkExtractSelectedFrustum.h *** VTK/Graphics/vtkExtractSelectedFrustum.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractSelectedFrustum.h 2013-09-24 10:05:17.033279300 +0200 *************** *** 51,57 **** // Description: // Return the MTime taking into account changes to the Frustum ! unsigned long GetMTime(); // Description: // Set the selection frustum. The planes object must contain six planes. --- 51,57 ---- // Description: // Return the MTime taking into account changes to the Frustum ! vtkTimeStamp GetMTime(); // Description: // Set the selection frustum. The planes object must contain six planes. diff -crB VTK/Graphics/vtkExtractUnstructuredGrid.cxx VTKNew/Graphics/vtkExtractUnstructuredGrid.cxx *** VTK/Graphics/vtkExtractUnstructuredGrid.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractUnstructuredGrid.cxx 2013-09-24 10:05:16.010220800 +0200 *************** *** 276,285 **** return 1; } ! unsigned long int vtkExtractUnstructuredGrid::GetMTime() { ! unsigned long mTime= this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 276,285 ---- return 1; } ! vtkTimeStamp vtkExtractUnstructuredGrid::GetMTime() { ! vtkTimeStamp mTime= this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/Graphics/vtkExtractUnstructuredGrid.h VTKNew/Graphics/vtkExtractUnstructuredGrid.h *** VTK/Graphics/vtkExtractUnstructuredGrid.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkExtractUnstructuredGrid.h 2013-09-24 10:05:17.014278200 +0200 *************** *** 118,124 **** // Description: // Return the MTime also considering the locator. ! unsigned long GetMTime(); protected: vtkExtractUnstructuredGrid(); --- 118,124 ---- // Description: // Return the MTime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkExtractUnstructuredGrid(); diff -crB VTK/Graphics/vtkFeatureEdges.cxx VTKNew/Graphics/vtkFeatureEdges.cxx *** VTK/Graphics/vtkFeatureEdges.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkFeatureEdges.cxx 2013-09-24 10:05:16.004220400 +0200 *************** *** 392,401 **** this->Modified(); } ! unsigned long int vtkFeatureEdges::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 392,401 ---- this->Modified(); } ! vtkTimeStamp vtkFeatureEdges::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/Graphics/vtkFeatureEdges.h VTKNew/Graphics/vtkFeatureEdges.h *** VTK/Graphics/vtkFeatureEdges.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkFeatureEdges.h 2013-09-24 10:05:16.993277000 +0200 *************** *** 97,103 **** // Description: // Return MTime also considering the locator. ! unsigned long GetMTime(); protected: vtkFeatureEdges(); --- 97,103 ---- // Description: // Return MTime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkFeatureEdges(); diff -crB VTK/Graphics/vtkFrustumSource.cxx VTKNew/Graphics/vtkFrustumSource.cxx *** VTK/Graphics/vtkFrustumSource.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkFrustumSource.cxx 2013-09-24 10:05:15.997220000 +0200 *************** *** 380,391 **** // ---------------------------------------------------------------------------- // Description: // Modified GetMTime because of Planes. ! unsigned long vtkFrustumSource::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); if(this->Planes!=0) { ! unsigned long time; time = this->Planes->GetMTime(); if(time>mTime) { --- 380,391 ---- // ---------------------------------------------------------------------------- // Description: // Modified GetMTime because of Planes. ! vtkTimeStamp vtkFrustumSource::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); if(this->Planes!=0) { ! vtkTimeStamp time; time = this->Planes->GetMTime(); if(time>mTime) { diff -crB VTK/Graphics/vtkFrustumSource.h VTKNew/Graphics/vtkFrustumSource.h *** VTK/Graphics/vtkFrustumSource.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkFrustumSource.h 2013-09-24 10:05:16.925273100 +0200 *************** *** 65,71 **** // Description: // Modified GetMTime because of Planes. ! unsigned long GetMTime(); protected: // Description: --- 65,71 ---- // Description: // Modified GetMTime because of Planes. ! vtkTimeStamp GetMTime(); protected: // Description: diff -crB VTK/Graphics/vtkGeometryFilter.cxx VTKNew/Graphics/vtkGeometryFilter.cxx *** VTK/Graphics/vtkGeometryFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkGeometryFilter.cxx 2013-09-24 10:05:15.991219700 +0200 *************** *** 427,436 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkGeometryFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 427,436 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGeometryFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/Graphics/vtkGeometryFilter.h VTKNew/Graphics/vtkGeometryFilter.h *** VTK/Graphics/vtkGeometryFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkGeometryFilter.h 2013-09-24 10:05:17.426301800 +0200 *************** *** 123,129 **** // Description: // Return the MTime also considering the locator. ! unsigned long GetMTime(); protected: vtkGeometryFilter(); --- 123,129 ---- // Description: // Return the MTime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkGeometryFilter(); diff -crB VTK/Graphics/vtkGlyph3D.cxx VTKNew/Graphics/vtkGlyph3D.cxx *** VTK/Graphics/vtkGlyph3D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkGlyph3D.cxx 2013-09-24 10:05:15.984219300 +0200 *************** *** 83,92 **** } //---------------------------------------------------------------------------- ! unsigned long vtkGlyph3D::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->SourceTransform != NULL ) { time = this->SourceTransform ->GetMTime(); --- 83,92 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGlyph3D::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->SourceTransform != NULL ) { time = this->SourceTransform ->GetMTime(); diff -crB VTK/Graphics/vtkGlyph3D.h VTKNew/Graphics/vtkGlyph3D.h *** VTK/Graphics/vtkGlyph3D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkGlyph3D.h 2013-09-24 10:05:16.866269700 +0200 *************** *** 244,250 **** // Description: // Overridden to include SourceTransform's MTime. ! virtual unsigned long GetMTime(); protected: vtkGlyph3D(); --- 244,250 ---- // Description: // Overridden to include SourceTransform's MTime. ! virtual vtkTimeStamp GetMTime(); protected: vtkGlyph3D(); diff -crB VTK/Graphics/vtkGridSynchronizedTemplates3D.cxx VTKNew/Graphics/vtkGridSynchronizedTemplates3D.cxx *** VTK/Graphics/vtkGridSynchronizedTemplates3D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkGridSynchronizedTemplates3D.cxx 2013-09-24 10:05:15.978218900 +0200 *************** *** 85,94 **** // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkGridSynchronizedTemplates3D::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; --- 85,94 ---- // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkGridSynchronizedTemplates3D::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; diff -crB VTK/Graphics/vtkGridSynchronizedTemplates3D.h VTKNew/Graphics/vtkGridSynchronizedTemplates3D.h *** VTK/Graphics/vtkGridSynchronizedTemplates3D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkGridSynchronizedTemplates3D.h 2013-09-24 10:05:17.342297000 +0200 *************** *** 42,48 **** // Description: // Because we delegate to vtkContourValues ! unsigned long int GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 42,48 ---- // Description: // Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/Graphics/vtkHyperOctreeContourFilter.cxx VTKNew/Graphics/vtkHyperOctreeContourFilter.cxx *** VTK/Graphics/vtkHyperOctreeContourFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeContourFilter.cxx 2013-09-24 10:05:15.971218500 +0200 *************** *** 215,225 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Cut function is modified, // then this object is modified as well. ! unsigned long vtkHyperOctreeContourFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long contourValuesMTime=this->ContourValues->GetMTime(); ! unsigned long time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); --- 215,225 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Cut function is modified, // then this object is modified as well. ! vtkTimeStamp vtkHyperOctreeContourFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp contourValuesMTime=this->ContourValues->GetMTime(); ! vtkTimeStamp time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); diff -crB VTK/Graphics/vtkHyperOctreeContourFilter.h VTKNew/Graphics/vtkHyperOctreeContourFilter.h *** VTK/Graphics/vtkHyperOctreeContourFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeContourFilter.h 2013-09-24 10:05:16.825267400 +0200 *************** *** 143,149 **** // Description: // Modified GetMTime Because we delegate to vtkContourValues ! unsigned long GetMTime(); // Description: // Set / get a spatial locator for merging points. By default, --- 143,149 ---- // Description: // Modified GetMTime Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set / get a spatial locator for merging points. By default, diff -crB VTK/Graphics/vtkHyperOctreeCutter.cxx VTKNew/Graphics/vtkHyperOctreeCutter.cxx *** VTK/Graphics/vtkHyperOctreeCutter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeCutter.cxx 2013-09-24 10:05:15.965218200 +0200 *************** *** 104,114 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Cut function is modified, // then this object is modified as well. ! unsigned long vtkHyperOctreeCutter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long contourValuesMTime=this->ContourValues->GetMTime(); ! unsigned long time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); --- 104,114 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Cut function is modified, // then this object is modified as well. ! vtkTimeStamp vtkHyperOctreeCutter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp contourValuesMTime=this->ContourValues->GetMTime(); ! vtkTimeStamp time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); diff -crB VTK/Graphics/vtkHyperOctreeCutter.h VTKNew/Graphics/vtkHyperOctreeCutter.h *** VTK/Graphics/vtkHyperOctreeCutter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeCutter.h 2013-09-24 10:05:16.742262600 +0200 *************** *** 126,132 **** // Description: // Override GetMTime because we delegate to vtkContourValues and refer to // vtkImplicitFunction. ! unsigned long GetMTime(); // Description // Specify the implicit function to perform the cutting. --- 126,132 ---- // Description: // Override GetMTime because we delegate to vtkContourValues and refer to // vtkImplicitFunction. ! vtkTimeStamp GetMTime(); // Description // Specify the implicit function to perform the cutting. diff -crB VTK/Graphics/vtkHyperOctreeDualGridContourFilter.cxx VTKNew/Graphics/vtkHyperOctreeDualGridContourFilter.cxx *** VTK/Graphics/vtkHyperOctreeDualGridContourFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeDualGridContourFilter.cxx 2013-09-24 10:05:15.959217900 +0200 *************** *** 118,128 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If Cut function is modified, // then this object is modified as well. ! unsigned long vtkHyperOctreeDualGridContourFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long contourValuesMTime=this->ContourValues->GetMTime(); ! unsigned long time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); --- 118,128 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If Cut function is modified, // then this object is modified as well. ! vtkTimeStamp vtkHyperOctreeDualGridContourFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp contourValuesMTime=this->ContourValues->GetMTime(); ! vtkTimeStamp time; mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); diff -crB VTK/Graphics/vtkHyperOctreeDualGridContourFilter.h VTKNew/Graphics/vtkHyperOctreeDualGridContourFilter.h *** VTK/Graphics/vtkHyperOctreeDualGridContourFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeDualGridContourFilter.h 2013-09-24 10:05:16.721261400 +0200 *************** *** 132,138 **** // Description: // Modified GetMTime Because we delegate to vtkContourValues ! unsigned long GetMTime(); // Description: // Set / get a spatial locator for merging points. By default, --- 132,138 ---- // Description: // Modified GetMTime Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set / get a spatial locator for merging points. By default, diff -crB VTK/Graphics/vtkHyperOctreeSampleFunction.cxx VTKNew/Graphics/vtkHyperOctreeSampleFunction.cxx *** VTK/Graphics/vtkHyperOctreeSampleFunction.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeSampleFunction.cxx 2013-09-24 10:05:15.952217500 +0200 *************** *** 431,440 **** } //----------------------------------------------------------------------------- ! unsigned long vtkHyperOctreeSampleFunction::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long impFuncMTime; if ( this->ImplicitFunction != NULL ) { --- 431,440 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkHyperOctreeSampleFunction::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp impFuncMTime; if ( this->ImplicitFunction != NULL ) { diff -crB VTK/Graphics/vtkHyperOctreeSampleFunction.h VTKNew/Graphics/vtkHyperOctreeSampleFunction.h *** VTK/Graphics/vtkHyperOctreeSampleFunction.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeSampleFunction.h 2013-09-24 10:05:16.701260300 +0200 *************** *** 167,173 **** // Description: // Return the MTime also considering the implicit function. ! unsigned long GetMTime(); protected: // Description: --- 167,173 ---- // Description: // Return the MTime also considering the implicit function. ! vtkTimeStamp GetMTime(); protected: // Description: diff -crB VTK/Graphics/vtkHyperOctreeSurfaceFilter.cxx VTKNew/Graphics/vtkHyperOctreeSurfaceFilter.cxx *** VTK/Graphics/vtkHyperOctreeSurfaceFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeSurfaceFilter.cxx 2013-09-24 10:05:15.946217100 +0200 *************** *** 747,756 **** } //----------------------------------------------------------------------------- ! unsigned long int vtkHyperOctreeSurfaceFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if(this->Locator!=0) { --- 747,756 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkHyperOctreeSurfaceFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if(this->Locator!=0) { diff -crB VTK/Graphics/vtkHyperOctreeSurfaceFilter.h VTKNew/Graphics/vtkHyperOctreeSurfaceFilter.h *** VTK/Graphics/vtkHyperOctreeSurfaceFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkHyperOctreeSurfaceFilter.h 2013-09-24 10:05:16.681259100 +0200 *************** *** 52,58 **** // Description: // Return the MTime also considering the locator. ! unsigned long GetMTime(); // Description: // If on, the output polygonal dataset will have a celldata array that --- 52,58 ---- // Description: // Return the MTime also considering the locator. ! vtkTimeStamp GetMTime(); // Description: // If on, the output polygonal dataset will have a celldata array that diff -crB VTK/Graphics/vtkImageMarchingCubes.cxx VTKNew/Graphics/vtkImageMarchingCubes.cxx *** VTK/Graphics/vtkImageMarchingCubes.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkImageMarchingCubes.cxx 2013-09-24 10:05:15.939216700 +0200 *************** *** 52,61 **** // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkImageMarchingCubes::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long contourValuesMTime=this->ContourValues->GetMTime(); mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); --- 52,61 ---- // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkImageMarchingCubes::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp contourValuesMTime=this->ContourValues->GetMTime(); mTime = ( contourValuesMTime > mTime ? contourValuesMTime : mTime ); diff -crB VTK/Graphics/vtkImageMarchingCubes.h VTKNew/Graphics/vtkImageMarchingCubes.h *** VTK/Graphics/vtkImageMarchingCubes.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkImageMarchingCubes.h 2013-09-24 10:05:16.639256700 +0200 *************** *** 63,69 **** // Description: // Because we delegate to vtkContourValues & refer to vtkImplicitFunction ! unsigned long int GetMTime(); // Description: // Set/Get the computation of scalars. --- 63,69 ---- // Description: // Because we delegate to vtkContourValues & refer to vtkImplicitFunction ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of scalars. diff -crB VTK/Graphics/vtkImplicitPolyDataDistance.cxx VTKNew/Graphics/vtkImplicitPolyDataDistance.cxx *** VTK/Graphics/vtkImplicitPolyDataDistance.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkImplicitPolyDataDistance.cxx 2013-09-24 10:05:15.932216300 +0200 *************** *** 76,85 **** } //----------------------------------------------------------------------------- ! unsigned long vtkImplicitPolyDataDistance::GetMTime() { ! unsigned long mTime=this->vtkImplicitFunction::GetMTime(); ! unsigned long InputMTime; if ( this->Input != NULL ) { --- 76,85 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkImplicitPolyDataDistance::GetMTime() { ! vtkTimeStamp mTime=this->vtkImplicitFunction::GetMTime(); ! vtkTimeStamp InputMTime; if ( this->Input != NULL ) { diff -crB VTK/Graphics/vtkImplicitPolyDataDistance.h VTKNew/Graphics/vtkImplicitPolyDataDistance.h *** VTK/Graphics/vtkImplicitPolyDataDistance.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkImplicitPolyDataDistance.h 2013-09-24 10:05:17.175287400 +0200 *************** *** 51,57 **** // Description: // Return the MTime also considering the Input dependency. ! unsigned long GetMTime(); // Description: // Evaluate plane equation of nearest triangle to point x[3]. --- 51,57 ---- // Description: // Return the MTime also considering the Input dependency. ! vtkTimeStamp GetMTime(); // Description: // Evaluate plane equation of nearest triangle to point x[3]. diff -crB VTK/Graphics/vtkKdTreeSelector.cxx VTKNew/Graphics/vtkKdTreeSelector.cxx *** VTK/Graphics/vtkKdTreeSelector.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkKdTreeSelector.cxx 2013-09-24 10:05:15.925215900 +0200 *************** *** 105,116 **** } } ! unsigned long vtkKdTreeSelector::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); if (this->KdTree != NULL) { ! unsigned long time = this->KdTree->GetMTime(); mTime = (time > mTime ? time : mTime); } return mTime; --- 105,116 ---- } } ! vtkTimeStamp vtkKdTreeSelector::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); if (this->KdTree != NULL) { ! vtkTimeStamp time = this->KdTree->GetMTime(); mTime = (time > mTime ? time : mTime); } return mTime; diff -crB VTK/Graphics/vtkKdTreeSelector.h VTKNew/Graphics/vtkKdTreeSelector.h *** VTK/Graphics/vtkKdTreeSelector.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkKdTreeSelector.h 2013-09-24 10:05:16.619255600 +0200 *************** *** 88,94 **** vtkSetMacro(SingleSelectionThreshold, double); vtkGetMacro(SingleSelectionThreshold, double); ! unsigned long GetMTime(); protected: vtkKdTreeSelector(); --- 88,94 ---- vtkSetMacro(SingleSelectionThreshold, double); vtkGetMacro(SingleSelectionThreshold, double); ! vtkTimeStamp GetMTime(); protected: vtkKdTreeSelector(); diff -crB VTK/Graphics/vtkMarchingContourFilter.cxx VTKNew/Graphics/vtkMarchingContourFilter.cxx *** VTK/Graphics/vtkMarchingContourFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkMarchingContourFilter.cxx 2013-09-24 10:05:15.919215600 +0200 *************** *** 67,76 **** // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkMarchingContourFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if (this->ContourValues) { --- 67,76 ---- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkMarchingContourFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->ContourValues) { diff -crB VTK/Graphics/vtkMarchingContourFilter.h VTKNew/Graphics/vtkMarchingContourFilter.h *** VTK/Graphics/vtkMarchingContourFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkMarchingContourFilter.h 2013-09-24 10:05:16.600254500 +0200 *************** *** 82,88 **** // Description: // Modified GetMTime Because we delegate to vtkContourValues ! unsigned long GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 82,88 ---- // Description: // Modified GetMTime Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/Graphics/vtkMarchingCubes.cxx VTKNew/Graphics/vtkMarchingCubes.cxx *** VTK/Graphics/vtkMarchingCubes.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkMarchingCubes.cxx 2013-09-24 10:05:15.913215200 +0200 *************** *** 64,73 **** // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkMarchingCubes::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); if (this->Locator) --- 64,73 ---- // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkMarchingCubes::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); if (this->Locator) diff -crB VTK/Graphics/vtkMarchingCubes.h VTKNew/Graphics/vtkMarchingCubes.h *** VTK/Graphics/vtkMarchingCubes.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkMarchingCubes.h 2013-09-24 10:05:17.194288500 +0200 *************** *** 54,60 **** void GenerateValues(int numContours, double rangeStart, double rangeEnd); // Because we delegate to vtkContourValues ! unsigned long int GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 54,60 ---- void GenerateValues(int numContours, double rangeStart, double rangeEnd); // Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/Graphics/vtkMarchingSquares.cxx VTKNew/Graphics/vtkMarchingSquares.cxx *** VTK/Graphics/vtkMarchingSquares.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkMarchingSquares.cxx 2013-09-24 10:05:15.906214800 +0200 *************** *** 81,90 **** // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkMarchingSquares::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); if (this->Locator) --- 81,90 ---- // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkMarchingSquares::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); if (this->Locator) diff -crB VTK/Graphics/vtkMarchingSquares.h VTKNew/Graphics/vtkMarchingSquares.h *** VTK/Graphics/vtkMarchingSquares.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkMarchingSquares.h 2013-09-24 10:05:16.573253000 +0200 *************** *** 73,79 **** // Description: // Because we delegate to vtkContourValues ! unsigned long int GetMTime(); void SetLocator(vtkIncrementalPointLocator *locator); vtkGetObjectMacro(Locator,vtkIncrementalPointLocator); --- 73,79 ---- // Description: // Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); void SetLocator(vtkIncrementalPointLocator *locator); vtkGetObjectMacro(Locator,vtkIncrementalPointLocator); diff -crB VTK/Graphics/vtkParametricFunctionSource.cxx VTKNew/Graphics/vtkParametricFunctionSource.cxx *** VTK/Graphics/vtkParametricFunctionSource.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkParametricFunctionSource.cxx 2013-09-24 10:05:15.900214500 +0200 *************** *** 594,603 **** */ //---------------------------------------------------------------------------- ! unsigned long vtkParametricFunctionSource::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long funcMTime; if ( this->ParametricFunction != NULL ) { --- 594,603 ---- */ //---------------------------------------------------------------------------- ! vtkTimeStamp vtkParametricFunctionSource::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp funcMTime; if ( this->ParametricFunction != NULL ) { diff -crB VTK/Graphics/vtkParametricFunctionSource.h VTKNew/Graphics/vtkParametricFunctionSource.h *** VTK/Graphics/vtkParametricFunctionSource.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkParametricFunctionSource.h 2013-09-24 10:05:16.553251800 +0200 *************** *** 157,163 **** // Description: // Return the MTime also considering the parametric function. ! unsigned long GetMTime(); protected: vtkParametricFunctionSource(); --- 157,163 ---- // Description: // Return the MTime also considering the parametric function. ! vtkTimeStamp GetMTime(); protected: vtkParametricFunctionSource(); diff -crB VTK/Graphics/vtkRectilinearSynchronizedTemplates.cxx VTKNew/Graphics/vtkRectilinearSynchronizedTemplates.cxx *** VTK/Graphics/vtkRectilinearSynchronizedTemplates.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkRectilinearSynchronizedTemplates.cxx 2013-09-24 10:05:15.892214000 +0200 *************** *** 73,82 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkRectilinearSynchronizedTemplates::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; --- 73,82 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkRectilinearSynchronizedTemplates::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; diff -crB VTK/Graphics/vtkRectilinearSynchronizedTemplates.h VTKNew/Graphics/vtkRectilinearSynchronizedTemplates.h *** VTK/Graphics/vtkRectilinearSynchronizedTemplates.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkRectilinearSynchronizedTemplates.h 2013-09-24 10:05:17.322295800 +0200 *************** *** 45,51 **** // Description: // Because we delegate to vtkContourValues ! unsigned long int GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 45,51 ---- // Description: // Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/Graphics/vtkResliceCursor.cxx VTKNew/Graphics/vtkResliceCursor.cxx *** VTK/Graphics/vtkResliceCursor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkResliceCursor.cxx 2013-09-24 10:05:15.886213700 +0200 *************** *** 581,592 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkResliceCursor::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); for (int i = 0; i < 3; i++) { ! unsigned long time = this->GetPlane(i)->GetMTime(); if (time > mTime) { mTime = time; --- 581,592 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkResliceCursor::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); for (int i = 0; i < 3; i++) { ! vtkTimeStamp time = this->GetPlane(i)->GetMTime(); if (time > mTime) { mTime = time; diff -crB VTK/Graphics/vtkResliceCursor.h VTKNew/Graphics/vtkResliceCursor.h *** VTK/Graphics/vtkResliceCursor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkResliceCursor.h 2013-09-24 10:05:16.511249400 +0200 *************** *** 117,123 **** // Description: // Get the MTime. Check the MTime of the internal planes as well. ! virtual unsigned long int GetMTime(); // Description: // Reset the cursor to the default position, ie with the axes, normal --- 117,123 ---- // Description: // Get the MTime. Check the MTime of the internal planes as well. ! virtual vtkTimeStamp GetMTime(); // Description: // Reset the cursor to the default position, ie with the axes, normal diff -crB VTK/Graphics/vtkResliceCursorPolyDataAlgorithm.cxx VTKNew/Graphics/vtkResliceCursorPolyDataAlgorithm.cxx *** VTK/Graphics/vtkResliceCursorPolyDataAlgorithm.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkResliceCursorPolyDataAlgorithm.cxx 2013-09-24 10:05:15.879213300 +0200 *************** *** 313,324 **** } //------------------------------------------------------------------------- ! unsigned long int vtkResliceCursorPolyDataAlgorithm::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); if (this->ResliceCursor) { ! unsigned long time; time = this->ResliceCursor->GetMTime(); if (time > mTime) { --- 313,324 ---- } //------------------------------------------------------------------------- ! vtkTimeStamp vtkResliceCursorPolyDataAlgorithm::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); if (this->ResliceCursor) { ! vtkTimeStamp time; time = this->ResliceCursor->GetMTime(); if (time > mTime) { diff -crB VTK/Graphics/vtkResliceCursorPolyDataAlgorithm.h VTKNew/Graphics/vtkResliceCursorPolyDataAlgorithm.h *** VTK/Graphics/vtkResliceCursorPolyDataAlgorithm.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkResliceCursorPolyDataAlgorithm.h 2013-09-24 10:05:16.490248200 +0200 *************** *** 100,106 **** // Description: // Get the MTime. Check the MTime of the internal ResliceCursor as well, if // one has been set ! virtual unsigned long int GetMTime(); protected: vtkResliceCursorPolyDataAlgorithm(); --- 100,106 ---- // Description: // Get the MTime. Check the MTime of the internal ResliceCursor as well, if // one has been set ! virtual vtkTimeStamp GetMTime(); protected: vtkResliceCursorPolyDataAlgorithm(); diff -crB VTK/Graphics/vtkSelectPolyData.cxx VTKNew/Graphics/vtkSelectPolyData.cxx *** VTK/Graphics/vtkSelectPolyData.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkSelectPolyData.cxx 2013-09-24 10:05:15.872212900 +0200 *************** *** 600,609 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkSelectPolyData::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Loop != NULL ) { --- 600,609 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkSelectPolyData::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Loop != NULL ) { diff -crB VTK/Graphics/vtkSelectPolyData.h VTKNew/Graphics/vtkSelectPolyData.h *** VTK/Graphics/vtkSelectPolyData.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkSelectPolyData.h 2013-09-24 10:05:16.470247100 +0200 *************** *** 149,155 **** vtkPolyData *GetSelectionEdges(); // Overload GetMTime() because we depend on Loop ! unsigned long int GetMTime(); protected: vtkSelectPolyData(); --- 149,155 ---- vtkPolyData *GetSelectionEdges(); // Overload GetMTime() because we depend on Loop ! vtkTimeStamp GetMTime(); protected: vtkSelectPolyData(); diff -crB VTK/Graphics/vtkSynchronizedTemplates2D.cxx VTKNew/Graphics/vtkSynchronizedTemplates2D.cxx *** VTK/Graphics/vtkSynchronizedTemplates2D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkSynchronizedTemplates2D.cxx 2013-09-24 10:05:15.865212500 +0200 *************** *** 62,71 **** // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkSynchronizedTemplates2D::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; --- 62,71 ---- // Description: // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkSynchronizedTemplates2D::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; diff -crB VTK/Graphics/vtkSynchronizedTemplates2D.h VTKNew/Graphics/vtkSynchronizedTemplates2D.h *** VTK/Graphics/vtkSynchronizedTemplates2D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkSynchronizedTemplates2D.h 2013-09-24 10:05:17.301294600 +0200 *************** *** 42,48 **** // Description: // Because we delegate to vtkContourValues ! unsigned long int GetMTime(); // Description: // Set a particular contour value at contour number i. The index i ranges --- 42,48 ---- // Description: // Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set a particular contour value at contour number i. The index i ranges diff -crB VTK/Graphics/vtkSynchronizedTemplates3D.cxx VTKNew/Graphics/vtkSynchronizedTemplates3D.cxx *** VTK/Graphics/vtkSynchronizedTemplates3D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkSynchronizedTemplates3D.cxx 2013-09-24 10:05:15.859212100 +0200 *************** *** 71,80 **** //---------------------------------------------------------------------------- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! unsigned long vtkSynchronizedTemplates3D::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; --- 71,80 ---- //---------------------------------------------------------------------------- // Overload standard modified time function. If contour values are modified, // then this object is modified as well. ! vtkTimeStamp vtkSynchronizedTemplates3D::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2=this->ContourValues->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); return mTime; diff -crB VTK/Graphics/vtkSynchronizedTemplates3D.h VTKNew/Graphics/vtkSynchronizedTemplates3D.h *** VTK/Graphics/vtkSynchronizedTemplates3D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkSynchronizedTemplates3D.h 2013-09-24 10:05:17.277293200 +0200 *************** *** 43,49 **** // Description: // Because we delegate to vtkContourValues ! unsigned long int GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly --- 43,49 ---- // Description: // Because we delegate to vtkContourValues ! vtkTimeStamp GetMTime(); // Description: // Set/Get the computation of normals. Normal computation is fairly diff -crB VTK/Graphics/vtkTableBasedClipDataSet.cxx VTKNew/Graphics/vtkTableBasedClipDataSet.cxx *** VTK/Graphics/vtkTableBasedClipDataSet.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTableBasedClipDataSet.cxx 2013-09-24 10:05:15.852211700 +0200 *************** *** 1640,1649 **** } //----------------------------------------------------------------------------- ! unsigned long vtkTableBasedClipDataSet::GetMTime() { ! unsigned long time; ! unsigned long mTime = this->Superclass::GetMTime(); if ( this->ClipFunction != NULL ) { --- 1640,1649 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkTableBasedClipDataSet::GetMTime() { ! vtkTimeStamp time; ! vtkTimeStamp mTime = this->Superclass::GetMTime(); if ( this->ClipFunction != NULL ) { diff -crB VTK/Graphics/vtkTableBasedClipDataSet.h VTKNew/Graphics/vtkTableBasedClipDataSet.h *** VTK/Graphics/vtkTableBasedClipDataSet.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTableBasedClipDataSet.h 2013-09-24 10:05:16.449245900 +0200 *************** *** 110,116 **** // Description: // Get the MTime for which the point locator and clip function are consdiered. ! unsigned long GetMTime(); // Description: // Set/Get the InsideOut flag. With this flag off, a vertex is considered --- 110,116 ---- // Description: // Get the MTime for which the point locator and clip function are consdiered. ! vtkTimeStamp GetMTime(); // Description: // Set/Get the InsideOut flag. With this flag off, a vertex is considered diff -crB VTK/Graphics/vtkTessellatorFilter.cxx VTKNew/Graphics/vtkTessellatorFilter.cxx *** VTK/Graphics/vtkTessellatorFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTessellatorFilter.cxx 2013-09-24 10:05:15.846211400 +0200 *************** *** 264,273 **** } // override for proper Update() behavior ! unsigned long vtkTessellatorFilter::GetMTime() { ! unsigned long mt = this->MTime; ! unsigned long tmp; if ( this->Tessellator ) { --- 264,273 ---- } // override for proper Update() behavior ! vtkTimeStamp vtkTessellatorFilter::GetMTime() { ! vtkTimeStamp mt = this->MTime; ! vtkTimeStamp tmp; if ( this->Tessellator ) { diff -crB VTK/Graphics/vtkTessellatorFilter.h VTKNew/Graphics/vtkTessellatorFilter.h *** VTK/Graphics/vtkTessellatorFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTessellatorFilter.h 2013-09-24 10:05:16.427244600 +0200 *************** *** 77,83 **** virtual void SetSubdivider( vtkDataSetEdgeSubdivisionCriterion* ); vtkGetObjectMacro(Subdivider, vtkDataSetEdgeSubdivisionCriterion); ! virtual unsigned long GetMTime(); // Description: // Set the dimension of the output tessellation. --- 77,83 ---- virtual void SetSubdivider( vtkDataSetEdgeSubdivisionCriterion* ); vtkGetObjectMacro(Subdivider, vtkDataSetEdgeSubdivisionCriterion); ! virtual vtkTimeStamp GetMTime(); // Description: // Set the dimension of the output tessellation. diff -crB VTK/Graphics/vtkTransformCoordinateSystems.cxx VTKNew/Graphics/vtkTransformCoordinateSystems.cxx *** VTK/Graphics/vtkTransformCoordinateSystems.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTransformCoordinateSystems.cxx 2013-09-24 10:05:15.839211000 +0200 *************** *** 152,161 **** } //------------------------------------------------------------------------ ! unsigned long vtkTransformCoordinateSystems::GetMTime() { ! unsigned long mTime=this->MTime.GetMTime(); ! unsigned long viewMTime; if ( this->Viewport ) { --- 152,161 ---- } //------------------------------------------------------------------------ ! vtkTimeStamp vtkTransformCoordinateSystems::GetMTime() { ! vtkTimeStamp mTime=this->MTime.GetMTime(); ! vtkTimeStamp viewMTime; if ( this->Viewport ) { diff -crB VTK/Graphics/vtkTransformCoordinateSystems.h VTKNew/Graphics/vtkTransformCoordinateSystems.h *** VTK/Graphics/vtkTransformCoordinateSystems.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTransformCoordinateSystems.h 2013-09-24 10:05:16.407243500 +0200 *************** *** 69,75 **** // Description: // Return the MTime also considering the instance of vtkCoordinate. ! unsigned long GetMTime(); // Description: // In order for successful coordinate transformation to occur, an --- 69,75 ---- // Description: // Return the MTime also considering the instance of vtkCoordinate. ! vtkTimeStamp GetMTime(); // Description: // In order for successful coordinate transformation to occur, an diff -crB VTK/Graphics/vtkTransformFilter.cxx VTKNew/Graphics/vtkTransformFilter.cxx *** VTK/Graphics/vtkTransformFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTransformFilter.cxx 2013-09-24 10:05:15.834210700 +0200 *************** *** 270,279 **** return 1; } ! unsigned long vtkTransformFilter::GetMTime() { ! unsigned long mTime=this->MTime.GetMTime(); ! unsigned long transMTime; if ( this->Transform ) { --- 270,279 ---- return 1; } ! vtkTimeStamp vtkTransformFilter::GetMTime() { ! vtkTimeStamp mTime=this->MTime.GetMTime(); ! vtkTimeStamp transMTime; if ( this->Transform ) { diff -crB VTK/Graphics/vtkTransformFilter.h VTKNew/Graphics/vtkTransformFilter.h *** VTK/Graphics/vtkTransformFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTransformFilter.h 2013-09-24 09:25:48.198789700 +0200 *************** *** 45,51 **** // Description: // Return the MTime also considering the transform. ! unsigned long GetMTime(); // Description: // Specify the transform object used to transform points. --- 45,51 ---- // Description: // Return the MTime also considering the transform. ! vtkTimeStamp GetMTime(); // Description: // Specify the transform object used to transform points. diff -crB VTK/Graphics/vtkTransformPolyDataFilter.cxx VTKNew/Graphics/vtkTransformPolyDataFilter.cxx *** VTK/Graphics/vtkTransformPolyDataFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTransformPolyDataFilter.cxx 2013-09-24 10:05:15.828210400 +0200 *************** *** 191,200 **** return 1; } ! unsigned long vtkTransformPolyDataFilter::GetMTime() { ! unsigned long mTime=this->MTime.GetMTime(); ! unsigned long transMTime; if ( this->Transform ) { --- 191,200 ---- return 1; } ! vtkTimeStamp vtkTransformPolyDataFilter::GetMTime() { ! vtkTimeStamp mTime=this->MTime.GetMTime(); ! vtkTimeStamp transMTime; if ( this->Transform ) { diff -crB VTK/Graphics/vtkTransformPolyDataFilter.h VTKNew/Graphics/vtkTransformPolyDataFilter.h *** VTK/Graphics/vtkTransformPolyDataFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkTransformPolyDataFilter.h 2013-09-24 10:05:16.386242300 +0200 *************** *** 47,53 **** // Description: // Return the MTime also considering the transform. ! unsigned long GetMTime(); // Description: // Specify the transform object used to transform points. --- 47,53 ---- // Description: // Return the MTime also considering the transform. ! vtkTimeStamp GetMTime(); // Description: // Specify the transform object used to transform points. diff -crB VTK/Graphics/vtkUnstructuredGridGeometryFilter.cxx VTKNew/Graphics/vtkUnstructuredGridGeometryFilter.cxx *** VTK/Graphics/vtkUnstructuredGridGeometryFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkUnstructuredGridGeometryFilter.cxx 2013-09-24 10:05:15.824210100 +0200 *************** *** 1566,1575 **** } //----------------------------------------------------------------------------- ! unsigned long int vtkUnstructuredGridGeometryFilter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 1566,1575 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkUnstructuredGridGeometryFilter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/Graphics/vtkUnstructuredGridGeometryFilter.h VTKNew/Graphics/vtkUnstructuredGridGeometryFilter.h *** VTK/Graphics/vtkUnstructuredGridGeometryFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Graphics/vtkUnstructuredGridGeometryFilter.h 2013-09-24 10:05:17.256292000 +0200 *************** *** 148,154 **** // Description: // Return the MTime also considering the locator. ! unsigned long GetMTime(); protected: vtkUnstructuredGridGeometryFilter(); --- 148,154 ---- // Description: // Return the MTime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkUnstructuredGridGeometryFilter(); diff -crB VTK/GUISupport/Qt/vtkQtAnnotationView.cxx VTKNew/GUISupport/Qt/vtkQtAnnotationView.cxx *** VTK/GUISupport/Qt/vtkQtAnnotationView.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtAnnotationView.cxx 2013-09-24 12:05:54.697250000 +0200 *************** *** 68,76 **** this->View->setAcceptDrops(true); this->View->setDropIndicatorShown(true); this->View->horizontalHeader()->show(); ! ! this->LastInputMTime = 0; ! QObject::connect(this->View->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), this, --- 68,74 ---- this->View->setAcceptDrops(true); this->View->setDropIndicatorShown(true); this->View->horizontalHeader()->show(); ! QObject::connect(this->View->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), this, diff -crB VTK/GUISupport/Qt/vtkQtAnnotationView.h VTKNew/GUISupport/Qt/vtkQtAnnotationView.h *** VTK/GUISupport/Qt/vtkQtAnnotationView.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtAnnotationView.h 2013-09-24 12:01:58.800757500 +0200 *************** *** 66,72 **** void slotQtSelectionChanged(const QItemSelection&,const QItemSelection&); private: ! unsigned long LastInputMTime; QPointer View; vtkQtAnnotationLayersModelAdapter* Adapter; --- 66,72 ---- void slotQtSelectionChanged(const QItemSelection&,const QItemSelection&); private: ! vtkTimeStamp LastInputMTime; QPointer View; vtkQtAnnotationLayersModelAdapter* Adapter; diff -crB VTK/GUISupport/Qt/vtkQtListView.cxx VTKNew/GUISupport/Qt/vtkQtListView.cxx *** VTK/GUISupport/Qt/vtkQtListView.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtListView.cxx 2013-09-24 12:05:54.693249800 +0200 *************** *** 77,85 **** this->ListView->setSelectionMode(QAbstractItemView::ExtendedSelection); this->ListView->setSelectionBehavior(QAbstractItemView::SelectRows); - this->LastSelectionMTime = 0; - this->LastInputMTime = 0; - this->LastMTime = 0; this->ApplyRowColors = false; this->VisibleColumn = 0; this->TableAdapter->SetDecorationStrategy(vtkQtTableModelAdapter::NONE); --- 77,82 ---- *************** *** 319,325 **** selConn->GetProducer()->Update(); vtkDataObject *d = conn->GetProducer()->GetOutputDataObject(0); ! unsigned long atime = rep->GetAnnotationLink()->GetMTime(); if (d->GetMTime() > this->LastInputMTime || this->GetMTime() > this->LastMTime || atime > this->LastSelectionMTime) --- 316,322 ---- selConn->GetProducer()->Update(); vtkDataObject *d = conn->GetProducer()->GetOutputDataObject(0); ! vtkTimeStamp atime = rep->GetAnnotationLink()->GetMTime(); if (d->GetMTime() > this->LastInputMTime || this->GetMTime() > this->LastMTime || atime > this->LastSelectionMTime) diff -crB VTK/GUISupport/Qt/vtkQtListView.h VTKNew/GUISupport/Qt/vtkQtListView.h *** VTK/GUISupport/Qt/vtkQtListView.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtListView.h 2013-09-24 12:01:58.779756300 +0200 *************** *** 136,144 **** private: void SetVTKSelection(); ! unsigned long LastSelectionMTime; ! unsigned long LastInputMTime; ! unsigned long LastMTime; vtkSetStringMacro(ColorArrayNameInternal); vtkGetStringMacro(ColorArrayNameInternal); --- 136,144 ---- private: void SetVTKSelection(); ! vtkTimeStamp LastSelectionMTime; ! vtkTimeStamp LastInputMTime; ! vtkTimeStamp LastMTime; vtkSetStringMacro(ColorArrayNameInternal); vtkGetStringMacro(ColorArrayNameInternal); diff -crB VTK/GUISupport/Qt/vtkQtRecordView.cxx VTKNew/GUISupport/Qt/vtkQtRecordView.cxx *** VTK/GUISupport/Qt/vtkQtRecordView.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtRecordView.cxx 2013-09-24 12:26:24.378583700 +0200 *************** *** 47,55 **** this->DataObjectToTable->SetFieldType(vtkDataObjectToTable::VERTEX_DATA); this->FieldType = vtkQtRecordView::VERTEX_DATA; this->Text = NULL; - this->CurrentSelectionMTime = 0; - this->LastInputMTime = 0; - this->LastMTime = 0; } //---------------------------------------------------------------------------- --- 47,52 ---- diff -crB VTK/GUISupport/Qt/vtkQtRecordView.h VTKNew/GUISupport/Qt/vtkQtRecordView.h *** VTK/GUISupport/Qt/vtkQtRecordView.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtRecordView.h 2013-09-24 12:05:54.604244700 +0200 *************** *** 99,107 **** vtkQtRecordView(const vtkQtRecordView&); // Not implemented. void operator=(const vtkQtRecordView&); // Not implemented. ! unsigned long CurrentSelectionMTime; ! unsigned long LastInputMTime; ! unsigned long LastMTime; }; #endif --- 99,107 ---- vtkQtRecordView(const vtkQtRecordView&); // Not implemented. void operator=(const vtkQtRecordView&); // Not implemented. ! vtkTimeStamp CurrentSelectionMTime; ! vtkTimeStamp LastInputMTime; ! vtkTimeStamp LastMTime; }; #endif diff -crB VTK/GUISupport/Qt/vtkQtTableView.cxx VTKNew/GUISupport/Qt/vtkQtTableView.cxx *** VTK/GUISupport/Qt/vtkQtTableView.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtTableView.cxx 2013-09-24 12:05:54.687249400 +0200 *************** *** 77,85 **** this->TableView->setSortingEnabled(true); this->TableView->resizeColumnToContents(0); this->TableView->verticalHeader()->setDefaultSectionSize(25); - this->LastSelectionMTime = 0; - this->LastInputMTime = 0; - this->LastMTime = 0; this->ShowAll = true; this->ColumnName = 0; this->InSelectionChanged = false; --- 77,82 ---- *************** *** 436,442 **** annConn = rep->GetInternalAnnotationOutputPort(); selConn = rep->GetInternalSelectionOutputPort(); vtkDataObject *d = conn->GetProducer()->GetOutputDataObject(0); ! unsigned long atime = rep->GetAnnotationLink()->GetMTime(); if (d->GetMTime() > this->LastInputMTime || this->GetMTime() > this->LastMTime || atime > this->LastSelectionMTime) --- 433,439 ---- annConn = rep->GetInternalAnnotationOutputPort(); selConn = rep->GetInternalSelectionOutputPort(); vtkDataObject *d = conn->GetProducer()->GetOutputDataObject(0); ! vtkTimeStamp atime = rep->GetAnnotationLink()->GetMTime(); if (d->GetMTime() > this->LastInputMTime || this->GetMTime() > this->LastMTime || atime > this->LastSelectionMTime) diff -crB VTK/GUISupport/Qt/vtkQtTableView.h VTKNew/GUISupport/Qt/vtkQtTableView.h *** VTK/GUISupport/Qt/vtkQtTableView.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtTableView.h 2013-09-24 12:01:58.757755000 +0200 *************** *** 188,196 **** private: void SetVTKSelection(); ! unsigned long LastSelectionMTime; ! unsigned long LastInputMTime; ! unsigned long LastMTime; vtkSetStringMacro(ColorArrayNameInternal); vtkGetStringMacro(ColorArrayNameInternal); --- 188,196 ---- private: void SetVTKSelection(); ! vtkTimeStamp LastSelectionMTime; ! vtkTimeStamp LastInputMTime; ! vtkTimeStamp LastMTime; vtkSetStringMacro(ColorArrayNameInternal); vtkGetStringMacro(ColorArrayNameInternal); diff -crB VTK/GUISupport/Qt/vtkQtTreeModelAdapter.cxx VTKNew/GUISupport/Qt/vtkQtTreeModelAdapter.cxx *** VTK/GUISupport/Qt/vtkQtTreeModelAdapter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtTreeModelAdapter.cxx 2013-09-24 12:05:54.702250300 +0200 *************** *** 51,57 **** vtkQtTreeModelAdapter::vtkQtTreeModelAdapter(QObject* p, vtkTree* t) : vtkQtAbstractModelAdapter(p) { - this->TreeMTime = 0; this->Tree = 0; this->setTree(t); this->ChildIterator = vtkAdjacentVertexIterator::New(); --- 51,56 ---- *************** *** 124,130 **** return this->Tree; } ! unsigned long vtkQtTreeModelAdapter::GetVTKDataObjectMTime() const { return this->TreeMTime; } --- 123,129 ---- return this->Tree; } ! vtkTimeStamp vtkQtTreeModelAdapter::GetVTKDataObjectMTime() const { return this->TreeMTime; } diff -crB VTK/GUISupport/Qt/vtkQtTreeModelAdapter.h VTKNew/GUISupport/Qt/vtkQtTreeModelAdapter.h *** VTK/GUISupport/Qt/vtkQtTreeModelAdapter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtTreeModelAdapter.h 2013-09-24 12:05:54.660247900 +0200 *************** *** 61,67 **** // time of the object when it was placed into the Qt model adapter. // You can use this mtime as part of the checking to see whether // you need to update the the adapter by call SetVTKDataObject again. :) ! unsigned long GetVTKDataObjectMTime() const; // Description: // Selection conversion from VTK land to Qt land --- 61,67 ---- // time of the object when it was placed into the Qt model adapter. // You can use this mtime as part of the checking to see whether // you need to update the the adapter by call SetVTKDataObject again. :) ! vtkTimeStamp GetVTKDataObjectMTime() const; // Description: // Selection conversion from VTK land to Qt land *************** *** 104,110 **** vtkTree* Tree; vtkAdjacentVertexIterator* ChildIterator; ! unsigned long TreeMTime; QVector VTKIndexToQtModelIndex; QHash IndexToDecoration; --- 104,110 ---- vtkTree* Tree; vtkAdjacentVertexIterator* ChildIterator; ! vtkTimeStamp TreeMTime; QVector VTKIndexToQtModelIndex; QHash IndexToDecoration; diff -crB VTK/GUISupport/Qt/vtkQtTreeView.cxx VTKNew/GUISupport/Qt/vtkQtTreeView.cxx *** VTK/GUISupport/Qt/vtkQtTreeView.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtTreeView.cxx 2013-09-24 12:26:29.197859400 +0200 *************** *** 82,94 **** this->SetUseColumnView(false); this->SetAlternatingRowColors(false); this->SetShowRootNode(false); - this->CurrentSelectionMTime = 0; this->ColorArrayNameInternal = 0; double defCol[3] = {0.827,0.827,0.827}; this->ApplyColors->SetDefaultPointColor(defCol); this->ApplyColors->SetUseCurrentAnnotationColor(true); - this->LastInputMTime = 0; - // Drag/Drop parameters - defaults to off this->TreeView->setDragEnabled(false); --- 82,91 ---- *************** *** 468,474 **** this->LastInputMTime = tree->GetMTime(); } ! unsigned long atime = rep->GetAnnotationLink()->GetMTime(); if (atime > this->CurrentSelectionMTime) { this->SetVTKSelection(); --- 465,471 ---- this->LastInputMTime = tree->GetMTime(); } ! vtkTimeStamp atime = rep->GetAnnotationLink()->GetMTime(); if (atime > this->CurrentSelectionMTime) { this->SetVTKSelection(); diff -crB VTK/GUISupport/Qt/vtkQtTreeView.h VTKNew/GUISupport/Qt/vtkQtTreeView.h *** VTK/GUISupport/Qt/vtkQtTreeView.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/GUISupport/Qt/vtkQtTreeView.h 2013-09-24 12:23:47.530612500 +0200 *************** *** 172,179 **** private: void SetVTKSelection(); ! unsigned long CurrentSelectionMTime; ! unsigned long LastInputMTime; vtkSetStringMacro(ColorArrayNameInternal); vtkGetStringMacro(ColorArrayNameInternal); --- 172,179 ---- private: void SetVTKSelection(); ! vtkTimeStamp CurrentSelectionMTime; ! vtkTimeStamp LastInputMTime; vtkSetStringMacro(ColorArrayNameInternal); vtkGetStringMacro(ColorArrayNameInternal); diff -crB VTK/Hybrid/vtkAnnotatedCubeActor.cxx VTKNew/Hybrid/vtkAnnotatedCubeActor.cxx *** VTK/Hybrid/vtkAnnotatedCubeActor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkAnnotatedCubeActor.cxx 2013-09-24 11:34:44.782297000 +0200 *************** *** 327,333 **** } //------------------------------------------------------------------------- ! unsigned long int vtkAnnotatedCubeActor::GetMTime() { return this->Assembly->GetMTime(); } --- 327,333 ---- } //------------------------------------------------------------------------- ! vtkTimeStamp vtkAnnotatedCubeActor::GetMTime() { return this->Assembly->GetMTime(); } diff -crB VTK/Hybrid/vtkAnnotatedCubeActor.h VTKNew/Hybrid/vtkAnnotatedCubeActor.h *** VTK/Hybrid/vtkAnnotatedCubeActor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkAnnotatedCubeActor.h 2013-09-24 10:55:00.474922400 +0200 *************** *** 90,96 **** // Description: // Get the actors mtime plus consider its properties and texture if set. ! unsigned long int GetMTime(); // Description: // Set/Get the scale factor for the face text --- 90,96 ---- // Description: // Get the actors mtime plus consider its properties and texture if set. ! vtkTimeStamp GetMTime(); // Description: // Set/Get the scale factor for the face text diff -crB VTK/Hybrid/vtkArcPlotter.cxx VTKNew/Hybrid/vtkArcPlotter.cxx *** VTK/Hybrid/vtkArcPlotter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkArcPlotter.cxx 2013-09-24 10:54:59.773882300 +0200 *************** *** 379,388 **** return newPts->InsertNextPoint(xNew); } ! unsigned long vtkArcPlotter::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long cameraMTime; if ( this->Camera && ! this->UseDefaultNormal ) { --- 379,388 ---- return newPts->InsertNextPoint(xNew); } ! vtkTimeStamp vtkArcPlotter::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp cameraMTime; if ( this->Camera && ! this->UseDefaultNormal ) { diff -crB VTK/Hybrid/vtkArcPlotter.h VTKNew/Hybrid/vtkArcPlotter.h *** VTK/Hybrid/vtkArcPlotter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkArcPlotter.h 2013-09-24 10:55:00.323913700 +0200 *************** *** 129,135 **** // Description: // New GetMTime because of camera dependency. ! unsigned long GetMTime(); protected: vtkArcPlotter(); --- 129,135 ---- // Description: // New GetMTime because of camera dependency. ! vtkTimeStamp GetMTime(); protected: vtkArcPlotter(); diff -crB VTK/Hybrid/vtkAxesActor.cxx VTKNew/Hybrid/vtkAxesActor.cxx *** VTK/Hybrid/vtkAxesActor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkAxesActor.cxx 2013-09-24 10:54:59.765881800 +0200 *************** *** 405,420 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkAxesActor::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); return mTime; } //---------------------------------------------------------------------------- ! unsigned long int vtkAxesActor::GetRedrawMTime() { ! unsigned long mTime = this->GetMTime(); return mTime; } --- 405,420 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkAxesActor::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); return mTime; } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkAxesActor::GetRedrawMTime() { ! vtkTimeStamp mTime = this->GetMTime(); return mTime; } diff -crB VTK/Hybrid/vtkAxesActor.h VTKNew/Hybrid/vtkAxesActor.h *** VTK/Hybrid/vtkAxesActor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkAxesActor.h 2013-09-24 10:55:00.172905100 +0200 *************** *** 99,112 **** // Description: // Get the actors mtime plus consider its properties and texture if set. ! unsigned long int GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, textures // etc. ! virtual unsigned long GetRedrawMTime(); // Description: // Set the total length of the axes in 3 dimensions. --- 99,112 ---- // Description: // Get the actors mtime plus consider its properties and texture if set. ! vtkTimeStamp GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, textures // etc. ! virtual vtkTimeStamp GetRedrawMTime(); // Description: // Set the total length of the axes in 3 dimensions. diff -crB VTK/Hybrid/vtkBSplineTransform.cxx VTKNew/Hybrid/vtkBSplineTransform.cxx *** VTK/Hybrid/vtkBSplineTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkBSplineTransform.cxx 2013-09-24 10:54:59.757881400 +0200 *************** *** 424,432 **** //---------------------------------------------------------------------------- // need to check the input image data to determine MTime ! unsigned long vtkBSplineTransform::GetMTime() { ! unsigned long mtime,result; result = vtkWarpTransform::GetMTime(); if (this->Coefficients) { --- 424,432 ---- //---------------------------------------------------------------------------- // need to check the input image data to determine MTime ! vtkTimeStamp vtkBSplineTransform::GetMTime() { ! vtkTimeStamp mtime,result; result = vtkWarpTransform::GetMTime(); if (this->Coefficients) { diff -crB VTK/Hybrid/vtkBSplineTransform.h VTKNew/Hybrid/vtkBSplineTransform.h *** VTK/Hybrid/vtkBSplineTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkBSplineTransform.h 2013-09-24 10:54:59.992894800 +0200 *************** *** 83,89 **** // Description: // Get the MTime. ! unsigned long GetMTime(); protected: vtkBSplineTransform(); --- 83,89 ---- // Description: // Get the MTime. ! vtkTimeStamp GetMTime(); protected: vtkBSplineTransform(); diff -crB VTK/Hybrid/vtkDepthSortPolyData.cxx VTKNew/Hybrid/vtkDepthSortPolyData.cxx *** VTK/Hybrid/vtkDepthSortPolyData.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkDepthSortPolyData.cxx 2013-09-24 11:34:44.775296600 +0200 *************** *** 317,329 **** } } ! unsigned long int vtkDepthSortPolyData::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); if ( this->Direction != VTK_DIRECTION_SPECIFIED_VECTOR ) { ! unsigned long time; if ( this->Camera != NULL ) { time = this->Camera->GetMTime(); --- 317,329 ---- } } ! vtkTimeStamp vtkDepthSortPolyData::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); if ( this->Direction != VTK_DIRECTION_SPECIFIED_VECTOR ) { ! vtkTimeStamp time; if ( this->Camera != NULL ) { time = this->Camera->GetMTime(); diff -crB VTK/Hybrid/vtkDepthSortPolyData.h VTKNew/Hybrid/vtkDepthSortPolyData.h *** VTK/Hybrid/vtkDepthSortPolyData.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkDepthSortPolyData.h 2013-09-24 11:34:44.831299800 +0200 *************** *** 120,126 **** // Description: // Return MTime also considering the dependent objects: the camera // and/or the prop3D. ! unsigned long GetMTime(); protected: vtkDepthSortPolyData(); --- 120,126 ---- // Description: // Return MTime also considering the dependent objects: the camera // and/or the prop3D. ! vtkTimeStamp GetMTime(); protected: vtkDepthSortPolyData(); diff -crB VTK/Hybrid/vtkExodusIIReader.cxx VTKNew/Hybrid/vtkExodusIIReader.cxx *** VTK/Hybrid/vtkExodusIIReader.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkExodusIIReader.cxx 2013-09-24 11:52:49.523340600 +0200 *************** *** 5397,5403 **** } #endif // 0 ! unsigned long vtkExodusIIReader::GetMTime() { //return this->MTime.GetMTime(); /* --- 5397,5403 ---- } #endif // 0 ! vtkTimeStamp vtkExodusIIReader::GetMTime() { //return this->MTime.GetMTime(); /* *************** *** 5410,5421 **** mtime2 = fileNameMTime > xmlFileNameMTime ? fileNameMTime : xmlFileNameMTime; return mtime1 > mtime2 ? mtime1 : mtime2; */ ! unsigned long readerMTime = this->MTime.GetMTime(); ! unsigned long privateMTime = this->Metadata->GetMTime(); return privateMTime > readerMTime ? privateMTime : readerMTime; } ! unsigned long vtkExodusIIReader::GetMetadataMTime() { return this->Metadata->InformationTimeStamp < this->Metadata->GetMTime() ? this->Metadata->InformationTimeStamp : this->Metadata->GetMTime(); --- 5410,5421 ---- mtime2 = fileNameMTime > xmlFileNameMTime ? fileNameMTime : xmlFileNameMTime; return mtime1 > mtime2 ? mtime1 : mtime2; */ ! vtkTimeStamp readerMTime = this->MTime.GetMTime(); ! vtkTimeStamp privateMTime = this->Metadata->GetMTime(); return privateMTime > readerMTime ? privateMTime : readerMTime; } ! vtkTimeStamp vtkExodusIIReader::GetMetadataMTime() { return this->Metadata->InformationTimeStamp < this->Metadata->GetMTime() ? this->Metadata->InformationTimeStamp : this->Metadata->GetMTime(); diff -crB VTK/Hybrid/vtkExodusIIReader.h VTKNew/Hybrid/vtkExodusIIReader.h *** VTK/Hybrid/vtkExodusIIReader.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkExodusIIReader.h 2013-09-24 11:52:49.318328900 +0200 *************** *** 63,75 **** // Description: // Return the object's MTime. This is overridden to include the timestamp of its internal class. ! virtual unsigned long GetMTime(); // Description: // Return the MTime of the internal data structure. // This is really only intended for use by vtkPExodusIIReader in order // to determine if the filename is newer than the metadata. ! virtual unsigned long GetMetadataMTime(); // Description: // Specify file name of the Exodus file. --- 63,75 ---- // Description: // Return the object's MTime. This is overridden to include the timestamp of its internal class. ! virtual vtkTimeStamp GetMTime(); // Description: // Return the MTime of the internal data structure. // This is really only intended for use by vtkPExodusIIReader in order // to determine if the filename is newer than the metadata. ! virtual vtkTimeStamp GetMetadataMTime(); // Description: // Specify file name of the Exodus file. diff -crB VTK/Hybrid/vtkGridTransform.cxx VTKNew/Hybrid/vtkGridTransform.cxx *** VTK/Hybrid/vtkGridTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkGridTransform.cxx 2013-09-24 11:52:49.596344800 +0200 *************** *** 725,733 **** //---------------------------------------------------------------------------- // need to check the input image data to determine MTime ! unsigned long vtkGridTransform::GetMTime() { ! unsigned long mtime,result; result = vtkWarpTransform::GetMTime(); if (this->DisplacementGrid) { --- 725,733 ---- //---------------------------------------------------------------------------- // need to check the input image data to determine MTime ! vtkTimeStamp vtkGridTransform::GetMTime() { ! vtkTimeStamp mtime,result; result = vtkWarpTransform::GetMTime(); if (this->DisplacementGrid) { diff -crB VTK/Hybrid/vtkGridTransform.h VTKNew/Hybrid/vtkGridTransform.h *** VTK/Hybrid/vtkGridTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkGridTransform.h 2013-09-24 11:34:44.789297400 +0200 *************** *** 82,88 **** // Description: // Get the MTime. ! unsigned long GetMTime(); protected: vtkGridTransform(); --- 82,88 ---- // Description: // Get the MTime. ! vtkTimeStamp GetMTime(); protected: vtkGridTransform(); diff -crB VTK/Hybrid/vtkIterativeClosestPointTransform.cxx VTKNew/Hybrid/vtkIterativeClosestPointTransform.cxx *** VTK/Hybrid/vtkIterativeClosestPointTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkIterativeClosestPointTransform.cxx 2013-09-24 11:52:49.591344500 +0200 *************** *** 180,189 **** //------------------------------------------------------------------------ ! unsigned long vtkIterativeClosestPointTransform::GetMTime() { ! unsigned long result = this->vtkLinearTransform::GetMTime(); ! unsigned long mtime; if (this->Source) { --- 180,189 ---- //------------------------------------------------------------------------ ! vtkTimeStamp vtkIterativeClosestPointTransform::GetMTime() { ! vtkTimeStamp result = this->vtkLinearTransform::GetMTime(); ! vtkTimeStamp mtime; if (this->Source) { diff -crB VTK/Hybrid/vtkIterativeClosestPointTransform.h VTKNew/Hybrid/vtkIterativeClosestPointTransform.h *** VTK/Hybrid/vtkIterativeClosestPointTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkIterativeClosestPointTransform.h 2013-09-24 11:52:49.502339400 +0200 *************** *** 153,159 **** // Description: // Get the MTime of this object also considering the locator. ! unsigned long int GetMTime(); vtkIterativeClosestPointTransform(); ~vtkIterativeClosestPointTransform(); --- 153,159 ---- // Description: // Get the MTime of this object also considering the locator. ! vtkTimeStamp GetMTime(); vtkIterativeClosestPointTransform(); ~vtkIterativeClosestPointTransform(); diff -crB VTK/Hybrid/vtkLandmarkTransform.cxx VTKNew/Hybrid/vtkLandmarkTransform.cxx *** VTK/Hybrid/vtkLandmarkTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkLandmarkTransform.cxx 2013-09-24 11:52:49.585344200 +0200 *************** *** 371,380 **** } //------------------------------------------------------------------------ ! unsigned long vtkLandmarkTransform::GetMTime() { ! unsigned long result = this->vtkLinearTransform::GetMTime(); ! unsigned long mtime; if (this->SourceLandmarks) { --- 371,380 ---- } //------------------------------------------------------------------------ ! vtkTimeStamp vtkLandmarkTransform::GetMTime() { ! vtkTimeStamp result = this->vtkLinearTransform::GetMTime(); ! vtkTimeStamp mtime; if (this->SourceLandmarks) { diff -crB VTK/Hybrid/vtkLandmarkTransform.h VTKNew/Hybrid/vtkLandmarkTransform.h *** VTK/Hybrid/vtkLandmarkTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkLandmarkTransform.h 2013-09-24 11:52:49.482338300 +0200 *************** *** 77,83 **** // Description: // Get the MTime. ! unsigned long GetMTime(); // Description: // Make another transform of the same type. --- 77,83 ---- // Description: // Get the MTime. ! vtkTimeStamp GetMTime(); // Description: // Make another transform of the same type. diff -crB VTK/Hybrid/vtkMNITagPointWriter.cxx VTKNew/Hybrid/vtkMNITagPointWriter.cxx *** VTK/Hybrid/vtkMNITagPointWriter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkMNITagPointWriter.cxx 2013-09-24 11:55:02.267933200 +0200 *************** *** 147,155 **** } //------------------------------------------------------------------------- ! unsigned long vtkMNITagPointWriter::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); vtkObject *objects[6]; objects[0] = this->Points[0]; --- 147,155 ---- } //------------------------------------------------------------------------- ! vtkTimeStamp vtkMNITagPointWriter::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); vtkObject *objects[6]; objects[0] = this->Points[0]; *************** *** 163,169 **** { if (objects[i]) { ! unsigned long m = objects[i]->GetMTime(); if (m > mtime) { mtime = m; --- 163,169 ---- { if (objects[i]) { ! vtkTimeStamp m = objects[i]->GetMTime(); if (m > mtime) { mtime = m; *************** *** 492,498 **** input[0] = 0; input[1] = 0; ! unsigned long lastUpdateTime = 0; for (int idx = 0; idx < 2; ++idx) { if (inInfo[idx]) --- 492,498 ---- input[0] = 0; input[1] = 0; ! vtkTimeStamp lastUpdateTime; for (int idx = 0; idx < 2; ++idx) { if (inInfo[idx]) *************** *** 501,507 **** inInfo[idx]->Get(vtkDataObject::DATA_OBJECT())); if (input[idx]) { ! unsigned long updateTime = input[idx]->GetUpdateTime(); if (updateTime > lastUpdateTime) { lastUpdateTime = updateTime; --- 501,507 ---- inInfo[idx]->Get(vtkDataObject::DATA_OBJECT())); if (input[idx]) { ! vtkTimeStamp updateTime = input[idx]->GetUpdateTime(); if (updateTime > lastUpdateTime) { lastUpdateTime = updateTime; diff -crB VTK/Hybrid/vtkMNITagPointWriter.h VTKNew/Hybrid/vtkMNITagPointWriter.h *** VTK/Hybrid/vtkMNITagPointWriter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkMNITagPointWriter.h 2013-09-24 11:52:49.462337100 +0200 *************** *** 133,139 **** // Description: // Get the MTime. ! virtual unsigned long GetMTime(); protected: vtkMNITagPointWriter(); --- 133,139 ---- // Description: // Get the MTime. ! virtual vtkTimeStamp GetMTime(); protected: vtkMNITagPointWriter(); diff -crB VTK/Hybrid/vtkPolyDataSilhouette.cxx VTKNew/Hybrid/vtkPolyDataSilhouette.cxx *** VTK/Hybrid/vtkPolyDataSilhouette.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkPolyDataSilhouette.cxx 2013-09-24 11:52:49.573343500 +0200 *************** *** 388,400 **** } } ! unsigned long int vtkPolyDataSilhouette::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); if ( this->Direction != VTK_DIRECTION_SPECIFIED_VECTOR ) { ! unsigned long time; if ( this->Camera != NULL ) { time = this->Camera->GetMTime(); --- 388,400 ---- } } ! vtkTimeStamp vtkPolyDataSilhouette::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); if ( this->Direction != VTK_DIRECTION_SPECIFIED_VECTOR ) { ! vtkTimeStamp time; if ( this->Camera != NULL ) { time = this->Camera->GetMTime(); diff -crB VTK/Hybrid/vtkPolyDataSilhouette.h VTKNew/Hybrid/vtkPolyDataSilhouette.h *** VTK/Hybrid/vtkPolyDataSilhouette.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkPolyDataSilhouette.h 2013-09-24 11:52:49.420334700 +0200 *************** *** 128,134 **** // Description: // Return MTime also considering the dependent objects: the camera // and/or the prop3D. ! unsigned long GetMTime(); protected: vtkPolyDataSilhouette(); --- 128,134 ---- // Description: // Return MTime also considering the dependent objects: the camera // and/or the prop3D. ! vtkTimeStamp GetMTime(); protected: vtkPolyDataSilhouette(); diff -crB VTK/Hybrid/vtkRIBExporter.cxx VTKNew/Hybrid/vtkRIBExporter.cxx *** VTK/Hybrid/vtkRIBExporter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkRIBExporter.cxx 2013-09-24 11:52:49.561342800 +0200 *************** *** 1377,1389 **** char *vtkRIBExporter::GetTIFFName (vtkTexture *aTexture) { ! sprintf (tiffName, "%s_%p_%d.tif", this->TexturePrefix, (void *) aTexture, (int) aTexture->GetMTime ()); return tiffName; } char *vtkRIBExporter::GetTextureName (vtkTexture *aTexture) { ! sprintf (textureName, "%s_%p_%d.txt", this->TexturePrefix, (void *) aTexture, (int) aTexture->GetMTime ()); return textureName; } --- 1377,1389 ---- char *vtkRIBExporter::GetTIFFName (vtkTexture *aTexture) { ! sprintf (tiffName, "%s_%p_%d.tif", this->TexturePrefix, (void *) aTexture, (unsigned int) aTexture->GetMTime().toDouble()); return tiffName; } char *vtkRIBExporter::GetTextureName (vtkTexture *aTexture) { ! sprintf (textureName, "%s_%p_%d.txt", this->TexturePrefix, (void *) aTexture, (unsigned int) aTexture->GetMTime().toDouble()); return textureName; } diff -crB VTK/Hybrid/vtkTemporalDataSetCache.cxx VTKNew/Hybrid/vtkTemporalDataSetCache.cxx *** VTK/Hybrid/vtkTemporalDataSetCache.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkTemporalDataSetCache.cxx 2013-09-24 11:52:49.554342400 +0200 *************** *** 104,110 **** return 1; } ! unsigned long pmt = ddp->GetPipelineMTime(); for (pos = this->Cache.begin(); pos != this->Cache.end();) { if (pos->second.first < pmt) --- 104,110 ---- return 1; } ! vtkTimeStamp pmt = ddp->GetPipelineMTime(); for (pos = this->Cache.begin(); pos != this->Cache.end();) { if (pos->second.first < pmt) *************** *** 309,315 **** if (temporal) { this->Cache[inTimes[j]] = ! std::pair (outData->GetUpdateTime(), temporal->GetTimeStep(j)); vtkDataObject *dobj = temporal->GetTimeStep(j); if (!dobj) --- 309,315 ---- if (temporal) { this->Cache[inTimes[j]] = ! std::pair (outData->GetUpdateTime(), temporal->GetTimeStep(j)); vtkDataObject *dobj = temporal->GetTimeStep(j); if (!dobj) *************** *** 323,329 **** { vtkDebugMacro(<<"Cache : Should not be here 2"); this->Cache[inTimes[j]] = ! std::pair (outData->GetUpdateTime(), input); input->Register(this); } --- 323,329 ---- { vtkDebugMacro(<<"Cache : Should not be here 2"); this->Cache[inTimes[j]] = ! std::pair (outData->GetUpdateTime(), input); input->Register(this); } diff -crB VTK/Hybrid/vtkTemporalDataSetCache.h VTKNew/Hybrid/vtkTemporalDataSetCache.h *** VTK/Hybrid/vtkTemporalDataSetCache.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkTemporalDataSetCache.h 2013-09-24 11:52:49.399333500 +0200 *************** *** 52,58 **** int CacheSize; //BTX ! typedef std::map > CacheType; CacheType Cache; //ETX --- 52,58 ---- int CacheSize; //BTX ! typedef std::map > CacheType; CacheType Cache; //ETX diff -crB VTK/Hybrid/vtkThinPlateSplineTransform.cxx VTKNew/Hybrid/vtkThinPlateSplineTransform.cxx *** VTK/Hybrid/vtkThinPlateSplineTransform.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkThinPlateSplineTransform.cxx 2013-09-24 11:52:49.548342000 +0200 *************** *** 168,177 **** } //------------------------------------------------------------------------ ! unsigned long vtkThinPlateSplineTransform::GetMTime() { ! unsigned long result = this->vtkWarpTransform::GetMTime(); ! unsigned long mtime; if (this->SourceLandmarks) { --- 168,177 ---- } //------------------------------------------------------------------------ ! vtkTimeStamp vtkThinPlateSplineTransform::GetMTime() { ! vtkTimeStamp result = this->vtkWarpTransform::GetMTime(); ! vtkTimeStamp mtime; if (this->SourceLandmarks) { diff -crB VTK/Hybrid/vtkThinPlateSplineTransform.h VTKNew/Hybrid/vtkThinPlateSplineTransform.h *** VTK/Hybrid/vtkThinPlateSplineTransform.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkThinPlateSplineTransform.h 2013-09-24 11:52:49.439335800 +0200 *************** *** 97,103 **** // Description: // Get the MTime. ! unsigned long GetMTime(); // Description: // Make another transform of the same type. --- 97,103 ---- // Description: // Get the MTime. ! vtkTimeStamp GetMTime(); // Description: // Make another transform of the same type. diff -crB VTK/Hybrid/vtkTransformToGrid.cxx VTKNew/Hybrid/vtkTransformToGrid.cxx *** VTK/Hybrid/vtkTransformToGrid.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkTransformToGrid.cxx 2013-09-24 11:52:49.541341600 +0200 *************** *** 403,415 **** } //---------------------------------------------------------------------------- ! unsigned long vtkTransformToGrid::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); if (this->Input) { ! unsigned long mtime2 = this->Input->GetMTime(); if (mtime2 > mtime) { mtime = mtime2; --- 403,415 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkTransformToGrid::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); if (this->Input) { ! vtkTimeStamp mtime2 = this->Input->GetMTime(); if (mtime2 > mtime) { mtime = mtime2; diff -crB VTK/Hybrid/vtkTransformToGrid.h VTKNew/Hybrid/vtkTransformToGrid.h *** VTK/Hybrid/vtkTransformToGrid.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkTransformToGrid.h 2013-09-24 11:52:49.380332400 +0200 *************** *** 104,110 **** // will provide maximum grid precision for a particular integer type. void UpdateShiftScale(); ! unsigned long GetMTime(); vtkAbstractTransform *Input; --- 104,110 ---- // will provide maximum grid precision for a particular integer type. void UpdateShiftScale(); ! vtkTimeStamp GetMTime(); vtkAbstractTransform *Input; diff -crB VTK/Hybrid/vtkWeightedTransformFilter.cxx VTKNew/Hybrid/vtkWeightedTransformFilter.cxx *** VTK/Hybrid/vtkWeightedTransformFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkWeightedTransformFilter.cxx 2013-09-24 11:52:49.535341300 +0200 *************** *** 822,832 **** } //---------------------------------------------------------------------------- ! unsigned long vtkWeightedTransformFilter::GetMTime() { int i; ! unsigned long mTime=this->MTime.GetMTime(); ! unsigned long transMTime; if ( this->Transforms ) { --- 822,832 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkWeightedTransformFilter::GetMTime() { int i; ! vtkTimeStamp mTime=this->MTime.GetMTime(); ! vtkTimeStamp transMTime; if ( this->Transforms ) { diff -crB VTK/Hybrid/vtkWeightedTransformFilter.h VTKNew/Hybrid/vtkWeightedTransformFilter.h *** VTK/Hybrid/vtkWeightedTransformFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkWeightedTransformFilter.h 2013-09-24 11:52:49.360331300 +0200 *************** *** 80,86 **** // Description: // Return the MTime also considering the filter's transforms. ! unsigned long GetMTime(); // Description: // WeightArray is the string name of the DataArray in the input's --- 80,86 ---- // Description: // Return the MTime also considering the filter's transforms. ! vtkTimeStamp GetMTime(); // Description: // WeightArray is the string name of the DataArray in the input's diff -crB VTK/Hybrid/vtkXYPlotActor.cxx VTKNew/Hybrid/vtkXYPlotActor.cxx *** VTK/Hybrid/vtkXYPlotActor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkXYPlotActor.cxx 2013-09-24 11:55:02.260932800 +0200 *************** *** 557,563 **** // Plot scalar data for each input dataset. int vtkXYPlotActor::RenderOpaqueGeometry(vtkViewport *viewport) { ! unsigned long mtime, dsMtime; vtkDataSet *ds; vtkDataObject *dobj; int numDS, numDO, renderedSomething=0; --- 557,563 ---- // Plot scalar data for each input dataset. int vtkXYPlotActor::RenderOpaqueGeometry(vtkViewport *viewport) { ! vtkTimeStamp mtime, dsMtime; vtkDataSet *ds; vtkDataObject *dobj; int numDS, numDO, renderedSomething=0; *************** *** 570,576 **** { vtkDebugMacro(<<"Plotting input data sets"); vtkCollectionSimpleIterator dsit; ! for (mtime=0, this->InputList->InitTraversal(dsit); (ds = this->InputList->GetNextDataSet(dsit)); ) { ds->Update(); --- 570,576 ---- { vtkDebugMacro(<<"Plotting input data sets"); vtkCollectionSimpleIterator dsit; ! for (this->InputList->InitTraversal(dsit); (ds = this->InputList->GetNextDataSet(dsit)); ) { ds->Update(); *************** *** 585,591 **** { vtkDebugMacro(<<"Plotting input data objects"); vtkCollectionSimpleIterator doit; ! for (mtime=0, this->DataObjectInputList->InitTraversal(doit); (dobj = this->DataObjectInputList->GetNextDataObject(doit)); ) { dobj->Update(); --- 585,591 ---- { vtkDebugMacro(<<"Plotting input data objects"); vtkCollectionSimpleIterator doit; ! for (this->DataObjectInputList->InitTraversal(doit); (dobj = this->DataObjectInputList->GetNextDataObject(doit)); ) { dobj->Update(); *************** *** 1082,1090 **** } //---------------------------------------------------------------------------- ! unsigned long vtkXYPlotActor::GetMTime() { ! unsigned long mtime, mtime2; mtime = this->vtkActor2D::GetMTime(); if (this->Legend) --- 1082,1090 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkXYPlotActor::GetMTime() { ! vtkTimeStamp mtime, mtime2; mtime = this->vtkActor2D::GetMTime(); if (this->Legend) diff -crB VTK/Hybrid/vtkXYPlotActor.h VTKNew/Hybrid/vtkXYPlotActor.h *** VTK/Hybrid/vtkXYPlotActor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Hybrid/vtkXYPlotActor.h 2013-09-24 11:52:49.340330100 +0200 *************** *** 555,561 **** // Description: // Take into account the modified time of internal helper classes. ! unsigned long GetMTime(); // Description: // Write the XY Ploat Actor as a CSV (comma separated value) representation. --- 555,561 ---- // Description: // Take into account the modified time of internal helper classes. ! vtkTimeStamp GetMTime(); // Description: // Write the XY Ploat Actor as a CSV (comma separated value) representation. diff -crB VTK/Imaging/vtkImageExport.cxx VTKNew/Imaging/vtkImageExport.cxx *** VTK/Imaging/vtkImageExport.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageExport.cxx 2013-09-24 10:20:55.278943900 +0200 *************** *** 30,36 **** this->ExportVoidPointer = 0; this->DataDimensions[0] = this->DataDimensions[1] = this->DataDimensions[2] = 0; - this->LastPipelineMTime = 0; this->SetNumberOfOutputPorts(0); } --- 30,35 ---- *************** *** 341,347 **** return 0; } ! unsigned long mtime = this->GetInput()->GetPipelineMTime(); if(mtime > this->LastPipelineMTime) { this->LastPipelineMTime = mtime; --- 340,346 ---- return 0; } ! vtkTimeStamp mtime = this->GetInput()->GetPipelineMTime(); if(mtime > this->LastPipelineMTime) { this->LastPipelineMTime = mtime; diff -crB VTK/Imaging/vtkImageExport.h VTKNew/Imaging/vtkImageExport.h *** VTK/Imaging/vtkImageExport.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageExport.h 2013-09-24 10:20:34.355747100 +0200 *************** *** 171,177 **** int DataDimensions[3]; void *ExportVoidPointer; ! unsigned long LastPipelineMTime; private: vtkImageExport(const vtkImageExport&); // Not implemented. --- 171,177 ---- int DataDimensions[3]; void *ExportVoidPointer; ! vtkTimeStamp LastPipelineMTime; private: vtkImageExport(const vtkImageExport&); // Not implemented. diff -crB VTK/Imaging/vtkImageMapToColors.cxx VTKNew/Imaging/vtkImageMapToColors.cxx *** VTK/Imaging/vtkImageMapToColors.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageMapToColors.cxx 2013-09-24 10:05:15.818209800 +0200 *************** *** 46,54 **** } //---------------------------------------------------------------------------- ! unsigned long vtkImageMapToColors::GetMTime() { ! unsigned long t1, t2; t1 = this->Superclass::GetMTime(); if (this->LookupTable) --- 46,54 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageMapToColors::GetMTime() { ! vtkTimeStamp t1, t2; t1 = this->Superclass::GetMTime(); if (this->LookupTable) diff -crB VTK/Imaging/vtkImageMapToColors.h VTKNew/Imaging/vtkImageMapToColors.h *** VTK/Imaging/vtkImageMapToColors.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageMapToColors.h 2013-09-24 10:05:17.214289600 +0200 *************** *** 66,72 **** // Description: // We need to check the modified time of the lookup table too. ! virtual unsigned long GetMTime(); protected: vtkImageMapToColors(); --- 66,72 ---- // Description: // We need to check the modified time of the lookup table too. ! virtual vtkTimeStamp GetMTime(); protected: vtkImageMapToColors(); diff -crB VTK/Imaging/vtkImageOpenClose3D.cxx VTKNew/Imaging/vtkImageOpenClose3D.cxx *** VTK/Imaging/vtkImageOpenClose3D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageOpenClose3D.cxx 2013-09-24 10:05:15.812209400 +0200 *************** *** 152,160 **** //---------------------------------------------------------------------------- // This method considers the sub filters MTimes when computing this objects // MTime ! unsigned long int vtkImageOpenClose3D::GetMTime() { ! unsigned long int t1, t2; t1 = this->Superclass::GetMTime(); if (this->Filter0) --- 152,160 ---- //---------------------------------------------------------------------------- // This method considers the sub filters MTimes when computing this objects // MTime ! vtkTimeStamp vtkImageOpenClose3D::GetMTime() { ! vtkTimeStamp t1, t2; t1 = this->Superclass::GetMTime(); if (this->Filter0) *************** *** 183,189 **** vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! unsigned long* mtime) { // Process the request on the internal pipeline. Share our input // information with the first filter and our output information with --- 183,189 ---- vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! vtkTimeStamp* mtime) { // Process the request on the internal pipeline. Share our input // information with the first filter and our output information with *************** *** 192,198 **** vtkExecutive* exec1 = this->Filter1->GetExecutive(); exec0->SetSharedInputInformation(inInfoVec); exec1->SetSharedOutputInformation(outInfoVec); ! unsigned long mtime1; if(exec1->ComputePipelineMTime(request, exec1->GetInputInformation(), exec1->GetOutputInformation(), --- 192,198 ---- vtkExecutive* exec1 = this->Filter1->GetExecutive(); exec0->SetSharedInputInformation(inInfoVec); exec1->SetSharedOutputInformation(outInfoVec); ! vtkTimeStamp mtime1; if(exec1->ComputePipelineMTime(request, exec1->GetInputInformation(), exec1->GetOutputInformation(), diff -crB VTK/Imaging/vtkImageOpenClose3D.h VTKNew/Imaging/vtkImageOpenClose3D.h *** VTK/Imaging/vtkImageOpenClose3D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageOpenClose3D.h 2013-09-24 10:05:17.154286200 +0200 *************** *** 48,54 **** // Description: // This method considers the sub filters MTimes when computing this objects // modified time. ! unsigned long int GetMTime(); // Description: // Turn debugging output on. (in sub filters also) --- 48,54 ---- // Description: // This method considers the sub filters MTimes when computing this objects // modified time. ! vtkTimeStamp GetMTime(); // Description: // Turn debugging output on. (in sub filters also) *************** *** 95,101 **** vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! unsigned long* mtime); protected: vtkImageOpenClose3D(); --- 95,101 ---- vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec, int requestFromOutputPort, ! vtkTimeStamp* mtime); protected: vtkImageOpenClose3D(); diff -crB VTK/Imaging/vtkImageResize.cxx VTKNew/Imaging/vtkImageResize.cxx *** VTK/Imaging/vtkImageResize.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageResize.cxx 2013-09-24 10:05:15.806209100 +0200 *************** *** 982,991 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImageResize::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if (this->Interpolate != 0 && this->Interpolator != NULL) { --- 982,991 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageResize::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->Interpolate != 0 && this->Interpolator != NULL) { diff -crB VTK/Imaging/vtkImageResize.h VTKNew/Imaging/vtkImageResize.h *** VTK/Imaging/vtkImageResize.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageResize.h 2013-09-24 10:05:17.093282700 +0200 *************** *** 121,127 **** // Description: // Get the modified time of the filter. ! unsigned long int GetMTime(); protected: vtkImageResize(); --- 121,127 ---- // Description: // Get the modified time of the filter. ! vtkTimeStamp GetMTime(); protected: vtkImageResize(); diff -crB VTK/Imaging/vtkImageReslice.cxx VTKNew/Imaging/vtkImageReslice.cxx *** VTK/Imaging/vtkImageReslice.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageReslice.cxx 2013-09-24 10:05:15.800208800 +0200 *************** *** 510,519 **** //---------------------------------------------------------------------------- // Account for the MTime of the transform and its matrix when determining // the MTime of the filter ! unsigned long int vtkImageReslice::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->ResliceTransform != NULL ) { --- 510,519 ---- //---------------------------------------------------------------------------- // Account for the MTime of the transform and its matrix when determining // the MTime of the filter ! vtkTimeStamp vtkImageReslice::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->ResliceTransform != NULL ) { diff -crB VTK/Imaging/vtkImageReslice.h VTKNew/Imaging/vtkImageReslice.h *** VTK/Imaging/vtkImageReslice.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageReslice.h 2013-09-24 10:05:17.467304100 +0200 *************** *** 299,305 **** // Description: // When determining the modified time of the filter, // this check the modified time of the transform and matrix. ! unsigned long int GetMTime(); // Description: // Report object referenced by instances of this class. --- 299,305 ---- // Description: // When determining the modified time of the filter, // this check the modified time of the transform and matrix. ! vtkTimeStamp GetMTime(); // Description: // Report object referenced by instances of this class. diff -crB VTK/Imaging/vtkImageResliceToColors.cxx VTKNew/Imaging/vtkImageResliceToColors.cxx *** VTK/Imaging/vtkImageResliceToColors.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageResliceToColors.cxx 2013-09-24 10:05:15.793208400 +0200 *************** *** 76,85 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImageResliceToColors::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if (this->LookupTable && !this->Bypass) { --- 76,85 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageResliceToColors::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->LookupTable && !this->Bypass) { diff -crB VTK/Imaging/vtkImageResliceToColors.h VTKNew/Imaging/vtkImageResliceToColors.h *** VTK/Imaging/vtkImageResliceToColors.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageResliceToColors.h 2013-09-24 10:20:34.468753600 +0200 *************** *** 76,82 **** // Description: // When determining the modified time of the filter, // this check the modified time of the transform and matrix. ! unsigned long int GetMTime(); protected: vtkImageResliceToColors(); --- 76,82 ---- // Description: // When determining the modified time of the filter, // this check the modified time of the transform and matrix. ! vtkTimeStamp GetMTime(); protected: vtkImageResliceToColors(); diff -crB VTK/Imaging/vtkImageSeparableConvolution.cxx VTKNew/Imaging/vtkImageSeparableConvolution.cxx *** VTK/Imaging/vtkImageSeparableConvolution.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageSeparableConvolution.cxx 2013-09-24 10:05:15.789208100 +0200 *************** *** 88,97 **** // Description: // Overload standard modified time function. If kernel arrays are modified, // then this object is modified as well. ! unsigned long vtkImageSeparableConvolution::GetMTime() { ! unsigned long mTime=this->vtkImageDecomposeFilter::GetMTime(); ! unsigned long kTime; if ( this->XKernel ) { --- 88,97 ---- // Description: // Overload standard modified time function. If kernel arrays are modified, // then this object is modified as well. ! vtkTimeStamp vtkImageSeparableConvolution::GetMTime() { ! vtkTimeStamp mTime=this->vtkImageDecomposeFilter::GetMTime(); ! vtkTimeStamp kTime; if ( this->XKernel ) { diff -crB VTK/Imaging/vtkImageSeparableConvolution.h VTKNew/Imaging/vtkImageSeparableConvolution.h *** VTK/Imaging/vtkImageSeparableConvolution.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageSeparableConvolution.h 2013-09-24 10:05:17.053280400 +0200 *************** *** 58,64 **** // Description: // Overload standard modified time function. If kernel arrays are modified, // then this object is modified as well. ! unsigned long int GetMTime(); protected: vtkImageSeparableConvolution(); --- 58,64 ---- // Description: // Overload standard modified time function. If kernel arrays are modified, // then this object is modified as well. ! vtkTimeStamp GetMTime(); protected: vtkImageSeparableConvolution(); diff -crB VTK/Imaging/vtkImageThresholdConnectivity.cxx VTKNew/Imaging/vtkImageThresholdConnectivity.cxx *** VTK/Imaging/vtkImageThresholdConnectivity.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageThresholdConnectivity.cxx 2013-09-24 10:05:15.783207800 +0200 *************** *** 174,183 **** } //---------------------------------------------------------------------------- ! unsigned long vtkImageThresholdConnectivity::GetMTime() { ! unsigned long mTime = this->MTime.GetMTime(); ! unsigned long pointsMTime; if (this->SeedPoints) { --- 174,183 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageThresholdConnectivity::GetMTime() { ! vtkTimeStamp mTime = this->MTime.GetMTime(); ! vtkTimeStamp pointsMTime; if (this->SeedPoints) { diff -crB VTK/Imaging/vtkImageThresholdConnectivity.h VTKNew/Imaging/vtkImageThresholdConnectivity.h *** VTK/Imaging/vtkImageThresholdConnectivity.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImageThresholdConnectivity.h 2013-09-24 10:05:16.952274700 +0200 *************** *** 127,133 **** // Description: // Override the MTime to account for the seed points. ! unsigned long GetMTime(); // Description: // After the filter has executed, use GetNumberOfVoxels() to find --- 127,133 ---- // Description: // Override the MTime to account for the seed points. ! vtkTimeStamp GetMTime(); // Description: // After the filter has executed, use GetNumberOfVoxels() to find diff -crB VTK/Imaging/vtkImplicitFunctionToImageStencil.cxx VTKNew/Imaging/vtkImplicitFunctionToImageStencil.cxx *** VTK/Imaging/vtkImplicitFunctionToImageStencil.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImplicitFunctionToImageStencil.cxx 2013-09-24 10:05:15.775207300 +0200 *************** *** 54,66 **** } //---------------------------------------------------------------------------- ! unsigned long vtkImplicitFunctionToImageStencil::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); if ( this->Input != NULL ) { ! unsigned long nTime = this->Input->GetMTime(); mTime = ( nTime > mTime ? nTime : mTime ); } --- 54,66 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImplicitFunctionToImageStencil::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); if ( this->Input != NULL ) { ! vtkTimeStamp nTime = this->Input->GetMTime(); mTime = ( nTime > mTime ? nTime : mTime ); } diff -crB VTK/Imaging/vtkImplicitFunctionToImageStencil.h VTKNew/Imaging/vtkImplicitFunctionToImageStencil.h *** VTK/Imaging/vtkImplicitFunctionToImageStencil.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkImplicitFunctionToImageStencil.h 2013-09-24 10:05:16.906272000 +0200 *************** *** 47,53 **** // Description: // Override GetMTime() to account for the implicit function. ! unsigned long GetMTime(); protected: vtkImplicitFunctionToImageStencil(); --- 47,53 ---- // Description: // Override GetMTime() to account for the implicit function. ! vtkTimeStamp GetMTime(); protected: vtkImplicitFunctionToImageStencil(); diff -crB VTK/Imaging/vtkLassoStencilSource.cxx VTKNew/Imaging/vtkLassoStencilSource.cxx *** VTK/Imaging/vtkLassoStencilSource.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkLassoStencilSource.cxx 2013-09-24 10:05:15.771207100 +0200 *************** *** 97,109 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkLassoStencilSource::GetMTime() { ! unsigned long mTime = this->vtkImageStencilSource::GetMTime(); if ( this->Points != NULL ) { ! unsigned long t = this->Points->GetMTime(); if (t > mTime) { mTime = t; --- 97,109 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkLassoStencilSource::GetMTime() { ! vtkTimeStamp mTime = this->vtkImageStencilSource::GetMTime(); if ( this->Points != NULL ) { ! vtkTimeStamp t = this->Points->GetMTime(); if (t > mTime) { mTime = t; *************** *** 115,121 **** vtkLSSPointMap::iterator iter = this->PointMap->begin(); while ( iter != this->PointMap->end() ) { ! unsigned long t = iter->second->GetMTime(); if (t > mTime) { mTime = t; --- 115,121 ---- vtkLSSPointMap::iterator iter = this->PointMap->begin(); while ( iter != this->PointMap->end() ) { ! vtkTimeStamp t = iter->second->GetMTime(); if (t > mTime) { mTime = t; diff -crB VTK/Imaging/vtkLassoStencilSource.h VTKNew/Imaging/vtkLassoStencilSource.h *** VTK/Imaging/vtkLassoStencilSource.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkLassoStencilSource.h 2013-09-24 10:05:16.887270900 +0200 *************** *** 82,88 **** // Description: // Overload GetMTime() to include the timestamp on the points. ! unsigned long GetMTime(); protected: vtkLassoStencilSource(); --- 82,88 ---- // Description: // Overload GetMTime() to include the timestamp on the points. ! vtkTimeStamp GetMTime(); protected: vtkLassoStencilSource(); diff -crB VTK/Imaging/vtkSampleFunction.cxx VTKNew/Imaging/vtkSampleFunction.cxx *** VTK/Imaging/vtkSampleFunction.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkSampleFunction.cxx 2013-09-24 10:05:15.765206800 +0200 *************** *** 238,247 **** } ! unsigned long vtkSampleFunction::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long impFuncMTime; if ( this->ImplicitFunction != NULL ) { --- 238,247 ---- } ! vtkTimeStamp vtkSampleFunction::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp impFuncMTime; if ( this->ImplicitFunction != NULL ) { diff -crB VTK/Imaging/vtkSampleFunction.h VTKNew/Imaging/vtkSampleFunction.h *** VTK/Imaging/vtkSampleFunction.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Imaging/vtkSampleFunction.h 2013-09-24 10:05:16.845268500 +0200 *************** *** 127,133 **** // Description: // Return the MTime also considering the implicit function. ! unsigned long GetMTime(); protected: // Description: --- 127,133 ---- // Description: // Return the MTime also considering the implicit function. ! vtkTimeStamp GetMTime(); protected: // Description: diff -crB VTK/Infovis/vtkApplyColors.cxx VTKNew/Infovis/vtkApplyColors.cxx *** VTK/Infovis/vtkApplyColors.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkApplyColors.cxx 2013-09-24 11:52:49.030312400 +0200 *************** *** 451,459 **** } } ! long unsigned int vtkApplyColors::GetMTime() { ! long unsigned int mtime = Superclass::GetMTime(); if (this->PointLookupTable && this->PointLookupTable->GetMTime() > mtime) { mtime = this->PointLookupTable->GetMTime(); --- 451,459 ---- } } ! vtkTimeStamp vtkApplyColors::GetMTime() { ! vtkTimeStamp mtime = Superclass::GetMTime(); if (this->PointLookupTable && this->PointLookupTable->GetMTime() > mtime) { mtime = this->PointLookupTable->GetMTime(); diff -crB VTK/Infovis/vtkApplyColors.h VTKNew/Infovis/vtkApplyColors.h *** VTK/Infovis/vtkApplyColors.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkApplyColors.h 2013-09-24 11:52:49.217323100 +0200 *************** *** 196,202 **** // Description: // Retrieve the modified time for this filter. ! virtual long unsigned int GetMTime(); protected: vtkApplyColors(); --- 196,202 ---- // Description: // Retrieve the modified time for this filter. ! virtual vtkTimeStamp GetMTime(); protected: vtkApplyColors(); diff -crB VTK/Infovis/vtkAreaLayout.cxx VTKNew/Infovis/vtkAreaLayout.cxx *** VTK/Infovis/vtkAreaLayout.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkAreaLayout.cxx 2013-09-24 11:52:49.025312100 +0200 *************** *** 188,197 **** sectorInfo->GetTupleValue(id, sinfo); } ! unsigned long vtkAreaLayout::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if (this->LayoutStrategy != NULL) { --- 188,197 ---- sectorInfo->GetTupleValue(id, sinfo); } ! vtkTimeStamp vtkAreaLayout::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->LayoutStrategy != NULL) { diff -crB VTK/Infovis/vtkAreaLayout.h VTKNew/Infovis/vtkAreaLayout.h *** VTK/Infovis/vtkAreaLayout.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkAreaLayout.h 2013-09-24 11:52:49.195321800 +0200 *************** *** 74,80 **** // Description: // Get the modification time of the layout algorithm. ! virtual unsigned long GetMTime(); // Description: // Get the vertex whose area contains the point, or return -1 --- 74,80 ---- // Description: // Get the modification time of the layout algorithm. ! virtual vtkTimeStamp GetMTime(); // Description: // Get the vertex whose area contains the point, or return -1 diff -crB VTK/Infovis/vtkCirclePackLayout.cxx VTKNew/Infovis/vtkCirclePackLayout.cxx *** VTK/Infovis/vtkCirclePackLayout.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkCirclePackLayout.cxx 2013-09-24 11:52:49.021311900 +0200 *************** *** 213,222 **** boxInfo->GetTupleValue(id, cinfo); } ! unsigned long vtkCirclePackLayout::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if (this->LayoutStrategy != NULL) { --- 213,222 ---- boxInfo->GetTupleValue(id, cinfo); } ! vtkTimeStamp vtkCirclePackLayout::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->LayoutStrategy != NULL) { diff -crB VTK/Infovis/vtkCirclePackLayout.h VTKNew/Infovis/vtkCirclePackLayout.h *** VTK/Infovis/vtkCirclePackLayout.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkCirclePackLayout.h 2013-09-24 11:52:49.168320300 +0200 *************** *** 83,89 **** // Description: // Get the modification time of the layout algorithm. ! virtual unsigned long GetMTime(); protected: vtkCirclePackLayout(); --- 83,89 ---- // Description: // Get the modification time of the layout algorithm. ! virtual vtkTimeStamp GetMTime(); protected: vtkCirclePackLayout(); diff -crB VTK/Infovis/vtkConvexHull2D.cxx VTKNew/Infovis/vtkConvexHull2D.cxx *** VTK/Infovis/vtkConvexHull2D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkConvexHull2D.cxx 2013-09-24 11:52:49.016311600 +0200 *************** *** 216,222 **** } //----------------------------------------------------------------------------- ! unsigned long vtkConvexHull2D::GetMTime() { if (this->Renderer) { --- 216,222 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkConvexHull2D::GetMTime() { if (this->Renderer) { diff -crB VTK/Infovis/vtkConvexHull2D.h VTKNew/Infovis/vtkConvexHull2D.h *** VTK/Infovis/vtkConvexHull2D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkConvexHull2D.h 2013-09-24 11:52:49.147319100 +0200 *************** *** 104,110 **** // Description: // The modified time of this filter. ! virtual unsigned long GetMTime(); // Description: // Convenience methods to calculate a convex hull from a set of vtkPointS. --- 104,110 ---- // Description: // The modified time of this filter. ! virtual vtkTimeStamp GetMTime(); // Description: // Convenience methods to calculate a convex hull from a set of vtkPointS. diff -crB VTK/Infovis/vtkEdgeLayout.cxx VTKNew/Infovis/vtkEdgeLayout.cxx *** VTK/Infovis/vtkEdgeLayout.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkEdgeLayout.cxx 2013-09-24 11:52:49.011311300 +0200 *************** *** 95,104 **** // ---------------------------------------------------------------------- ! unsigned long vtkEdgeLayout::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if (this->LayoutStrategy != NULL) { --- 95,104 ---- // ---------------------------------------------------------------------- ! vtkTimeStamp vtkEdgeLayout::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->LayoutStrategy != NULL) { diff -crB VTK/Infovis/vtkEdgeLayout.h VTKNew/Infovis/vtkEdgeLayout.h *** VTK/Infovis/vtkEdgeLayout.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkEdgeLayout.h 2013-09-24 11:52:49.128318000 +0200 *************** *** 45,51 **** // Description: // Get the modification time of the layout algorithm. ! virtual unsigned long GetMTime(); protected: vtkEdgeLayout(); --- 45,51 ---- // Description: // Get the modification time of the layout algorithm. ! virtual vtkTimeStamp GetMTime(); protected: vtkEdgeLayout(); diff -crB VTK/Infovis/vtkGraphAnnotationLayersFilter.cxx VTKNew/Infovis/vtkGraphAnnotationLayersFilter.cxx *** VTK/Infovis/vtkGraphAnnotationLayersFilter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkGraphAnnotationLayersFilter.cxx 2013-09-24 11:52:49.007311100 +0200 *************** *** 124,130 **** } //----------------------------------------------------------------------------- ! unsigned long vtkGraphAnnotationLayersFilter::GetMTime() { if (this->ConvexHullFilter) { --- 124,130 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkGraphAnnotationLayersFilter::GetMTime() { if (this->ConvexHullFilter) { diff -crB VTK/Infovis/vtkGraphAnnotationLayersFilter.h VTKNew/Infovis/vtkGraphAnnotationLayersFilter.h *** VTK/Infovis/vtkGraphAnnotationLayersFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkGraphAnnotationLayersFilter.h 2013-09-24 11:52:49.105316700 +0200 *************** *** 95,101 **** // Description: // The modified time of this filter. ! virtual unsigned long GetMTime(); protected: vtkGraphAnnotationLayersFilter(); --- 95,101 ---- // Description: // The modified time of this filter. ! virtual vtkTimeStamp GetMTime(); protected: vtkGraphAnnotationLayersFilter(); diff -crB VTK/Infovis/vtkGraphLayout.cxx VTKNew/Infovis/vtkGraphLayout.cxx *** VTK/Infovis/vtkGraphLayout.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkGraphLayout.cxx 2013-09-24 11:55:02.255932500 +0200 *************** *** 45,51 **** this->LayoutStrategy = 0; this->StrategyChanged = false; this->LastInput = NULL; - this->LastInputMTime = 0; this->InternalGraph = 0; this->ZRange = 0.0; this->Transform = 0; --- 45,50 ---- *************** *** 112,122 **** // ---------------------------------------------------------------------- ! unsigned long vtkGraphLayout::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if (this->LayoutStrategy != NULL) { --- 111,121 ---- // ---------------------------------------------------------------------- ! vtkTimeStamp vtkGraphLayout::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->LayoutStrategy != NULL) { diff -crB VTK/Infovis/vtkGraphLayout.h VTKNew/Infovis/vtkGraphLayout.h *** VTK/Infovis/vtkGraphLayout.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkGraphLayout.h 2013-09-24 11:52:49.083315400 +0200 *************** *** 55,61 **** // Description: // Get the modification time of the layout algorithm. ! virtual unsigned long GetMTime(); // Description: // Set the ZRange for the output data. --- 55,61 ---- // Description: // Get the modification time of the layout algorithm. ! virtual vtkTimeStamp GetMTime(); // Description: // Set the ZRange for the output data. *************** *** 93,99 **** vtkGraph* LastInput; vtkGraph* InternalGraph; ! unsigned long LastInputMTime; bool StrategyChanged; double ZRange; vtkAbstractTransform* Transform; --- 93,99 ---- vtkGraph* LastInput; vtkGraph* InternalGraph; ! vtkTimeStamp LastInputMTime; bool StrategyChanged; double ZRange; vtkAbstractTransform* Transform; diff -crB VTK/Infovis/vtkSplineGraphEdges.cxx VTKNew/Infovis/vtkSplineGraphEdges.cxx *** VTK/Infovis/vtkSplineGraphEdges.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkSplineGraphEdges.cxx 2013-09-24 11:55:02.248932100 +0200 *************** *** 204,212 **** } } ! unsigned long vtkSplineGraphEdges::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); if (this->Spline && this->Spline->GetMTime() > mtime) { mtime = this->Spline->GetMTime(); --- 204,212 ---- } } ! vtkTimeStamp vtkSplineGraphEdges::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); if (this->Spline && this->Spline->GetMTime() > mtime) { mtime = this->Spline->GetMTime(); diff -crB VTK/Infovis/vtkSplineGraphEdges.h VTKNew/Infovis/vtkSplineGraphEdges.h *** VTK/Infovis/vtkSplineGraphEdges.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkSplineGraphEdges.h 2013-09-24 11:55:02.201929400 +0200 *************** *** 73,79 **** vtkInformationVector **, vtkInformationVector *); ! virtual unsigned long GetMTime(); void GeneratePoints(vtkGraph* g, vtkIdType e); void GenerateBSpline(vtkGraph* g, vtkIdType e); --- 73,79 ---- vtkInformationVector **, vtkInformationVector *); ! virtual vtkTimeStamp GetMTime(); void GeneratePoints(vtkGraph* g, vtkIdType e); void GenerateBSpline(vtkGraph* g, vtkIdType e); diff -crB VTK/Infovis/vtkTableToGraph.cxx VTKNew/Infovis/vtkTableToGraph.cxx *** VTK/Infovis/vtkTableToGraph.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkTableToGraph.cxx 2013-09-24 11:55:02.242931700 +0200 *************** *** 931,940 **** } //--------------------------------------------------------------------------- ! unsigned long vtkTableToGraph::GetMTime() { ! unsigned long time = this->Superclass::GetMTime(); ! unsigned long linkGraphTime = this->LinkGraph->GetMTime(); time = (linkGraphTime > time ? linkGraphTime : time); return time; } --- 931,940 ---- } //--------------------------------------------------------------------------- ! vtkTimeStamp vtkTableToGraph::GetMTime() { ! vtkTimeStamp time = this->Superclass::GetMTime(); ! vtkTimeStamp linkGraphTime = this->LinkGraph->GetMTime(); time = (linkGraphTime > time ? linkGraphTime : time); return time; } diff -crB VTK/Infovis/vtkTableToGraph.h VTKNew/Infovis/vtkTableToGraph.h *** VTK/Infovis/vtkTableToGraph.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkTableToGraph.h 2013-09-24 11:52:49.062314200 +0200 *************** *** 112,118 **** // Description: // Get the current modified time. ! virtual unsigned long GetMTime(); // Description: // A convenience method for setting the vertex table input. This --- 112,118 ---- // Description: // Get the current modified time. ! virtual vtkTimeStamp GetMTime(); // Description: // A convenience method for setting the vertex table input. This diff -crB VTK/Infovis/vtkTreeMapLayout.cxx VTKNew/Infovis/vtkTreeMapLayout.cxx *** VTK/Infovis/vtkTreeMapLayout.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkTreeMapLayout.cxx 2013-09-24 11:54:59.121753200 +0200 *************** *** 204,213 **** boxInfo->GetTupleValue(id, binfo); } ! unsigned long vtkTreeMapLayout::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if (this->LayoutStrategy != NULL) { --- 204,213 ---- boxInfo->GetTupleValue(id, binfo); } ! vtkTimeStamp vtkTreeMapLayout::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->LayoutStrategy != NULL) { diff -crB VTK/Infovis/vtkTreeMapLayout.h VTKNew/Infovis/vtkTreeMapLayout.h *** VTK/Infovis/vtkTreeMapLayout.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Infovis/vtkTreeMapLayout.h 2013-09-24 11:57:22.928978500 +0200 *************** *** 79,85 **** // Description: // Get the modification time of the layout algorithm. ! virtual unsigned long GetMTime(); protected: vtkTreeMapLayout(); --- 79,85 ---- // Description: // Get the modification time of the layout algorithm. ! virtual vtkTimeStamp GetMTime(); protected: vtkTreeMapLayout(); diff -crB VTK/IO/vtkMCubesReader.cxx VTKNew/IO/vtkMCubesReader.cxx *** VTK/IO/vtkMCubesReader.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkMCubesReader.cxx 2013-09-24 10:05:15.757206300 +0200 *************** *** 435,444 **** } } ! unsigned long int vtkMCubesReader::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Locator != NULL ) { --- 435,444 ---- } } ! vtkTimeStamp vtkMCubesReader::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Locator != NULL ) { diff -crB VTK/IO/vtkMCubesReader.h VTKNew/IO/vtkMCubesReader.h *** VTK/IO/vtkMCubesReader.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkMCubesReader.h 2013-09-24 10:05:16.972275800 +0200 *************** *** 130,136 **** // Description: // Return the mtime also considering the locator. ! unsigned long GetMTime(); protected: vtkMCubesReader(); --- 130,136 ---- // Description: // Return the mtime also considering the locator. ! vtkTimeStamp GetMTime(); protected: vtkMCubesReader(); diff -crB VTK/IO/vtkOffsetsManagerArray.h VTKNew/IO/vtkOffsetsManagerArray.h *** VTK/IO/vtkOffsetsManagerArray.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkOffsetsManagerArray.h 2013-09-24 10:20:34.527757000 +0200 *************** *** 60,66 **** // Construct with default (unsigned long)-1 MTime OffsetsManager() { ! this->LastMTime = static_cast(-1); //almost invalid state } ~OffsetsManager() { --- 60,66 ---- // Construct with default (unsigned long)-1 MTime OffsetsManager() { ! this->LastMTime.SetToMaximum(); } ~OffsetsManager() { *************** *** 93,104 **** assert( t < this->OffsetValues.size()); return this->OffsetValues[t]; } ! unsigned long &GetLastMTime() { return this->LastMTime; } private: ! unsigned long LastMTime; // Previously written dataarray mtime // at some point these vectors could become a vector of map // where the string is the name of the offset, but that would be pretty fat // and slow, but if another couple offsets are added then we should --- 93,104 ---- assert( t < this->OffsetValues.size()); return this->OffsetValues[t]; } ! vtkTimeStamp &GetLastMTime() { return this->LastMTime; } private: ! vtkTimeStamp LastMTime; // Previously written dataarray mtime // at some point these vectors could become a vector of map // where the string is the name of the offset, but that would be pretty fat // and slow, but if another couple offsets are added then we should diff -crB VTK/IO/vtkOpenFOAMReader.cxx VTKNew/IO/vtkOpenFOAMReader.cxx *** VTK/IO/vtkOpenFOAMReader.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkOpenFOAMReader.cxx 2013-09-24 10:20:34.588760500 +0200 *************** *** 8117,8128 **** this->CellDataArraySelection = vtkDataArraySelection::New(); this->PointDataArraySelection = vtkDataArraySelection::New(); this->LagrangianDataArraySelection = vtkDataArraySelection::New(); ! ! this->PatchSelectionMTimeOld = 0; ! this->CellSelectionMTimeOld = 0; ! this->PointSelectionMTimeOld = 0; ! this->LagrangianSelectionMTimeOld = 0; ! // for creating cell-to-point translated data this->CreateCellToPoint = 1; this->CreateCellToPointOld = 1; --- 8117,8123 ---- this->CellDataArraySelection = vtkDataArraySelection::New(); this->PointDataArraySelection = vtkDataArraySelection::New(); this->LagrangianDataArraySelection = vtkDataArraySelection::New(); ! // for creating cell-to-point translated data this->CreateCellToPoint = 1; this->CreateCellToPointOld = 1; *************** *** 8229,8235 **** void vtkOpenFOAMReader::SetSelectionArrayStatus(vtkDataArraySelection *s, const char* name, int status) { ! unsigned long int mTime = s->GetMTime(); if (status) { s->EnableArray(name); --- 8224,8230 ---- void vtkOpenFOAMReader::SetSelectionArrayStatus(vtkDataArraySelection *s, const char* name, int status) { ! vtkTimeStamp mTime = s->GetMTime(); if (status) { s->EnableArray(name); *************** *** 8252,8258 **** void vtkOpenFOAMReader::DisableAllSelectionArrays(vtkDataArraySelection *s) { ! unsigned long int mTime = s->GetMTime(); s->DisableAllArrays(); if (mTime != s->GetMTime()) { --- 8247,8253 ---- void vtkOpenFOAMReader::DisableAllSelectionArrays(vtkDataArraySelection *s) { ! vtkTimeStamp mTime = s->GetMTime(); s->DisableAllArrays(); if (mTime != s->GetMTime()) { *************** *** 8262,8268 **** void vtkOpenFOAMReader::EnableAllSelectionArrays(vtkDataArraySelection *s) { ! unsigned long int mTime = s->GetMTime(); s->EnableAllArrays(); if (mTime != s->GetMTime()) { --- 8257,8263 ---- void vtkOpenFOAMReader::EnableAllSelectionArrays(vtkDataArraySelection *s) { ! vtkTimeStamp mTime = s->GetMTime(); s->EnableAllArrays(); if (mTime != s->GetMTime()) { *************** *** 8582,8588 **** = vtkOpenFOAMReaderPrivate::SafeDownCast(this->Readers->GetNextItemAsObject())) != NULL) { ! const unsigned long mTime = reader->GetMTime(); reader->SetTimeValue(timeValue); if (reader->GetMTime() != mTime) { --- 8577,8583 ---- = vtkOpenFOAMReaderPrivate::SafeDownCast(this->Readers->GetNextItemAsObject())) != NULL) { ! vtkTimeStamp mTime = reader->GetMTime(); reader->SetTimeValue(timeValue); if (reader->GetMTime() != mTime) { diff -crB VTK/IO/vtkOpenFOAMReader.h VTKNew/IO/vtkOpenFOAMReader.h *** VTK/IO/vtkOpenFOAMReader.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkOpenFOAMReader.h 2013-09-24 10:05:16.806266300 +0200 *************** *** 266,275 **** vtkDataArraySelection *LagrangianDataArraySelection; // old selection status ! unsigned long int PatchSelectionMTimeOld; ! unsigned long int CellSelectionMTimeOld; ! unsigned long int PointSelectionMTimeOld; ! unsigned long int LagrangianSelectionMTimeOld; // preserved old information vtkStdString *FileNameOld; --- 266,275 ---- vtkDataArraySelection *LagrangianDataArraySelection; // old selection status ! vtkTimeStamp PatchSelectionMTimeOld; ! vtkTimeStamp CellSelectionMTimeOld; ! vtkTimeStamp PointSelectionMTimeOld; ! vtkTimeStamp LagrangianSelectionMTimeOld; // preserved old information vtkStdString *FileNameOld; diff -crB VTK/IO/vtkRowQueryToTable.cxx VTKNew/IO/vtkRowQueryToTable.cxx *** VTK/IO/vtkRowQueryToTable.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkRowQueryToTable.cxx 2013-09-24 10:05:15.744205600 +0200 *************** *** 60,71 **** vtkCxxSetObjectMacro(vtkRowQueryToTable, Query, vtkRowQuery); ! unsigned long vtkRowQueryToTable::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); if (this->Query != NULL) { ! unsigned long time = this->Query->GetMTime(); mTime = (time > mTime ? time : mTime); } return mTime; --- 60,71 ---- vtkCxxSetObjectMacro(vtkRowQueryToTable, Query, vtkRowQuery); ! vtkTimeStamp vtkRowQueryToTable::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); if (this->Query != NULL) { ! vtkTimeStamp time = this->Query->GetMTime(); mTime = (time > mTime ? time : mTime); } return mTime; diff -crB VTK/IO/vtkRowQueryToTable.h VTKNew/IO/vtkRowQueryToTable.h *** VTK/IO/vtkRowQueryToTable.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkRowQueryToTable.h 2013-09-24 10:05:16.784265000 +0200 *************** *** 53,59 **** // Description: // Update the modified time based on the query. ! unsigned long GetMTime(); protected: vtkRowQueryToTable(); --- 53,59 ---- // Description: // Update the modified time based on the query. ! vtkTimeStamp GetMTime(); protected: vtkRowQueryToTable(); diff -crB VTK/IO/vtkSTLReader.cxx VTKNew/IO/vtkSTLReader.cxx *** VTK/IO/vtkSTLReader.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkSTLReader.cxx 2013-09-24 10:05:15.739205300 +0200 *************** *** 57,66 **** // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! unsigned long vtkSTLReader::GetMTime() { ! unsigned long mTime1 = this->Superclass::GetMTime(); ! unsigned long mTime2; if (this->Locator) { --- 57,66 ---- // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! vtkTimeStamp vtkSTLReader::GetMTime() { ! vtkTimeStamp mTime1 = this->Superclass::GetMTime(); ! vtkTimeStamp mTime2; if (this->Locator) { diff -crB VTK/IO/vtkSTLReader.h VTKNew/IO/vtkSTLReader.h *** VTK/IO/vtkSTLReader.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkSTLReader.h 2013-09-24 10:05:16.763263800 +0200 *************** *** 52,58 **** // Description: // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! unsigned long GetMTime(); // Description: // Specify file name of stereo lithography file. --- 52,58 ---- // Description: // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! vtkTimeStamp GetMTime(); // Description: // Specify file name of stereo lithography file. diff -crB VTK/IO/vtkUGFacetReader.cxx VTKNew/IO/vtkUGFacetReader.cxx *** VTK/IO/vtkUGFacetReader.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkUGFacetReader.cxx 2013-09-24 10:05:15.732204900 +0200 *************** *** 61,70 **** // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! unsigned long vtkUGFacetReader::GetMTime() { ! unsigned long mTime1=this->Superclass::GetMTime(); ! unsigned long mTime2; if (this->Locator) { --- 61,70 ---- // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! vtkTimeStamp vtkUGFacetReader::GetMTime() { ! vtkTimeStamp mTime1=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2; if (this->Locator) { diff -crB VTK/IO/vtkUGFacetReader.h VTKNew/IO/vtkUGFacetReader.h *** VTK/IO/vtkUGFacetReader.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkUGFacetReader.h 2013-09-24 10:05:16.661258000 +0200 *************** *** 40,46 **** // Description: // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! unsigned long GetMTime(); // Description: // Specify Unigraphics file name. --- 40,46 ---- // Description: // Overload standard modified time function. If locator is modified, // then this object is modified as well. ! vtkTimeStamp GetMTime(); // Description: // Specify Unigraphics file name. diff -crB VTK/IO/vtkWriter.cxx VTKNew/IO/vtkWriter.cxx *** VTK/IO/vtkWriter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkWriter.cxx 2013-09-24 10:12:41.003672900 +0200 *************** *** 128,139 **** } } ! unsigned long lastUpdateTime = this->GetInput(0)->GetUpdateTime(); for (idx = 1; idx < this->GetNumberOfInputPorts(); ++idx) { if (this->GetInput(idx)) { ! unsigned long updateTime = this->GetInput(idx)->GetUpdateTime(); if ( updateTime > lastUpdateTime ) { lastUpdateTime = updateTime; --- 128,139 ---- } } ! vtkTimeStamp lastUpdateTime = this->GetInput(0)->GetUpdateTime(); for (idx = 1; idx < this->GetNumberOfInputPorts(); ++idx) { if (this->GetInput(idx)) { ! vtkTimeStamp updateTime = this->GetInput(idx)->GetUpdateTime(); if ( updateTime > lastUpdateTime ) { lastUpdateTime = updateTime; diff -crB VTK/IO/vtkXMLUnstructuredDataWriter.cxx VTKNew/IO/vtkXMLUnstructuredDataWriter.cxx *** VTK/IO/vtkXMLUnstructuredDataWriter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkXMLUnstructuredDataWriter.cxx 2013-09-24 10:05:15.722204300 +0200 *************** *** 739,746 **** // Set the range of progress for the connectivity array. this->SetProgressRange(progressRange, i, fractions); ! unsigned long mtime = allcells[i]->GetMTime(); ! unsigned long &cellsMTime = cellsManager->GetElement(i).GetLastMTime(); // Only write cells if MTime has changed if( cellsMTime != mtime ) { --- 739,746 ---- // Set the range of progress for the connectivity array. this->SetProgressRange(progressRange, i, fractions); ! vtkTimeStamp mtime = allcells[i]->GetMTime(); ! vtkTimeStamp &cellsMTime = cellsManager->GetElement(i).GetLastMTime(); // Only write cells if MTime has changed if( cellsMTime != mtime ) { diff -crB VTK/IO/vtkXMLWriter.cxx VTKNew/IO/vtkXMLWriter.cxx *** VTK/IO/vtkXMLWriter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/IO/vtkXMLWriter.cxx 2013-09-24 10:05:15.716204000 +0200 *************** *** 2196,2204 **** for(int i=0; i < pd->GetNumberOfArrays(); ++i) { this->SetProgressRange(progressRange, i, pd->GetNumberOfArrays()); ! unsigned long mtime = pd->GetMTime(); // Only write pd if MTime has changed ! unsigned long &pdMTime = pdManager->GetElement(i).GetLastMTime(); vtkAbstractArray* a = this->CreateArrayForPoints(pd->GetAbstractArray(i)); if( pdMTime != mtime ) { --- 2196,2204 ---- for(int i=0; i < pd->GetNumberOfArrays(); ++i) { this->SetProgressRange(progressRange, i, pd->GetNumberOfArrays()); ! vtkTimeStamp mtime = pd->GetMTime(); // Only write pd if MTime has changed ! vtkTimeStamp &pdMTime = pdManager->GetElement(i).GetLastMTime(); vtkAbstractArray* a = this->CreateArrayForPoints(pd->GetAbstractArray(i)); if( pdMTime != mtime ) { *************** *** 2290,2298 **** for(i=0; i < cd->GetNumberOfArrays(); ++i) { this->SetProgressRange(progressRange, i, cd->GetNumberOfArrays()); ! unsigned long mtime = cd->GetMTime(); // Only write pd if MTime has changed ! unsigned long &cdMTime = cdManager->GetElement(i).GetLastMTime(); vtkAbstractArray* a = this->CreateArrayForCells(cd->GetAbstractArray(i)); if( cdMTime != mtime ) { --- 2290,2298 ---- for(i=0; i < cd->GetNumberOfArrays(); ++i) { this->SetProgressRange(progressRange, i, cd->GetNumberOfArrays()); ! vtkTimeStamp mtime = cd->GetMTime(); // Only write pd if MTime has changed ! vtkTimeStamp &cdMTime = cdManager->GetElement(i).GetLastMTime(); vtkAbstractArray* a = this->CreateArrayForCells(cd->GetAbstractArray(i)); if( cdMTime != mtime ) { *************** *** 2394,2402 **** // Only write points if they exist. if(points) { ! unsigned long mtime = points->GetMTime(); // Only write points if MTime has changed ! unsigned long &pointsMTime = ptManager->GetLastMTime(); // since points->Data is a vtkDataArray. vtkDataArray* outPoints = vtkDataArray::SafeDownCast( this->CreateArrayForPoints(points->GetData())); --- 2394,2402 ---- // Only write points if they exist. if(points) { ! vtkTimeStamp mtime = points->GetMTime(); // Only write points if MTime has changed ! vtkTimeStamp &pointsMTime = ptManager->GetLastMTime(); // since points->Data is a vtkDataArray. vtkDataArray* outPoints = vtkDataArray::SafeDownCast( this->CreateArrayForPoints(points->GetData())); *************** *** 2602,2610 **** for(int i=0; i<3; ++i) { this->SetProgressRange(progressRange, i, fractions); ! unsigned long mtime = allcoords[i]->GetMTime(); // Only write pd if MTime has changed ! unsigned long &coordMTime = coordManager->GetElement(i).GetLastMTime(); if( coordMTime != mtime ) { coordMTime = mtime; --- 2602,2610 ---- for(int i=0; i<3; ++i) { this->SetProgressRange(progressRange, i, fractions); ! vtkTimeStamp mtime = allcoords[i]->GetMTime(); // Only write pd if MTime has changed ! vtkTimeStamp &coordMTime = coordManager->GetElement(i).GetLastMTime(); if( coordMTime != mtime ) { coordMTime = mtime; diff -crB VTK/Parallel/vtkExtractCTHPart.cxx VTKNew/Parallel/vtkExtractCTHPart.cxx *** VTK/Parallel/vtkExtractCTHPart.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Parallel/vtkExtractCTHPart.cxx 2013-09-24 12:21:07.290447300 +0200 *************** *** 121,130 **** //----------------------------------------------------------------------------- // Overload standard modified time function. If clip plane is modified, // then this object is modified as well. ! unsigned long vtkExtractCTHPart::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if (this->ClipPlane) { --- 121,130 ---- //----------------------------------------------------------------------------- // Overload standard modified time function. If clip plane is modified, // then this object is modified as well. ! vtkTimeStamp vtkExtractCTHPart::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if (this->ClipPlane) { diff -crB VTK/Parallel/vtkExtractCTHPart.h VTKNew/Parallel/vtkExtractCTHPart.h *** VTK/Parallel/vtkExtractCTHPart.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Parallel/vtkExtractCTHPart.h 2013-09-24 12:22:10.123041100 +0200 *************** *** 90,96 **** // Description: // Look at clip plane to compute MTime. ! unsigned long GetMTime(); // Description: // Set the controller used to coordinate parallel processing. --- 90,96 ---- // Description: // Look at clip plane to compute MTime. ! vtkTimeStamp GetMTime(); // Description: // Set the controller used to coordinate parallel processing. diff -crB VTK/Parallel/vtkPOpenFOAMReader.h VTKNew/Parallel/vtkPOpenFOAMReader.h *** VTK/Parallel/vtkPOpenFOAMReader.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Parallel/vtkPOpenFOAMReader.h 2013-09-24 12:26:21.074394700 +0200 *************** *** 64,70 **** private: vtkMultiProcessController *Controller; caseType CaseType; ! unsigned long MTimeOld; int MaximumNumberOfPieces; int NumProcesses; int ProcessId; --- 64,70 ---- private: vtkMultiProcessController *Controller; caseType CaseType; ! vtkTimeStamp MTimeOld; int MaximumNumberOfPieces; int NumProcesses; int ProcessId; diff -crB VTK/Rendering/vtkActor.cxx VTKNew/Rendering/vtkActor.cxx *** VTK/Rendering/vtkActor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkActor.cxx 2013-09-24 10:05:15.679201800 +0200 *************** *** 392,401 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkActor::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Property != NULL ) { --- 392,401 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkActor::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Property != NULL ) { *************** *** 419,428 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkActor::GetRedrawMTime() { ! unsigned long mTime=this->GetMTime(); ! unsigned long time; if ( this->Mapper != NULL ) { --- 419,428 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkActor::GetRedrawMTime() { ! vtkTimeStamp mTime=this->GetMTime(); ! vtkTimeStamp time; if ( this->Mapper != NULL ) { diff -crB VTK/Rendering/vtkActor.h VTKNew/Rendering/vtkActor.h *** VTK/Rendering/vtkActor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkActor.h 2013-09-24 10:05:16.280236200 +0200 *************** *** 140,153 **** // Description: // Get the actors mtime plus consider its properties and texture if set. ! unsigned long int GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, textures // etc. ! virtual unsigned long GetRedrawMTime(); // Description: // The following methods are for compatibility. The methods will be deprecated --- 140,153 ---- // Description: // Get the actors mtime plus consider its properties and texture if set. ! vtkTimeStamp GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, textures // etc. ! virtual vtkTimeStamp GetRedrawMTime(); // Description: // The following methods are for compatibility. The methods will be deprecated diff -crB VTK/Rendering/vtkAssembly.cxx VTKNew/Rendering/vtkAssembly.cxx *** VTK/Rendering/vtkAssembly.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkAssembly.cxx 2013-09-24 10:54:59.985894400 +0200 *************** *** 428,437 **** return this->Bounds; } ! unsigned long int vtkAssembly::GetMTime() { ! unsigned long mTime=this->vtkProp3D::GetMTime(); ! unsigned long time; vtkProp3D *prop; vtkCollectionSimpleIterator pit; --- 428,437 ---- return this->Bounds; } ! vtkTimeStamp vtkAssembly::GetMTime() { ! vtkTimeStamp mTime=this->vtkProp3D::GetMTime(); ! vtkTimeStamp time; vtkProp3D *prop; vtkCollectionSimpleIterator pit; diff -crB VTK/Rendering/vtkAssembly.h VTKNew/Rendering/vtkAssembly.h *** VTK/Rendering/vtkAssembly.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkAssembly.h 2013-09-24 10:55:03.517096400 +0200 *************** *** 131,137 **** // Description: // Override default GetMTime method to also consider all of the // assembly's parts. ! unsigned long int GetMTime(); // Description: // Shallow copy of an assembly. Overloads the virtual vtkProp method. --- 131,137 ---- // Description: // Override default GetMTime method to also consider all of the // assembly's parts. ! vtkTimeStamp GetMTime(); // Description: // Shallow copy of an assembly. Overloads the virtual vtkProp method. diff -crB VTK/Rendering/vtkAxisActor2D.cxx VTKNew/Rendering/vtkAxisActor2D.cxx *** VTK/Rendering/vtkAxisActor2D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkAxisActor2D.cxx 2013-09-24 10:05:15.673201500 +0200 *************** *** 521,527 **** // but at this point the check on LabelFormat is "included" in // UpdateAdjustedRange(), which is the function that update // AdjustedRangeBuildTime or not. ! unsigned long labeltime = this->AdjustedRangeBuildTime; if (this->AdjustedRangeBuildTime > this->BuildTime) { for (i = 0; i < this->AdjustedNumberOfLabels; i++) --- 521,527 ---- // but at this point the check on LabelFormat is "included" in // UpdateAdjustedRange(), which is the function that update // AdjustedRangeBuildTime or not. ! vtkTimeStamp labeltime = this->AdjustedRangeBuildTime; if (this->AdjustedRangeBuildTime > this->BuildTime) { for (i = 0; i < this->AdjustedNumberOfLabels; i++) diff -crB VTK/Rendering/vtkCamera.cxx VTKNew/Rendering/vtkCamera.cxx *** VTK/Rendering/vtkCamera.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkCamera.cxx 2013-09-24 10:05:15.668201200 +0200 *************** *** 1252,1258 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkCamera::GetViewingRaysMTime() { return this->ViewingRaysMTime.GetMTime(); } --- 1252,1258 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkCamera::GetViewingRaysMTime() { return this->ViewingRaysMTime.GetMTime(); } diff -crB VTK/Rendering/vtkCamera.h VTKNew/Rendering/vtkCamera.h *** VTK/Rendering/vtkCamera.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkCamera.h 2013-09-24 11:34:44.905304000 +0200 *************** *** 456,462 **** // Description: // Return the MTime that concerns recomputing the view rays of the camera. ! unsigned long GetViewingRaysMTime(); // Description: // Mark that something has changed which requires the view rays --- 456,462 ---- // Description: // Return the MTime that concerns recomputing the view rays of the camera. ! vtkTimeStamp GetViewingRaysMTime(); // Description: // Mark that something has changed which requires the view rays diff -crB VTK/Rendering/vtkCameraActor.cxx VTKNew/Rendering/vtkCameraActor.cxx *** VTK/Rendering/vtkCameraActor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkCameraActor.cxx 2013-09-24 10:05:15.662200900 +0200 *************** *** 111,122 **** } //------------------------------------------------------------------------- ! unsigned long int vtkCameraActor::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); if(this->Camera!=0) { ! unsigned long time; time = this->Camera->GetMTime(); if(time>mTime) { --- 111,122 ---- } //------------------------------------------------------------------------- ! vtkTimeStamp vtkCameraActor::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); if(this->Camera!=0) { ! vtkTimeStamp time; time = this->Camera->GetMTime(); if(time>mTime) { diff -crB VTK/Rendering/vtkCameraActor.h VTKNew/Rendering/vtkCameraActor.h *** VTK/Rendering/vtkCameraActor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkCameraActor.h 2013-09-24 10:55:03.370088000 +0200 *************** *** 69,75 **** // Description: // Get the actors mtime plus consider its properties and texture if set. ! unsigned long int GetMTime(); // Description: // Get property of the internal actor. --- 69,75 ---- // Description: // Get the actors mtime plus consider its properties and texture if set. ! vtkTimeStamp GetMTime(); // Description: // Get property of the internal actor. diff -crB VTK/Rendering/vtkCameraInterpolator.cxx VTKNew/Rendering/vtkCameraInterpolator.cxx *** VTK/Rendering/vtkCameraInterpolator.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkCameraInterpolator.cxx 2013-09-24 10:05:15.655200500 +0200 *************** *** 105,114 **** } //---------------------------------------------------------------------------- ! unsigned long vtkCameraInterpolator::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long posMTime, fpMTime, vupMTime, vaMTime, psMTime, crMTime; if ( this->PositionInterpolator ) { --- 105,114 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkCameraInterpolator::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp posMTime, fpMTime, vupMTime, vaMTime, psMTime, crMTime; if ( this->PositionInterpolator ) { diff -crB VTK/Rendering/vtkCameraInterpolator.h VTKNew/Rendering/vtkCameraInterpolator.h *** VTK/Rendering/vtkCameraInterpolator.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkCameraInterpolator.h 2013-09-24 10:05:16.124227300 +0200 *************** *** 175,181 **** // Description: // Override GetMTime() because we depend on the interpolators which may be // modified outside of this class. ! unsigned long GetMTime(); protected: vtkCameraInterpolator(); --- 175,181 ---- // Description: // Override GetMTime() because we depend on the interpolators which may be // modified outside of this class. ! vtkTimeStamp GetMTime(); protected: vtkCameraInterpolator(); diff -crB VTK/Rendering/vtkDataSetMapper.cxx VTKNew/Rendering/vtkDataSetMapper.cxx *** VTK/Rendering/vtkDataSetMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkDataSetMapper.cxx 2013-09-24 10:05:13.852097300 +0200 *************** *** 183,192 **** } //---------------------------------------------------------------------------- ! unsigned long vtkDataSetMapper::GetMTime() { ! unsigned long mTime=this->vtkMapper::GetMTime(); ! unsigned long time; if ( this->LookupTable != NULL ) { --- 183,192 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkDataSetMapper::GetMTime() { ! vtkTimeStamp mTime=this->vtkMapper::GetMTime(); ! vtkTimeStamp time; if ( this->LookupTable != NULL ) { diff -crB VTK/Rendering/vtkDataSetMapper.h VTKNew/Rendering/vtkDataSetMapper.h *** VTK/Rendering/vtkDataSetMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkDataSetMapper.h 2013-09-24 10:12:40.860664800 +0200 *************** *** 49,55 **** // Description: // Get the mtime also considering the lookup table. ! unsigned long GetMTime(); // Description: // Set the Input of this mapper. --- 49,55 ---- // Description: // Get the mtime also considering the lookup table. ! vtkTimeStamp GetMTime(); // Description: // Set the Input of this mapper. diff -crB VTK/Rendering/vtkDistanceToCamera.cxx VTKNew/Rendering/vtkDistanceToCamera.cxx *** VTK/Rendering/vtkDistanceToCamera.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkDistanceToCamera.cxx 2013-09-24 10:54:59.971893600 +0200 *************** *** 66,72 **** } } ! unsigned long vtkDistanceToCamera::GetMTime() { // Check for minimal changes if (this->Renderer) --- 66,72 ---- } } ! vtkTimeStamp vtkDistanceToCamera::GetMTime() { // Check for minimal changes if (this->Renderer) diff -crB VTK/Rendering/vtkDistanceToCamera.h VTKNew/Rendering/vtkDistanceToCamera.h *** VTK/Rendering/vtkDistanceToCamera.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkDistanceToCamera.h 2013-09-24 10:55:03.081071400 +0200 *************** *** 59,65 **** // Description: // The modified time of this filter. ! virtual unsigned long GetMTime(); protected: vtkDistanceToCamera(); --- 59,65 ---- // Description: // The modified time of this filter. ! virtual vtkTimeStamp GetMTime(); protected: vtkDistanceToCamera(); diff -crB VTK/Rendering/vtkExporter.cxx VTKNew/Rendering/vtkExporter.cxx *** VTK/Rendering/vtkExporter.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkExporter.cxx 2013-09-24 10:54:59.966893300 +0200 *************** *** 165,174 **** } } ! unsigned long int vtkExporter::GetMTime() { ! unsigned long mTime=this-> vtkObject::GetMTime(); ! unsigned long time; if ( this->RenderWindow != NULL ) { --- 165,174 ---- } } ! vtkTimeStamp vtkExporter::GetMTime() { ! vtkTimeStamp mTime=this-> vtkObject::GetMTime(); ! vtkTimeStamp time; if ( this->RenderWindow != NULL ) { diff -crB VTK/Rendering/vtkExporter.h VTKNew/Rendering/vtkExporter.h *** VTK/Rendering/vtkExporter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkExporter.h 2013-09-24 10:55:02.792054900 +0200 *************** *** 85,91 **** // Description: // Returns the MTime also considering the RenderWindow. ! unsigned long GetMTime(); protected: vtkExporter(); --- 85,91 ---- // Description: // Returns the MTime also considering the RenderWindow. ! vtkTimeStamp GetMTime(); protected: vtkExporter(); diff -crB VTK/Rendering/vtkGraphMapper.cxx VTKNew/Rendering/vtkGraphMapper.cxx *** VTK/Rendering/vtkGraphMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkGraphMapper.cxx 2013-09-24 10:54:59.961893000 +0200 *************** *** 741,750 **** } //---------------------------------------------------------------------------- ! unsigned long vtkGraphMapper::GetMTime() { ! unsigned long mTime=this->vtkMapper::GetMTime(); ! unsigned long time; if ( this->LookupTable != NULL ) { --- 741,750 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkGraphMapper::GetMTime() { ! vtkTimeStamp mTime=this->vtkMapper::GetMTime(); ! vtkTimeStamp time; if ( this->LookupTable != NULL ) { diff -crB VTK/Rendering/vtkGraphMapper.h VTKNew/Rendering/vtkGraphMapper.h *** VTK/Rendering/vtkGraphMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkGraphMapper.h 2013-09-24 10:55:02.648046700 +0200 *************** *** 184,190 **** // Description: // Get the mtime also considering the lookup table. ! unsigned long GetMTime(); // Description: // Set the Input of this mapper. --- 184,190 ---- // Description: // Get the mtime also considering the lookup table. ! vtkTimeStamp GetMTime(); // Description: // Set the Input of this mapper. diff -crB VTK/Rendering/vtkGraphToGlyphs.cxx VTKNew/Rendering/vtkGraphToGlyphs.cxx *** VTK/Rendering/vtkGraphToGlyphs.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkGraphToGlyphs.cxx 2013-09-24 10:54:59.954892600 +0200 *************** *** 92,100 **** return this->DistanceToCamera->GetScaling(); } ! unsigned long vtkGraphToGlyphs::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); if (this->GlyphType != VERTEX && this->DistanceToCamera->GetMTime() > mtime) { --- 92,100 ---- return this->DistanceToCamera->GetScaling(); } ! vtkTimeStamp vtkGraphToGlyphs::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); if (this->GlyphType != VERTEX && this->DistanceToCamera->GetMTime() > mtime) { diff -crB VTK/Rendering/vtkGraphToGlyphs.h VTKNew/Rendering/vtkGraphToGlyphs.h *** VTK/Rendering/vtkGraphToGlyphs.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkGraphToGlyphs.h 2013-09-24 10:55:02.355029900 +0200 *************** *** 96,102 **** // Description: // The modified time of this filter. ! virtual unsigned long GetMTime(); protected: vtkGraphToGlyphs(); --- 96,102 ---- // Description: // The modified time of this filter. ! virtual vtkTimeStamp GetMTime(); protected: vtkGraphToGlyphs(); diff -crB VTK/Rendering/vtkImageMapper.cxx VTKNew/Rendering/vtkImageMapper.cxx *** VTK/Rendering/vtkImageMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageMapper.cxx 2013-09-24 10:54:59.949892400 +0200 *************** *** 81,89 **** this->GetExecutive()->GetInputData(0, 0)); } ! unsigned long int vtkImageMapper::GetMTime() { ! unsigned long mTime=this->vtkMapper2D::GetMTime(); return mTime; } --- 81,89 ---- this->GetExecutive()->GetInputData(0, 0)); } ! vtkTimeStamp vtkImageMapper::GetMTime() { ! vtkTimeStamp mTime=this->vtkMapper2D::GetMTime(); return mTime; } diff -crB VTK/Rendering/vtkImageMapper.h VTKNew/Rendering/vtkImageMapper.h *** VTK/Rendering/vtkImageMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageMapper.h 2013-09-24 10:55:01.925005300 +0200 *************** *** 43,49 **** // Description: // Override Modifiedtime as we have added a lookuptable ! unsigned long int GetMTime(); // Description: // Set/Get the window value for window/level --- 43,49 ---- // Description: // Override Modifiedtime as we have added a lookuptable ! vtkTimeStamp GetMTime(); // Description: // Set/Get the window value for window/level diff -crB VTK/Rendering/vtkImageProperty.cxx VTKNew/Rendering/vtkImageProperty.cxx *** VTK/Rendering/vtkImageProperty.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageProperty.cxx 2013-09-24 10:54:59.944892100 +0200 *************** *** 109,118 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImageProperty::GetMTime() { ! unsigned long mTime = this->vtkObject::GetMTime(); ! unsigned long time; if (this->LookupTable) { --- 109,118 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageProperty::GetMTime() { ! vtkTimeStamp mTime = this->vtkObject::GetMTime(); ! vtkTimeStamp time; if (this->LookupTable) { diff -crB VTK/Rendering/vtkImageProperty.h VTKNew/Rendering/vtkImageProperty.h *** VTK/Rendering/vtkImageProperty.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageProperty.h 2013-09-24 10:55:02.066013400 +0200 *************** *** 139,145 **** // Description: // Get the MTime for this property. If the lookup table is set, // the mtime will include the mtime of the lookup table. ! unsigned long GetMTime(); protected: vtkImageProperty(); --- 139,145 ---- // Description: // Get the MTime for this property. If the lookup table is set, // the mtime will include the mtime of the lookup table. ! vtkTimeStamp GetMTime(); protected: vtkImageProperty(); diff -crB VTK/Rendering/vtkImageResliceMapper.cxx VTKNew/Rendering/vtkImageResliceMapper.cxx *** VTK/Rendering/vtkImageResliceMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageResliceMapper.cxx 2013-09-24 10:54:59.938891700 +0200 *************** *** 116,122 **** void vtkImageResliceMapper::SetInterpolator( vtkAbstractImageInterpolator *interpolator) { ! unsigned long mtime = this->ImageReslice->GetMTime(); this->ImageReslice->SetInterpolator(interpolator); --- 116,122 ---- void vtkImageResliceMapper::SetInterpolator( vtkAbstractImageInterpolator *interpolator) { ! vtkTimeStamp mtime = this->ImageReslice->GetMTime(); this->ImageReslice->SetInterpolator(interpolator); *************** *** 1424,1439 **** } //---------------------------------------------------------------------------- ! unsigned long vtkImageResliceMapper::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); // Check whether interpolator has changed vtkAbstractImageInterpolator *interpolator = this->ImageReslice->GetInterpolator(); if (interpolator) { ! unsigned long mTime2 = interpolator->GetMTime(); if (mTime2 > mTime) { mTime = mTime2; --- 1424,1439 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageResliceMapper::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); // Check whether interpolator has changed vtkAbstractImageInterpolator *interpolator = this->ImageReslice->GetInterpolator(); if (interpolator) { ! vtkTimeStamp mTime2 = interpolator->GetMTime(); if (mTime2 > mTime) { mTime = mTime2; *************** *** 1449,1469 **** if (ren) { vtkCamera *camera = ren->GetActiveCamera(); ! unsigned long mTime2 = camera->GetMTime(); mTime = (mTime2 > mTime ? mTime2 : mTime); } } if (!this->SliceFacesCamera || !this->SliceAtFocalPoint) { ! unsigned long sTime = this->SlicePlane->GetMTime(); mTime = (sTime > mTime ? sTime : mTime); } vtkImageSlice *prop = this->GetCurrentProp(); if (prop != NULL) { ! unsigned long mTime2 = prop->GetUserTransformMatrixMTime(); mTime = (mTime2 > mTime ? mTime2 : mTime); vtkImageProperty *property = prop->GetProperty(); --- 1449,1469 ---- if (ren) { vtkCamera *camera = ren->GetActiveCamera(); ! vtkTimeStamp mTime2 = camera->GetMTime(); mTime = (mTime2 > mTime ? mTime2 : mTime); } } if (!this->SliceFacesCamera || !this->SliceAtFocalPoint) { ! vtkTimeStamp sTime = this->SlicePlane->GetMTime(); mTime = (sTime > mTime ? sTime : mTime); } vtkImageSlice *prop = this->GetCurrentProp(); if (prop != NULL) { ! vtkTimeStamp mTime2 = prop->GetUserTransformMatrixMTime(); mTime = (mTime2 > mTime ? mTime2 : mTime); vtkImageProperty *property = prop->GetProperty(); diff -crB VTK/Rendering/vtkImageResliceMapper.h VTKNew/Rendering/vtkImageResliceMapper.h *** VTK/Rendering/vtkImageResliceMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageResliceMapper.h 2013-09-24 10:55:01.779997000 +0200 *************** *** 137,143 **** // Description: // Get the mtime for the mapper. ! unsigned long GetMTime(); // Description: // The bounding box (array of six doubles) of the data expressed as --- 137,143 ---- // Description: // Get the mtime for the mapper. ! vtkTimeStamp GetMTime(); // Description: // The bounding box (array of six doubles) of the data expressed as diff -crB VTK/Rendering/vtkImageSlice.cxx VTKNew/Rendering/vtkImageSlice.cxx *** VTK/Rendering/vtkImageSlice.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageSlice.cxx 2013-09-24 10:54:59.931891300 +0200 *************** *** 375,384 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImageSlice::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long time; if ( this->Property != NULL ) { --- 375,384 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageSlice::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Property != NULL ) { *************** *** 402,411 **** } //---------------------------------------------------------------------------- ! unsigned long vtkImageSlice::GetRedrawMTime() { ! unsigned long mTime = this->GetMTime(); ! unsigned long time; if ( this->Mapper != NULL ) { --- 402,411 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageSlice::GetRedrawMTime() { ! vtkTimeStamp mTime = this->GetMTime(); ! vtkTimeStamp time; if ( this->Mapper != NULL ) { diff -crB VTK/Rendering/vtkImageSlice.h VTKNew/Rendering/vtkImageSlice.h *** VTK/Rendering/vtkImageSlice.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageSlice.h 2013-09-24 10:05:16.168229800 +0200 *************** *** 79,92 **** // Description: // Return the MTime also considering the property etc. ! unsigned long int GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, mappers, // etc. ! unsigned long GetRedrawMTime(); // Description: // Shallow copy of this vtkImageSlice. Overloads the virtual vtkProp method. --- 79,92 ---- // Description: // Return the MTime also considering the property etc. ! vtkTimeStamp GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, mappers, // etc. ! vtkTimeStamp GetRedrawMTime(); // Description: // Shallow copy of this vtkImageSlice. Overloads the virtual vtkProp method. diff -crB VTK/Rendering/vtkImageSliceMapper.cxx VTKNew/Rendering/vtkImageSliceMapper.cxx *** VTK/Rendering/vtkImageSliceMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageSliceMapper.cxx 2013-09-24 10:54:59.925891000 +0200 *************** *** 271,279 **** } //---------------------------------------------------------------------------- ! unsigned long vtkImageSliceMapper::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); if (this->SliceFacesCamera || this->SliceAtFocalPoint) { --- 271,279 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageSliceMapper::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); if (this->SliceFacesCamera || this->SliceAtFocalPoint) { *************** *** 283,289 **** if (prop && ren) { vtkCamera *camera = ren->GetActiveCamera(); ! unsigned long mTime2 = prop->GetMTime(); if (mTime2 > mTime) { mTime = mTime2; --- 283,289 ---- if (prop && ren) { vtkCamera *camera = ren->GetActiveCamera(); ! vtkTimeStamp mTime2 = prop->GetMTime(); if (mTime2 > mTime) { mTime = mTime2; diff -crB VTK/Rendering/vtkImageSliceMapper.h VTKNew/Rendering/vtkImageSliceMapper.h *** VTK/Rendering/vtkImageSliceMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageSliceMapper.h 2013-09-24 10:55:02.211021700 +0200 *************** *** 89,95 **** // Description: // Get the mtime for the mapper. ! unsigned long GetMTime(); // Description: // The bounding box (array of six doubles) of data expressed as --- 89,95 ---- // Description: // Get the mtime for the mapper. ! vtkTimeStamp GetMTime(); // Description: // The bounding box (array of six doubles) of data expressed as diff -crB VTK/Rendering/vtkImageStack.cxx VTKNew/Rendering/vtkImageStack.cxx *** VTK/Rendering/vtkImageStack.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageStack.cxx 2013-09-24 10:54:59.918890600 +0200 *************** *** 489,498 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImageStack::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long t; // Get the max mtime of all the images vtkCollectionSimpleIterator pit; --- 489,498 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageStack::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp t; // Get the max mtime of all the images vtkCollectionSimpleIterator pit; *************** *** 508,518 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkImageStack::GetRedrawMTime() { // Just call GetMTime on ourselves, not GetRedrawMTime ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long t; // Get the max mtime of all the images vtkCollectionSimpleIterator pit; --- 508,518 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkImageStack::GetRedrawMTime() { // Just call GetMTime on ourselves, not GetRedrawMTime ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp t; // Get the max mtime of all the images vtkCollectionSimpleIterator pit; diff -crB VTK/Rendering/vtkImageStack.h VTKNew/Rendering/vtkImageStack.h *** VTK/Rendering/vtkImageStack.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkImageStack.h 2013-09-24 10:55:01.633988700 +0200 *************** *** 88,101 **** // Description: // Return the max MTime of all the images. ! unsigned long int GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, mappers, // etc. ! unsigned long GetRedrawMTime(); // Description: // Shallow copy of this prop. Overloads the virtual vtkProp method. --- 88,101 ---- // Description: // Return the max MTime of all the images. ! vtkTimeStamp GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, mappers, // etc. ! vtkTimeStamp GetRedrawMTime(); // Description: // Shallow copy of this prop. Overloads the virtual vtkProp method. diff -crB VTK/Rendering/vtkLabeledDataMapper.cxx VTKNew/Rendering/vtkLabeledDataMapper.cxx *** VTK/Rendering/vtkLabeledDataMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkLabeledDataMapper.cxx 2013-09-24 10:54:59.905889800 +0200 *************** *** 260,266 **** } // Check for property updates. ! unsigned long propMTime = 0; std::map >::iterator it, itEnd; it = this->Implementation->TextProperties.begin(); itEnd = this->Implementation->TextProperties.end(); --- 260,266 ---- } // Check for property updates. ! vtkTimeStamp propMTime; std::map >::iterator it, itEnd; it = this->Implementation->TextProperties.begin(); itEnd = this->Implementation->TextProperties.end(); *************** *** 780,796 **** } // ---------------------------------------------------------------------- ! unsigned long vtkLabeledDataMapper::GetMTime() { ! unsigned long mtime = this->Superclass::GetMTime(); std::map >::iterator it, itEnd; it = this->Implementation->TextProperties.begin(); itEnd = this->Implementation->TextProperties.end(); for (; it != itEnd; ++it) { vtkTextProperty* p = it->second; ! unsigned long curMTime = p->GetMTime(); if (curMTime > mtime) { mtime = curMTime; --- 780,796 ---- } // ---------------------------------------------------------------------- ! vtkTimeStamp vtkLabeledDataMapper::GetMTime() { ! vtkTimeStamp mtime = this->Superclass::GetMTime(); std::map >::iterator it, itEnd; it = this->Implementation->TextProperties.begin(); itEnd = this->Implementation->TextProperties.end(); for (; it != itEnd; ++it) { vtkTextProperty* p = it->second; ! vtkTimeStamp curMTime = p->GetMTime(); if (curMTime > mtime) { mtime = curMTime; diff -crB VTK/Rendering/vtkLabeledDataMapper.h VTKNew/Rendering/vtkLabeledDataMapper.h *** VTK/Rendering/vtkLabeledDataMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkLabeledDataMapper.h 2013-09-24 10:55:02.937063200 +0200 *************** *** 177,183 **** // Description: // Return the modified time for this object. ! virtual unsigned long GetMTime(); protected: vtkLabeledDataMapper(); --- 177,183 ---- // Description: // Return the modified time for this object. ! virtual vtkTimeStamp GetMTime(); protected: vtkLabeledDataMapper(); diff -crB VTK/Rendering/vtkLabelPlacer.cxx VTKNew/Rendering/vtkLabelPlacer.cxx *** VTK/Rendering/vtkLabelPlacer.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkLabelPlacer.cxx 2013-09-24 10:54:59.912890200 +0200 *************** *** 297,303 **** this->Modified(); } ! unsigned long vtkLabelPlacer::GetMTime() { // Check for minimal changes if ( this->Renderer ) --- 297,303 ---- this->Modified(); } ! vtkTimeStamp vtkLabelPlacer::GetMTime() { // Check for minimal changes if ( this->Renderer ) diff -crB VTK/Rendering/vtkLabelPlacer.h VTKNew/Rendering/vtkLabelPlacer.h *** VTK/Rendering/vtkLabelPlacer.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkLabelPlacer.h 2013-09-24 10:55:01.344972100 +0200 *************** *** 119,125 **** vtkGetMacro(UseUnicodeStrings,bool); vtkBooleanMacro(UseUnicodeStrings,bool); ! virtual unsigned long GetMTime(); // Description: // Use label anchor point coordinates as normal vectors and eliminate those --- 119,125 ---- vtkGetMacro(UseUnicodeStrings,bool); vtkBooleanMacro(UseUnicodeStrings,bool); ! virtual vtkTimeStamp GetMTime(); // Description: // Use label anchor point coordinates as normal vectors and eliminate those diff -crB VTK/Rendering/vtkLightActor.cxx VTKNew/Rendering/vtkLightActor.cxx *** VTK/Rendering/vtkLightActor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkLightActor.cxx 2013-09-24 10:54:59.893889200 +0200 *************** *** 172,183 **** } //------------------------------------------------------------------------- ! unsigned long int vtkLightActor::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); if(this->Light!=0) { ! unsigned long time; time = this->Light->GetMTime(); if(time>mTime) { --- 172,183 ---- } //------------------------------------------------------------------------- ! vtkTimeStamp vtkLightActor::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); if(this->Light!=0) { ! vtkTimeStamp time; time = this->Light->GetMTime(); if(time>mTime) { diff -crB VTK/Rendering/vtkLightActor.h VTKNew/Rendering/vtkLightActor.h *** VTK/Rendering/vtkLightActor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkLightActor.h 2013-09-24 10:55:01.200963900 +0200 *************** *** 85,91 **** // Description: // Get the actors mtime plus consider its properties and texture if set. ! unsigned long int GetMTime(); protected: vtkLightActor(); --- 85,91 ---- // Description: // Get the actors mtime plus consider its properties and texture if set. ! vtkTimeStamp GetMTime(); protected: vtkLightActor(); diff -crB VTK/Rendering/vtkMapper.cxx VTKNew/Rendering/vtkMapper.cxx *** VTK/Rendering/vtkMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkMapper.cxx 2013-09-24 10:54:59.885888700 +0200 *************** *** 205,215 **** // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! unsigned long vtkMapper::GetMTime() { //unsigned long mTime=this->MTime.GetMTime(); ! unsigned long mTime=vtkAbstractMapper::GetMTime(); ! unsigned long lutMTime; if ( this->LookupTable != NULL ) { --- 205,215 ---- // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! vtkTimeStamp vtkMapper::GetMTime() { //unsigned long mTime=this->MTime.GetMTime(); ! vtkTimeStamp mTime=vtkAbstractMapper::GetMTime(); ! vtkTimeStamp lutMTime; if ( this->LookupTable != NULL ) { diff -crB VTK/Rendering/vtkMapper.h VTKNew/Rendering/vtkMapper.h *** VTK/Rendering/vtkMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkMapper.h 2013-09-24 10:05:16.189231000 +0200 *************** *** 87,93 **** // Description: // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! unsigned long GetMTime(); // Description: // Method initiates the mapping process. Generally sent by the actor --- 87,93 ---- // Description: // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! vtkTimeStamp GetMTime(); // Description: // Method initiates the mapping process. Generally sent by the actor diff -crB VTK/Rendering/vtkOpenGLImageSliceMapper.cxx VTKNew/Rendering/vtkOpenGLImageSliceMapper.cxx *** VTK/Rendering/vtkOpenGLImageSliceMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkOpenGLImageSliceMapper.cxx 2013-09-24 11:34:44.968307600 +0200 *************** *** 193,199 **** vtkImageData *input, int extent[6], bool recursive) { // get the previous texture load time ! unsigned long loadTime = this->LoadTime.GetMTime(); // the render window, needed for state information vtkOpenGLRenderWindow *renWin = --- 193,199 ---- vtkImageData *input, int extent[6], bool recursive) { // get the previous texture load time ! vtkTimeStamp loadTime = this->LoadTime.GetMTime(); // the render window, needed for state information vtkOpenGLRenderWindow *renWin = *************** *** 235,241 **** this->LastSliceNumber = this->SliceNumber; // get the mtime of the property, including the lookup table ! unsigned long propertyMTime = 0; if (property) { propertyMTime = property->GetMTime(); --- 235,241 ---- this->LastSliceNumber = this->SliceNumber; // get the mtime of the property, including the lookup table ! vtkTimeStamp propertyMTime; if (property) { propertyMTime = property->GetMTime(); *************** *** 244,250 **** vtkScalarsToColors *table = property->GetLookupTable(); if (table) { ! unsigned long mtime = table->GetMTime(); if (mtime > propertyMTime) { propertyMTime = mtime; --- 244,250 ---- vtkScalarsToColors *table = property->GetLookupTable(); if (table) { ! vtkTimeStamp mtime = table->GetMTime(); if (mtime > propertyMTime) { propertyMTime = mtime; diff -crB VTK/Rendering/vtkOpenGLRenderWindow.cxx VTKNew/Rendering/vtkOpenGLRenderWindow.cxx *** VTK/Rendering/vtkOpenGLRenderWindow.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkOpenGLRenderWindow.cxx 2013-09-24 10:54:59.978894000 +0200 *************** *** 103,109 **** } // ---------------------------------------------------------------------------- ! unsigned long vtkOpenGLRenderWindow::GetContextCreationTime() { return this->ContextCreationTime.GetMTime(); } --- 103,109 ---- } // ---------------------------------------------------------------------------- ! vtkTimeStamp vtkOpenGLRenderWindow::GetContextCreationTime() { return this->ContextCreationTime.GetMTime(); } diff -crB VTK/Rendering/vtkOpenGLRenderWindow.h VTKNew/Rendering/vtkOpenGLRenderWindow.h *** VTK/Rendering/vtkOpenGLRenderWindow.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkOpenGLRenderWindow.h 2013-09-24 10:55:03.229079900 +0200 *************** *** 177,183 **** // Description: // Get the time when the OpenGL context was created. ! virtual unsigned long GetContextCreationTime(); // Description: // Returns the extension manager. A new one will be created if one hasn't --- 177,183 ---- // Description: // Get the time when the OpenGL context was created. ! virtual vtkTimeStamp GetContextCreationTime(); // Description: // Returns the extension manager. A new one will be created if one hasn't diff -crB VTK/Rendering/vtkPolyDataMapper2D.cxx VTKNew/Rendering/vtkPolyDataMapper2D.cxx *** VTK/Rendering/vtkPolyDataMapper2D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkPolyDataMapper2D.cxx 2013-09-24 10:54:59.872888000 +0200 *************** *** 124,133 **** // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! unsigned long vtkPolyDataMapper2D::GetMTime() { ! unsigned long mTime = this->MTime; ! unsigned long lutMTime; if ( this->LookupTable != NULL ) { --- 124,133 ---- // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! vtkTimeStamp vtkPolyDataMapper2D::GetMTime() { ! vtkTimeStamp mTime = this->MTime; ! vtkTimeStamp lutMTime; if ( this->LookupTable != NULL ) { diff -crB VTK/Rendering/vtkPolyDataMapper2D.h VTKNew/Rendering/vtkPolyDataMapper2D.h *** VTK/Rendering/vtkPolyDataMapper2D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkPolyDataMapper2D.h 2013-09-24 10:05:16.147228600 +0200 *************** *** 140,146 **** // Description: // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! virtual unsigned long GetMTime(); // Description: // Specify a vtkCoordinate object to be used to transform the vtkPolyData --- 140,146 ---- // Description: // Overload standard modified time function. If lookup table is modified, // then this object is modified as well. ! virtual vtkTimeStamp GetMTime(); // Description: // Specify a vtkCoordinate object to be used to transform the vtkPolyData diff -crB VTK/Rendering/vtkProp3D.cxx VTKNew/Rendering/vtkProp3D.cxx *** VTK/Rendering/vtkProp3D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkProp3D.cxx 2013-09-24 11:34:44.961307200 +0200 *************** *** 81,90 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkProp3D::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; time = this->GetUserTransformMatrixMTime(); mTime = ( time > mTime ? time : mTime ); --- 81,90 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkProp3D::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; time = this->GetUserTransformMatrixMTime(); mTime = ( time > mTime ? time : mTime ); *************** *** 93,102 **** } //---------------------------------------------------------------------------- ! unsigned long int vtkProp3D::GetUserTransformMatrixMTime() { ! unsigned long mTime = 0; ! unsigned long time; // Factored out of GetMTime because there are times we want // just this information, without being influenced by other --- 93,102 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkProp3D::GetUserTransformMatrixMTime() { ! vtkTimeStamp mTime; ! vtkTimeStamp time; // Factored out of GetMTime because there are times we want // just this information, without being influenced by other diff -crB VTK/Rendering/vtkProp3D.h VTKNew/Rendering/vtkProp3D.h *** VTK/Rendering/vtkProp3D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkProp3D.h 2013-09-24 10:05:16.324238700 +0200 *************** *** 267,277 **** // Description: // Get the vtkProp3D's mtime ! unsigned long int GetMTime(); // Description: // Get the modified time of the user matrix or user transform. ! unsigned long int GetUserTransformMatrixMTime(); // Description: // Generate the matrix based on ivars --- 267,277 ---- // Description: // Get the vtkProp3D's mtime ! vtkTimeStamp GetMTime(); // Description: // Get the modified time of the user matrix or user transform. ! vtkTimeStamp GetUserTransformMatrixMTime(); // Description: // Generate the matrix based on ivars diff -crB VTK/Rendering/vtkQtTreeRingLabelMapper.cxx VTKNew/Rendering/vtkQtTreeRingLabelMapper.cxx *** VTK/Rendering/vtkQtTreeRingLabelMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkQtTreeRingLabelMapper.cxx 2013-09-24 10:54:59.858887200 +0200 *************** *** 645,659 **** } } ! unsigned long vtkQtTreeRingLabelMapper::GetMTime() { ! unsigned long filterMTime = this->MTime.GetMTime(); if( this->Renderer ) { vtkRenderWindow* rw = this->Renderer->GetRenderWindow(); if ( rw ) { ! unsigned long renWindMTime = rw->GetMTime(); if ( renWindMTime > filterMTime ) { int* rwSize = rw->GetSize(); --- 645,659 ---- } } ! vtkTimeStamp vtkQtTreeRingLabelMapper::GetMTime() { ! vtkTimeStamp filterMTime = this->MTime.GetMTime(); if( this->Renderer ) { vtkRenderWindow* rw = this->Renderer->GetRenderWindow(); if ( rw ) { ! vtkTimeStamp renWindMTime = rw->GetMTime(); if ( renWindMTime > filterMTime ) { int* rwSize = rw->GetSize(); diff -crB VTK/Rendering/vtkQtTreeRingLabelMapper.h VTKNew/Rendering/vtkQtTreeRingLabelMapper.h *** VTK/Rendering/vtkQtTreeRingLabelMapper.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkQtTreeRingLabelMapper.h 2013-09-24 10:55:01.055955600 +0200 *************** *** 98,104 **** // Description: // Return the object's MTime. This is overridden to include // the timestamp of its internal class. ! virtual unsigned long GetMTime(); void SetRenderer(vtkRenderer* ren) { --- 98,104 ---- // Description: // Return the object's MTime. This is overridden to include // the timestamp of its internal class. ! virtual vtkTimeStamp GetMTime(); void SetRenderer(vtkRenderer* ren) { diff -crB VTK/Rendering/vtkRenderer.cxx VTKNew/Rendering/vtkRenderer.cxx *** VTK/Rendering/vtkRenderer.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkRenderer.cxx 2013-09-24 10:54:59.851886700 +0200 *************** *** 1521,1530 **** return count; } ! unsigned long int vtkRenderer::GetMTime() { ! unsigned long mTime=this-> vtkViewport::GetMTime(); ! unsigned long time; if ( this->ActiveCamera != NULL ) { --- 1521,1530 ---- return count; } ! vtkTimeStamp vtkRenderer::GetMTime() { ! vtkTimeStamp mTime=this-> vtkViewport::GetMTime(); ! vtkTimeStamp time; if ( this->ActiveCamera != NULL ) { diff -crB VTK/Rendering/vtkRenderer.h VTKNew/Rendering/vtkRenderer.h *** VTK/Rendering/vtkRenderer.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkRenderer.h 2013-09-24 10:05:16.258235000 +0200 *************** *** 369,375 **** // Description: // Return the MTime of the renderer also considering its ivars. ! unsigned long GetMTime(); // Description: // Get the time required, in seconds, for the last Render call. --- 369,375 ---- // Description: // Return the MTime of the renderer also considering its ivars. ! vtkTimeStamp GetMTime(); // Description: // Get the time required, in seconds, for the last Render call. diff -crB VTK/Rendering/vtkRendererSource.cxx VTKNew/Rendering/vtkRendererSource.cxx *** VTK/Rendering/vtkRendererSource.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkRendererSource.cxx 2013-09-24 10:54:59.844886300 +0200 *************** *** 222,232 **** } ! unsigned long vtkRendererSource::GetMTime() { vtkRenderer *ren = this->GetInput(); ! unsigned long t1 = this->MTime.GetMTime(); ! unsigned long t2; if (!ren) { --- 222,232 ---- } ! vtkTimeStamp vtkRendererSource::GetMTime() { vtkRenderer *ren = this->GetInput(); ! vtkTimeStamp t1 = this->MTime.GetMTime(); ! vtkTimeStamp t2; if (!ren) { diff -crB VTK/Rendering/vtkRendererSource.h VTKNew/Rendering/vtkRendererSource.h *** VTK/Rendering/vtkRendererSource.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkRendererSource.h 2013-09-24 10:55:00.908947200 +0200 *************** *** 45,51 **** // Description: // Return the MTime also considering the Renderer. ! unsigned long GetMTime(); // Description: // Indicates what renderer to get the pixel data from. --- 45,51 ---- // Description: // Return the MTime also considering the Renderer. ! vtkTimeStamp GetMTime(); // Description: // Indicates what renderer to get the pixel data from. diff -crB VTK/Rendering/vtkResliceCursorActor.cxx VTKNew/Rendering/vtkResliceCursorActor.cxx *** VTK/Rendering/vtkResliceCursorActor.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkResliceCursorActor.cxx 2013-09-24 10:54:59.837885900 +0200 *************** *** 177,188 **** } //------------------------------------------------------------------------- ! unsigned long int vtkResliceCursorActor::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); if (this->CursorAlgorithm) { ! unsigned long time; time = this->CursorAlgorithm->GetMTime(); if (time > mTime) { --- 177,188 ---- } //------------------------------------------------------------------------- ! vtkTimeStamp vtkResliceCursorActor::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); if (this->CursorAlgorithm) { ! vtkTimeStamp time; time = this->CursorAlgorithm->GetMTime(); if (time > mTime) { diff -crB VTK/Rendering/vtkResliceCursorActor.h VTKNew/Rendering/vtkResliceCursorActor.h *** VTK/Rendering/vtkResliceCursorActor.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkResliceCursorActor.h 2013-09-24 10:55:00.764939000 +0200 *************** *** 68,74 **** // Description: // Get the actors mtime plus consider its algorithm. ! unsigned long int GetMTime(); // Description: // Get property of the internal actor. --- 68,74 ---- // Description: // Get the actors mtime plus consider its algorithm. ! vtkTimeStamp GetMTime(); // Description: // Get property of the internal actor. diff -crB VTK/Rendering/vtkSelectVisiblePoints.cxx VTKNew/Rendering/vtkSelectVisiblePoints.cxx *** VTK/Rendering/vtkSelectVisiblePoints.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkSelectVisiblePoints.cxx 2013-09-24 10:54:59.831885600 +0200 *************** *** 156,165 **** return 1; } ! unsigned long int vtkSelectVisiblePoints::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long time; if ( this->Renderer != NULL ) { --- 156,165 ---- return 1; } ! vtkTimeStamp vtkSelectVisiblePoints::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp time; if ( this->Renderer != NULL ) { diff -crB VTK/Rendering/vtkSelectVisiblePoints.h VTKNew/Rendering/vtkSelectVisiblePoints.h *** VTK/Rendering/vtkSelectVisiblePoints.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkSelectVisiblePoints.h 2013-09-24 10:55:01.488980400 +0200 *************** *** 110,116 **** // Description: // Return MTime also considering the renderer. ! unsigned long GetMTime(); protected: vtkSelectVisiblePoints(); --- 110,116 ---- // Description: // Return MTime also considering the renderer. ! vtkTimeStamp GetMTime(); protected: vtkSelectVisiblePoints(); diff -crB VTK/Rendering/vtkShader.cxx VTKNew/Rendering/vtkShader.cxx *** VTK/Rendering/vtkShader.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkShader.cxx 2013-09-24 10:54:59.825885300 +0200 *************** *** 879,885 **** } else if( strcmp(value,"MTime")==0 ) { ! double mtime = static_cast(property->GetMTime()); this->SetUniformParameter(name, 1, &mtime); } else --- 879,885 ---- } else if( strcmp(value,"MTime")==0 ) { ! double mtime = static_cast(property->GetMTime().toDouble()); this->SetUniformParameter(name, 1, &mtime); } else diff -crB VTK/Rendering/vtkShader2Collection.cxx VTKNew/Rendering/vtkShader2Collection.cxx *** VTK/Rendering/vtkShader2Collection.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkShader2Collection.cxx 2013-09-24 10:54:59.818884900 +0200 *************** *** 40,53 **** } // ---------------------------------------------------------------------------- ! unsigned long vtkShader2Collection::GetMTime() { ! unsigned long result=this->Superclass::GetMTime(); this->InitTraversal(); vtkShader2 *s=this->GetNextShader(); while(s!=0) { ! unsigned long time=s->GetMTime(); if(time>result) { result=time; --- 40,53 ---- } // ---------------------------------------------------------------------------- ! vtkTimeStamp vtkShader2Collection::GetMTime() { ! vtkTimeStamp result=this->Superclass::GetMTime(); this->InitTraversal(); vtkShader2 *s=this->GetNextShader(); while(s!=0) { ! vtkTimeStamp time=s->GetMTime(); if(time>result) { result=time; diff -crB VTK/Rendering/vtkShader2Collection.h VTKNew/Rendering/vtkShader2Collection.h *** VTK/Rendering/vtkShader2Collection.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkShader2Collection.h 2013-09-24 10:05:16.080224800 +0200 *************** *** 38,44 **** // Description: // Modified GetMTime because the collection time depends on the // content of the shaders. ! unsigned long GetMTime(); // Description: // Add a shader to the list. --- 38,44 ---- // Description: // Modified GetMTime because the collection time depends on the // content of the shaders. ! vtkTimeStamp GetMTime(); // Description: // Add a shader to the list. diff -crB VTK/Rendering/vtkShadowMapBakerPass.cxx VTKNew/Rendering/vtkShadowMapBakerPass.cxx *** VTK/Rendering/vtkShadowMapBakerPass.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkShadowMapBakerPass.cxx 2013-09-24 10:54:59.809884300 +0200 *************** *** 321,327 **** int propArrayCount=0; vtkProp **propArray=0; ! unsigned long latestPropTime=0; vtkInformation *requiredKeys=0; if(hasLight) --- 321,327 ---- int propArrayCount=0; vtkProp **propArray=0; ! vtkTimeStamp latestPropTime; vtkInformation *requiredKeys=0; if(hasLight) *************** *** 351,357 **** propArray=new vtkProp*[props->GetNumberOfItems()]; while(p!=0) { ! unsigned long mTime=p->GetMTime(); if(latestPropTimeGetNumberOfItems()]; while(p!=0) { ! vtkTimeStamp mTime=p->GetMTime(); if(latestPropTimeTexture) { time = this->Texture->GetMTime(); --- 99,108 ---- } //----------------------------------------------------------------------------- ! vtkTimeStamp vtkTexturedActor2D::GetMTime() { ! vtkTimeStamp mTime = vtkActor2D::GetMTime(); ! vtkTimeStamp time; if (this->Texture) { time = this->Texture->GetMTime(); diff -crB VTK/Rendering/vtkTexturedActor2D.h VTKNew/Rendering/vtkTexturedActor2D.h *** VTK/Rendering/vtkTexturedActor2D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkTexturedActor2D.h 2013-09-24 10:55:02.500038200 +0200 *************** *** 59,65 **** // Description: // Return this object's modified time. ! virtual unsigned long int GetMTime(); // Description: // Shallow copy of this vtkTexturedActor2D. Overrides vtkActor2D method. --- 59,65 ---- // Description: // Return this object's modified time. ! virtual vtkTimeStamp GetMTime(); // Description: // Shallow copy of this vtkTexturedActor2D. Overrides vtkActor2D method. diff -crB VTK/Rendering/vtkTransformInterpolator.cxx VTKNew/Rendering/vtkTransformInterpolator.cxx *** VTK/Rendering/vtkTransformInterpolator.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkTransformInterpolator.cxx 2013-09-24 10:54:59.796883600 +0200 *************** *** 99,108 **** } //---------------------------------------------------------------------------- ! unsigned long vtkTransformInterpolator::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long posMTime, scaleMTime, rotMTime; if ( this->PositionInterpolator ) { --- 99,108 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkTransformInterpolator::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp posMTime, scaleMTime, rotMTime; if ( this->PositionInterpolator ) { diff -crB VTK/Rendering/vtkTransformInterpolator.h VTKNew/Rendering/vtkTransformInterpolator.h *** VTK/Rendering/vtkTransformInterpolator.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkTransformInterpolator.h 2013-09-24 10:55:00.618930600 +0200 *************** *** 159,165 **** // Description: // Override GetMTime() because we depend on the interpolators which may be // modified outside of this class. ! unsigned long GetMTime(); protected: vtkTransformInterpolator(); --- 159,165 ---- // Description: // Override GetMTime() because we depend on the interpolators which may be // modified outside of this class. ! vtkTimeStamp GetMTime(); protected: vtkTransformInterpolator(); diff -crB VTK/Rendering/vtkVolume.cxx VTKNew/Rendering/vtkVolume.cxx *** VTK/Rendering/vtkVolume.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkVolume.cxx 2013-09-24 10:54:59.788883100 +0200 *************** *** 431,440 **** return this->Property; } ! unsigned long int vtkVolume::GetMTime() { ! unsigned long mTime=this->vtkObject::GetMTime(); ! unsigned long time; if ( this->Property != NULL ) { --- 431,440 ---- return this->Property; } ! vtkTimeStamp vtkVolume::GetMTime() { ! vtkTimeStamp mTime=this->vtkObject::GetMTime(); ! vtkTimeStamp time; if ( this->Property != NULL ) { *************** *** 457,466 **** return mTime; } ! unsigned long int vtkVolume::GetRedrawMTime() { ! unsigned long mTime=this->GetMTime(); ! unsigned long time; if ( this->Mapper != NULL ) { --- 457,466 ---- return mTime; } ! vtkTimeStamp vtkVolume::GetRedrawMTime() { ! vtkTimeStamp mTime=this->GetMTime(); ! vtkTimeStamp time; if ( this->Mapper != NULL ) { diff -crB VTK/Rendering/vtkVolume.h VTKNew/Rendering/vtkVolume.h *** VTK/Rendering/vtkVolume.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkVolume.h 2013-09-24 10:05:16.302237500 +0200 *************** *** 83,96 **** // Description: // Return the MTime also considering the property etc. ! unsigned long int GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, mappers, // etc. ! unsigned long GetRedrawMTime(); // Description: // Shallow copy of this vtkVolume. Overloads the virtual vtkProp method. --- 83,96 ---- // Description: // Return the MTime also considering the property etc. ! vtkTimeStamp GetMTime(); // Description: // Return the mtime of anything that would cause the rendered image to // appear differently. Usually this involves checking the mtime of the // prop plus anything else it depends on such as properties, mappers, // etc. ! vtkTimeStamp GetRedrawMTime(); // Description: // Shallow copy of this vtkVolume. Overloads the virtual vtkProp method. diff -crB VTK/Rendering/vtkVolumeProperty.cxx VTKNew/Rendering/vtkVolumeProperty.cxx *** VTK/Rendering/vtkVolumeProperty.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkVolumeProperty.cxx 2013-09-24 10:54:59.781882700 +0200 *************** *** 143,152 **** } } ! unsigned long int vtkVolumeProperty::GetMTime() { ! unsigned long mTime=this->vtkObject::GetMTime(); ! unsigned long time; for ( int i = 0; i < VTK_MAX_VRCOMP; i++ ) { --- 143,152 ---- } } ! vtkTimeStamp vtkVolumeProperty::GetMTime() { ! vtkTimeStamp mTime=this->vtkObject::GetMTime(); ! vtkTimeStamp time; for ( int i = 0; i < VTK_MAX_VRCOMP; i++ ) { diff -crB VTK/Rendering/vtkVolumeProperty.h VTKNew/Rendering/vtkVolumeProperty.h *** VTK/Rendering/vtkVolumeProperty.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Rendering/vtkVolumeProperty.h 2013-09-24 10:05:16.102226000 +0200 *************** *** 58,64 **** // Description: // Get the modified time for this object (or the properties registered // with this object). ! unsigned long GetMTime(); // Description: // Does the data have independent components, or do some define color --- 58,64 ---- // Description: // Get the modified time for this object (or the properties registered // with this object). ! vtkTimeStamp GetMTime(); // Description: // Does the data have independent components, or do some define color diff -crB VTK/VolumeRendering/vtkGPUVolumeRayCastMapper_HeaderFS.glsl VTKNew/VolumeRendering/vtkGPUVolumeRayCastMapper_HeaderFS.glsl *** VTK/VolumeRendering/vtkGPUVolumeRayCastMapper_HeaderFS.glsl 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/VolumeRendering/vtkGPUVolumeRayCastMapper_HeaderFS.glsl 2013-02-20 15:33:48.909897600 +0100 *************** *** 57,63 **** // device coordinates are between -1 and 1 // we need texture coordinates between 0 and 1 // the depth buffer has the original size buffer. ! fragTexCoord=(gl_FragCoord.xy-windowLowerLeftCorner)*invWindowSize; vec4 depth=texture2D(depthTexture,fragTexCoord); if(gl_FragCoord.z>=depth.x) // depth test { --- 57,64 ---- // device coordinates are between -1 and 1 // we need texture coordinates between 0 and 1 // the depth buffer has the original size buffer. ! // fragTexCoord=(gl_FragCoord.xy-windowLowerLeftCorner)*invWindowSize; ! fragTexCoord=(gl_FragCoord.xy)*invWindowSize; vec4 depth=texture2D(depthTexture,fragTexCoord); if(gl_FragCoord.z>=depth.x) // depth test { *************** *** 65,78 **** } // color buffer or max scalar buffer have a reduced size. ! fragTexCoord=(gl_FragCoord.xy-windowLowerLeftCorner)*invOriginalWindowSize; // Abscissa of the point on the depth buffer along the ray. // point in texture coordinates vec4 maxPoint; // from window coordinates to normalized device coordinates ! maxPoint.x=(gl_FragCoord.x-windowLowerLeftCorner.x)*2.0*invWindowSize.x-1.0; ! maxPoint.y=(gl_FragCoord.y-windowLowerLeftCorner.y)*2.0*invWindowSize.y-1.0; maxPoint.z=(2.0*depth.x-(gl_DepthRange.near+gl_DepthRange.far))/gl_DepthRange.diff; maxPoint.w=1.0; --- 66,82 ---- } // color buffer or max scalar buffer have a reduced size. ! // fragTexCoord=(gl_FragCoord.xy-windowLowerLeftCorner)*invOriginalWindowSize; ! fragTexCoord=(gl_FragCoord.xy)*invOriginalWindowSize; // Abscissa of the point on the depth buffer along the ray. // point in texture coordinates vec4 maxPoint; // from window coordinates to normalized device coordinates ! // maxPoint.x=(gl_FragCoord.x-windowLowerLeftCorner.x)*2.0*invWindowSize.x-1.0; ! // maxPoint.y=(gl_FragCoord.y-windowLowerLeftCorner.y)*2.0*invWindowSize.y-1.0; ! maxPoint.x=(gl_FragCoord.x)*2.0*invWindowSize.x-1.0; ! maxPoint.y=(gl_FragCoord.y)*2.0*invWindowSize.y-1.0; maxPoint.z=(2.0*depth.x-(gl_DepthRange.near+gl_DepthRange.far))/gl_DepthRange.diff; maxPoint.w=1.0; diff -crB VTK/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx VTKNew/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx *** VTK/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx 2013-02-14 14:15:44.698912700 +0100 *************** *** 4355,4361 **** } this->CheckFrameBufferStatus(); ! #ifdef APPLE_SNOW_LEOPARD_BUG this->Program->SendUniforms(); cout << "BEFORE isValid2" << endl; --- 4355,4361 ---- } this->CheckFrameBufferStatus(); ! #ifdef APPLE_SNOW_LEOPARD_BUG this->Program->SendUniforms(); cout << "BEFORE isValid2" << endl; diff -crB VTK/VolumeRendering/vtkVolumeOutlineSource.cxx VTKNew/VolumeRendering/vtkVolumeOutlineSource.cxx *** VTK/VolumeRendering/vtkVolumeOutlineSource.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/VolumeRendering/vtkVolumeOutlineSource.cxx 2013-09-24 10:28:01.774338000 +0200 *************** *** 141,152 **** vtkInformationVector** vtkNotUsed(inputVector), vtkInformationVector* vtkNotUsed(outputVector), int vtkNotUsed(requestFromOutputPort), ! unsigned long* mtime) { ! unsigned long mTime = this->GetMTime(); if (this->VolumeMapper) { ! unsigned long mapperMTime = this->VolumeMapper->GetMTime(); if (mapperMTime > mTime) { mTime = mapperMTime; --- 141,152 ---- vtkInformationVector** vtkNotUsed(inputVector), vtkInformationVector* vtkNotUsed(outputVector), int vtkNotUsed(requestFromOutputPort), ! vtkTimeStamp* mtime) { ! vtkTimeStamp mTime = this->GetMTime(); if (this->VolumeMapper) { ! vtkTimeStamp mapperMTime = this->VolumeMapper->GetMTime(); if (mapperMTime > mTime) { mTime = mapperMTime; *************** *** 157,163 **** // Need to do this because we are not formally connected // to the Mapper's pipeline input->UpdateInformation(); ! unsigned long pipelineMTime = input->GetPipelineMTime(); if (pipelineMTime > mTime) { mTime = pipelineMTime; --- 157,163 ---- // Need to do this because we are not formally connected // to the Mapper's pipeline input->UpdateInformation(); ! vtkTimeStamp pipelineMTime = input->GetPipelineMTime(); if (pipelineMTime > mTime) { mTime = pipelineMTime; diff -crB VTK/VolumeRendering/vtkVolumeOutlineSource.h VTKNew/VolumeRendering/vtkVolumeOutlineSource.h *** VTK/VolumeRendering/vtkVolumeOutlineSource.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/VolumeRendering/vtkVolumeOutlineSource.h 2013-09-24 11:15:14.985388400 +0200 *************** *** 141,147 **** vtkInformationVector** inputVector, vtkInformationVector* outputVector, int requestFromOutputPort, ! unsigned long* mtime); virtual int RequestInformation(vtkInformation* request, vtkInformationVector** inputVector, --- 141,147 ---- vtkInformationVector** inputVector, vtkInformationVector* outputVector, int requestFromOutputPort, ! vtkTimeStamp* mtime); virtual int RequestInformation(vtkInformation* request, vtkInformationVector** inputVector, diff -crB VTK/VolumeRendering/vtkVolumeRayCastSpaceLeapingImageFilter.h VTKNew/VolumeRendering/vtkVolumeRayCastSpaceLeapingImageFilter.h *** VTK/VolumeRendering/vtkVolumeRayCastSpaceLeapingImageFilter.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/VolumeRendering/vtkVolumeRayCastSpaceLeapingImageFilter.h 2013-09-24 10:54:56.638703000 +0200 *************** *** 74,86 **** // Description: // Get the last execution time. This is updated every // time the scalars or the gradient opacity values are computed ! unsigned long GetLastMinMaxBuildTime() { return LastMinMaxBuildTime.GetMTime(); } // Description: // Get the last execution time. This is updated every time the flags bits // are re-computed. ! unsigned long GetLastMinMaxFlagTime() { return LastMinMaxFlagTime.GetMTime(); } // Description: --- 74,86 ---- // Description: // Get the last execution time. This is updated every // time the scalars or the gradient opacity values are computed ! vtkTimeStamp GetLastMinMaxBuildTime() { return LastMinMaxBuildTime.GetMTime(); } // Description: // Get the last execution time. This is updated every time the flags bits // are re-computed. ! vtkTimeStamp GetLastMinMaxFlagTime() { return LastMinMaxFlagTime.GetMTime(); } // Description: diff -crB VTK/Widgets/Testing/Cxx/WidgetTestingMacros.h VTKNew/Widgets/Testing/Cxx/WidgetTestingMacros.h *** VTK/Widgets/Testing/Cxx/WidgetTestingMacros.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/Testing/Cxx/WidgetTestingMacros.h 2013-09-24 11:52:22.622802000 +0200 *************** *** 424,430 **** \ object->Pick(); \ \ ! unsigned long redrawMTime = object->GetRedrawMTime(); \ std::cout << "Redraw Modified Time = " << redrawMTime << std::endl; \ \ vtkSmartPointer< className > copyProp = vtkSmartPointer< className >::New(); \ --- 424,430 ---- \ object->Pick(); \ \ ! vtkTimeStamp redrawMTime = object->GetRedrawMTime(); \ std::cout << "Redraw Modified Time = " << redrawMTime << std::endl; \ \ vtkSmartPointer< className > copyProp = vtkSmartPointer< className >::New(); \ diff -crB VTK/Widgets/vtkHandleRepresentation.cxx VTKNew/Widgets/vtkHandleRepresentation.cxx *** VTK/Widgets/vtkHandleRepresentation.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/vtkHandleRepresentation.cxx 2013-09-24 11:52:49.057314000 +0200 *************** *** 165,176 **** } //---------------------------------------------------------------------- ! unsigned long vtkHandleRepresentation::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long wMTime=this->WorldPosition->GetMTime(); mTime = ( wMTime > mTime ? wMTime : mTime ); ! unsigned long dMTime=this->DisplayPosition->GetMTime(); mTime = ( dMTime > mTime ? dMTime : mTime ); return mTime; --- 165,176 ---- } //---------------------------------------------------------------------- ! vtkTimeStamp vtkHandleRepresentation::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp wMTime=this->WorldPosition->GetMTime(); mTime = ( wMTime > mTime ? wMTime : mTime ); ! vtkTimeStamp dMTime=this->DisplayPosition->GetMTime(); mTime = ( dMTime > mTime ? dMTime : mTime ); return mTime; diff -crB VTK/Widgets/vtkHandleRepresentation.h VTKNew/Widgets/vtkHandleRepresentation.h *** VTK/Widgets/vtkHandleRepresentation.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/vtkHandleRepresentation.h 2013-09-24 11:52:49.297327700 +0200 *************** *** 129,135 **** // Description: // Overload the superclasses' GetMTime() because the internal vtkCoordinates // are used to keep the state of the representation. ! virtual unsigned long GetMTime(); // Description: // Set/Get the point placer. Point placers can be used to dictate constraints --- 129,135 ---- // Description: // Overload the superclasses' GetMTime() because the internal vtkCoordinates // are used to keep the state of the representation. ! virtual vtkTimeStamp GetMTime(); // Description: // Set/Get the point placer. Point placers can be used to dictate constraints diff -crB VTK/Widgets/vtkImplicitPlaneWidget2.cxx VTKNew/Widgets/vtkImplicitPlaneWidget2.cxx *** VTK/Widgets/vtkImplicitPlaneWidget2.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/vtkImplicitPlaneWidget2.cxx 2013-09-24 11:52:49.052313700 +0200 *************** *** 401,407 **** //---------------------------------------------------------------------------- void vtkImplicitPlaneWidget2::InvokeInteractionCallback() { ! unsigned long previousMtime; vtkImplicitPlaneRepresentation* widgetRep = reinterpret_cast(this->WidgetRep); --- 401,407 ---- //---------------------------------------------------------------------------- void vtkImplicitPlaneWidget2::InvokeInteractionCallback() { ! vtkTimeStamp previousMtime; vtkImplicitPlaneRepresentation* widgetRep = reinterpret_cast(this->WidgetRep); diff -crB VTK/Widgets/vtkLineRepresentation.cxx VTKNew/Widgets/vtkLineRepresentation.cxx *** VTK/Widgets/vtkLineRepresentation.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/vtkLineRepresentation.cxx 2013-09-24 11:52:49.047313400 +0200 *************** *** 898,907 **** } //---------------------------------------------------------------------------- ! unsigned long vtkLineRepresentation::GetMTime() { ! unsigned long mTime=this->Superclass::GetMTime(); ! unsigned long mTime2=this->Point1Representation->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); mTime2=this->Point2Representation->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); --- 898,907 ---- } //---------------------------------------------------------------------------- ! vtkTimeStamp vtkLineRepresentation::GetMTime() { ! vtkTimeStamp mTime=this->Superclass::GetMTime(); ! vtkTimeStamp mTime2=this->Point1Representation->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); mTime2=this->Point2Representation->GetMTime(); mTime = ( mTime2 > mTime ? mTime2 : mTime ); diff -crB VTK/Widgets/vtkLineRepresentation.h VTKNew/Widgets/vtkLineRepresentation.h *** VTK/Widgets/vtkLineRepresentation.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/vtkLineRepresentation.h 2013-09-24 11:52:49.256325300 +0200 *************** *** 180,186 **** // Description: // Overload the superclasses' GetMTime() because internal classes // are used to keep the state of the representation. ! virtual unsigned long GetMTime(); // Description: // Overridden to set the rendererer on the internal representations. --- 180,186 ---- // Description: // Overload the superclasses' GetMTime() because internal classes // are used to keep the state of the representation. ! virtual vtkTimeStamp GetMTime(); // Description: // Overridden to set the rendererer on the internal representations. diff -crB VTK/Widgets/vtkSliderRepresentation3D.cxx VTKNew/Widgets/vtkSliderRepresentation3D.cxx *** VTK/Widgets/vtkSliderRepresentation3D.cxx 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/vtkSliderRepresentation3D.cxx 2013-09-24 11:52:49.041313000 +0200 *************** *** 416,425 **** //---------------------------------------------------------------------- // Description: // Override GetMTime to include point coordinates ! unsigned long vtkSliderRepresentation3D::GetMTime() { ! unsigned long mTime = this->Superclass::GetMTime(); ! unsigned long p1Time, p2Time; p1Time = this->Point1Coordinate->GetMTime(); mTime = ( p1Time > mTime ? p1Time : mTime ); --- 416,425 ---- //---------------------------------------------------------------------- // Description: // Override GetMTime to include point coordinates ! vtkTimeStamp vtkSliderRepresentation3D::GetMTime() { ! vtkTimeStamp mTime = this->Superclass::GetMTime(); ! vtkTimeStamp p1Time, p2Time; p1Time = this->Point1Coordinate->GetMTime(); mTime = ( p1Time > mTime ? p1Time : mTime ); diff -crB VTK/Widgets/vtkSliderRepresentation3D.h VTKNew/Widgets/vtkSliderRepresentation3D.h *** VTK/Widgets/vtkSliderRepresentation3D.h 2012-05-12 13:59:28.000000000 +0200 --- VTKNew/Widgets/vtkSliderRepresentation3D.h 2013-09-24 11:52:49.277326500 +0200 *************** *** 130,136 **** // Description: // Override GetMTime to include point coordinates ! virtual unsigned long GetMTime(); protected: vtkSliderRepresentation3D(); --- 130,136 ---- // Description: // Override GetMTime to include point coordinates ! virtual vtkTimeStamp GetMTime(); protected: vtkSliderRepresentation3D();