diff --git a/CMake/vtkWrapSettings.cmake b/CMake/vtkWrapSettings.cmake index 3319a3d19cb109ef40e6133266096926851a9028..d76580908e2210ada0b888e9301dab0c0e2e96ec 100644 --- a/CMake/vtkWrapSettings.cmake +++ b/CMake/vtkWrapSettings.cmake @@ -10,13 +10,10 @@ set_property(CACHE VTK_PYTHON_VERSION # Force reset of hints file location in cache if it was moved if(VTK_WRAP_HINTS AND NOT EXISTS ${VTK_WRAP_HINTS}) - set(VTK_WRAP_HINTS "VTK_WRAP_HINTS-NOTFOUND") + unset(VTK_WRAP_HINTS CACHE) + unset(VTK_WRAP_HINTS) endif() -find_file(VTK_WRAP_HINTS hints ${VTK_SOURCE_DIR}/Wrapping/Tools - NO_CMAKE_FIND_ROOT_PATH) -mark_as_advanced(VTK_WRAP_HINTS) - if(BUILD_TESTING OR VTK_WRAP_PYTHON) # Need PYTHON_EXECUTABLE for HeaderTesting or python wrapping find_package(PythonInterp ${VTK_PYTHON_VERSION} QUIET) diff --git a/Common/Core/vtkAOSDataArrayTemplate.h b/Common/Core/vtkAOSDataArrayTemplate.h index 85d3901243f1ceb46e270ec7e496fce0ad7e7160..9b3622e59b9a52864c3211f76dd323ff87ea2adf 100644 --- a/Common/Core/vtkAOSDataArrayTemplate.h +++ b/Common/Core/vtkAOSDataArrayTemplate.h @@ -324,8 +324,8 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkAOSDataArrayTemplate) void InsertValue(vtkIdType id, T f) \ VTK_EXPECTS(0 <= id); \ vtkIdType InsertNextValue(T f); \ - T *GetValueRange(int comp); \ - T *GetValueRange(); \ + T *GetValueRange(int comp) VTK_SIZEHINT(2); \ + T *GetValueRange() VTK_SIZEHINT(2); \ T* WritePointer(vtkIdType id, vtkIdType number); \ T* GetPointer(vtkIdType id); \ void SetArray(VTK_ZEROCOPY T* array, vtkIdType size, int save); \ diff --git a/Common/Core/vtkDataArray.h b/Common/Core/vtkDataArray.h index ceef9858134c05b1a209b690a8328e024ec3fcce..84b1db8b5986d8daa8f7be67316c7f80c8e9f216 100644 --- a/Common/Core/vtkDataArray.h +++ b/Common/Core/vtkDataArray.h @@ -118,15 +118,20 @@ public: double GetTuple1(vtkIdType tupleIdx) VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()); double* GetTuple2(vtkIdType tupleIdx) - VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()); + VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()) + VTK_SIZEHINT(2); double* GetTuple3(vtkIdType tupleIdx) - VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()); + VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()) + VTK_SIZEHINT(3); double* GetTuple4(vtkIdType tupleIdx) - VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()); + VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()) + VTK_SIZEHINT(4); double* GetTuple6(vtkIdType tupleIdx) - VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()); + VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()) + VTK_SIZEHINT(6); double* GetTuple9(vtkIdType tupleIdx) - VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()); + VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples()) + VTK_SIZEHINT(9); //@} void SetTuple(vtkIdType dstTupleIdx, vtkIdType srcTupleIdx, @@ -380,7 +385,7 @@ public: * modified or the requested component changes. * THIS METHOD IS NOT THREAD SAFE. */ - double* GetRange(int comp) + double* GetRange(int comp) VTK_SIZEHINT(2) { this->GetRange(this->Range, comp); return this->Range; @@ -394,7 +399,7 @@ public: * on subsequent calls to GetRange() unless the array is modified. * THIS METHOD IS NOT THREAD SAFE. */ - double* GetRange() + double* GetRange() VTK_SIZEHINT(2) { return this->GetRange(0); } @@ -435,7 +440,7 @@ public: * modified or the requested component changes. * THIS METHOD IS NOT THREAD SAFE. */ - double *GetFiniteRange(int comp) + double *GetFiniteRange(int comp) VTK_SIZEHINT(2) { this->GetFiniteRange(this->FiniteRange, comp); return this->FiniteRange; @@ -449,7 +454,7 @@ public: * on subsequent calls to GetRange() unless the array is modified. * THIS METHOD IS NOT THREAD SAFE. */ - double *GetFiniteRange() + double *GetFiniteRange() VTK_SIZEHINT(2) { return this->GetFiniteRange(0); } diff --git a/Common/Core/vtkGenericDataArray.h b/Common/Core/vtkGenericDataArray.h index e01896aca83bbbff31536228375327fd227cbef8..53e27a9b47a7786b0a91d02a0c93bc8b3d1a2a06 100644 --- a/Common/Core/vtkGenericDataArray.h +++ b/Common/Core/vtkGenericDataArray.h @@ -222,14 +222,14 @@ public: * native data type. */ void GetValueRange(ValueType range[2], int comp); - ValueType *GetValueRange(int comp); + ValueType *GetValueRange(int comp) VTK_SIZEHINT(2); //@} /** * Get the range of array values for the 0th component in the * native data type. */ - ValueType *GetValueRange() { return this->GetValueRange(0); } + ValueType *GetValueRange() VTK_SIZEHINT(2) { return this->GetValueRange(0); } void GetValueRange(ValueType range[2]) { this->GetValueRange(range, 0); } /** diff --git a/Common/Core/vtkLookupTable.h b/Common/Core/vtkLookupTable.h index 3821d06e1f9355194fe8f08443a08d847984162b..4b7890ed6ea8083eadde413a3fd3199bc46582a6 100644 --- a/Common/Core/vtkLookupTable.h +++ b/Common/Core/vtkLookupTable.h @@ -316,7 +316,7 @@ public: * Return an RGBA color value for the given index into the lookup table. Color * components are expressed as [0,1] double values. */ - double *GetTableValue(vtkIdType id); + double *GetTableValue(vtkIdType id) VTK_SIZEHINT(4); /** * Return an RGBA color value for the given index into the lookup table. Color @@ -348,7 +348,7 @@ public: * Sets/Gets the range of scalars which will be mapped. This is a duplicate * of Get/SetTableRange. */ - double *GetRange() override + double *GetRange() VTK_SIZEHINT(2) override { return this->GetTableRange(); } void SetRange(double min, double max) override { this->SetTableRange(min, max); } diff --git a/Common/Core/vtkMath.h b/Common/Core/vtkMath.h index 20e9977af905489fd1f5e21de243afa2a2e21336..d8f1aaf3ed2f0c6b35124f24ae5021572969e573 100644 --- a/Common/Core/vtkMath.h +++ b/Common/Core/vtkMath.h @@ -956,8 +956,8 @@ public: static void RGBToHSV(const float rgb[3], float hsv[3]) { RGBToHSV(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2); } static void RGBToHSV(float r, float g, float b, float *h, float *s, float *v); - static double* RGBToHSV(const double rgb[3]); - static double* RGBToHSV(double r, double g, double b); + static double* RGBToHSV(const double rgb[3]) VTK_SIZEHINT(3); + static double* RGBToHSV(double r, double g, double b) VTK_SIZEHINT(3); static void RGBToHSV(const double rgb[3], double hsv[3]) { RGBToHSV(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2); } static void RGBToHSV(double r, double g, double b, double *h, double *s, double *v); @@ -974,8 +974,8 @@ public: static void HSVToRGB(const float hsv[3], float rgb[3]) { HSVToRGB(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2); } static void HSVToRGB(float h, float s, float v, float *r, float *g, float *b); - static double* HSVToRGB(const double hsv[3]); - static double* HSVToRGB(double h, double s, double v); + static double* HSVToRGB(const double hsv[3]) VTK_SIZEHINT(3); + static double* HSVToRGB(double h, double s, double v) VTK_SIZEHINT(3); static void HSVToRGB(const double hsv[3], double rgb[3]) { HSVToRGB(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2); } static void HSVToRGB(double h, double s, double v, double *r, double *g, double *b); @@ -990,7 +990,7 @@ public: } static void LabToXYZ(double L, double a, double b, double *x, double *y, double *z); - static double *LabToXYZ(const double lab[3]); + static double *LabToXYZ(const double lab[3]) VTK_SIZEHINT(3); //@} //@{ @@ -1002,7 +1002,7 @@ public: } static void XYZToLab(double x, double y, double z, double *L, double *a, double *b); - static double *XYZToLab(const double xyz[3]); + static double *XYZToLab(const double xyz[3]) VTK_SIZEHINT(3); //@} //@{ @@ -1014,7 +1014,7 @@ public: } static void XYZToRGB(double x, double y, double z, double *r, double *g, double *b); - static double *XYZToRGB(const double xyz[3]); + static double *XYZToRGB(const double xyz[3]) VTK_SIZEHINT(3); //@} //@{ @@ -1026,7 +1026,7 @@ public: } static void RGBToXYZ(double r, double g, double b, double *x, double *y, double *z); - static double *RGBToXYZ(const double rgb[3]); + static double *RGBToXYZ(const double rgb[3]) VTK_SIZEHINT(3); //@} //@{ @@ -1041,7 +1041,7 @@ public: } static void RGBToLab(double red, double green, double blue, double *L, double *a, double *b); - static double *RGBToLab(const double rgb[3]); + static double *RGBToLab(const double rgb[3]) VTK_SIZEHINT(3); //@} //@{ @@ -1053,7 +1053,7 @@ public: } static void LabToRGB(double L, double a, double b, double *red, double *green, double *blue); - static double *LabToRGB(const double lab[3]); + static double *LabToRGB(const double lab[3]) VTK_SIZEHINT(3); //@} //@{ diff --git a/Common/Core/vtkPoints.h b/Common/Core/vtkPoints.h index 0d6c494bb00df9736ba66f8e76010dfdc36d14c9..31f3b7f080bbf8341704be2cff60997f51757246 100644 --- a/Common/Core/vtkPoints.h +++ b/Common/Core/vtkPoints.h @@ -133,6 +133,7 @@ public: */ double *GetPoint(vtkIdType id) VTK_EXPECTS(0 <= id && id < GetNumberOfPoints()) + VTK_SIZEHINT(3) { return this->Data->GetTuple(id); } /** @@ -141,6 +142,7 @@ public: */ void GetPoint(vtkIdType id, double x[3]) VTK_EXPECTS(0 <= id && id < GetNumberOfPoints()) + VTK_SIZEHINT(3) { this->Data->GetTuple(id,x); } /** @@ -225,7 +227,7 @@ public: /** * Return the bounds of the points. */ - double *GetBounds(); + double *GetBounds() VTK_SIZEHINT(6); /** * Return the bounds of the points. diff --git a/Common/Core/vtkPoints2D.h b/Common/Core/vtkPoints2D.h index 66e7e6c5f92cc752beec2e4412a59de9d22761ee..04a7797fbccc0998a96176dc53ff19a1868f3a73 100644 --- a/Common/Core/vtkPoints2D.h +++ b/Common/Core/vtkPoints2D.h @@ -131,7 +131,7 @@ public: * and its values are only valid as long as another method invocation is not * performed. Prefer GetPoint() with the return value in argument. */ - double *GetPoint(vtkIdType id) { return this->Data->GetTuple(id);} + double *GetPoint(vtkIdType id) VTK_SIZEHINT(2) { return this->Data->GetTuple(id);} /** * Copy point components into user provided array v[2] for specified id. @@ -197,7 +197,7 @@ public: /** * Return the bounds of the points. */ - double *GetBounds(); + double *GetBounds() VTK_SIZEHINT(4); /** * Return the bounds of the points. diff --git a/Common/Core/vtkScalarsToColors.h b/Common/Core/vtkScalarsToColors.h index 290ab77f3dd5165a0584f2ed585437dd1936c69a..89fa17658d1bc72bad6ccd2f88d0090c57d00894 100644 --- a/Common/Core/vtkScalarsToColors.h +++ b/Common/Core/vtkScalarsToColors.h @@ -80,7 +80,7 @@ public: /** * Sets/Gets the range of scalars that will be mapped. */ - virtual double *GetRange(); + virtual double *GetRange() VTK_SIZEHINT(2); virtual void SetRange(double min, double max); virtual void SetRange(const double rng[2]) {this->SetRange(rng[0],rng[1]);} @@ -102,7 +102,7 @@ public: * Map one value through the lookup table and return the color as * an RGB array of doubles between 0 and 1. */ - double *GetColor(double v) + double *GetColor(double v) VTK_SIZEHINT(3) {this->GetColor(v,this->RGB); return this->RGB;} /** diff --git a/Common/Core/vtkSetGet.h b/Common/Core/vtkSetGet.h index cd514034152119d6f559d16623ca5bf6d3e2fbb8..1bc806500af99327128aceb046de1274b2b3059d 100644 --- a/Common/Core/vtkSetGet.h +++ b/Common/Core/vtkSetGet.h @@ -270,7 +270,7 @@ void Set##name (type _arg[2]) \ } #define vtkGetVector2Macro(name,type) \ -virtual type *Get##name () \ +virtual type *Get##name () VTK_SIZEHINT(2) \ { \ vtkDebugMacro(<< this->GetClassName() << " (" << this << "): returning " << #name " pointer " << this->name); \ return this->name; \ @@ -304,7 +304,7 @@ virtual void Set##name (type _arg[3]) \ } #define vtkGetVector3Macro(name,type) \ -virtual type *Get##name () \ +virtual type *Get##name () VTK_SIZEHINT(3) \ { \ vtkDebugMacro(<< this->GetClassName() << " (" << this << "): returning " << #name " pointer " << this->name); \ return this->name; \ @@ -341,7 +341,7 @@ virtual void Set##name (type _arg[4]) \ #define vtkGetVector4Macro(name,type) \ -virtual type *Get##name () \ +virtual type *Get##name () VTK_SIZEHINT(4) \ { \ vtkDebugMacro(<< this->GetClassName() << " (" << this << "): returning " << #name " pointer " << this->name); \ return this->name; \ @@ -380,7 +380,7 @@ virtual void Set##name (type _arg[6]) \ } #define vtkGetVector6Macro(name,type) \ -virtual type *Get##name () \ +virtual type *Get##name () VTK_SIZEHINT(6) \ { \ vtkDebugMacro(<< this->GetClassName() << " (" << this << "): returning " << #name " pointer " << this->name); \ return this->name; \ diff --git a/Common/Core/vtkWindow.h b/Common/Core/vtkWindow.h index ea3ef45a1f75ce821b5ee912a6fd2db0f0351e46..aa02d4de812b5b6f159cb2ca340d825260da3133 100644 --- a/Common/Core/vtkWindow.h +++ b/Common/Core/vtkWindow.h @@ -59,7 +59,7 @@ public: * Set/Get the position in screen coordinates of the rendering window. * Measured in pixels. */ - virtual int *GetPosition(); + virtual int *GetPosition() VTK_SIZEHINT(2); virtual void SetPosition(int,int); virtual void SetPosition(int a[2]); //@} @@ -68,7 +68,7 @@ public: /** * Set/Get the size of the window in screen coordinates in pixels. */ - virtual int *GetSize(); + virtual int *GetSize() VTK_SIZEHINT(2); virtual void SetSize(int,int); virtual void SetSize(int a[2]); //@} @@ -77,12 +77,12 @@ public: * GetSize() returns the size * this->TileScale, whereas this method returns * the size without multiplying with the tile scale. Measured in pixels. */ - int *GetActualSize(); + int *GetActualSize() VTK_SIZEHINT(2); /** * Get the current size of the screen in pixels. */ - virtual int *GetScreenSize() = 0; + virtual int *GetScreenSize() VTK_SIZEHINT(2) = 0; //@{ /** diff --git a/Common/DataModel/vtkBoundingBox.h b/Common/DataModel/vtkBoundingBox.h index 2d1d8b705b2e2fe60318d58da51eff3a70249bff..9db555735ee7b10e80c74aa54dbae7132c746c66 100644 --- a/Common/DataModel/vtkBoundingBox.h +++ b/Common/DataModel/vtkBoundingBox.h @@ -165,7 +165,7 @@ public: /** * Get the minimum point of the bounding box. */ - const double *GetMinPoint() const; + const double *GetMinPoint() const VTK_SIZEHINT(3); void GetMinPoint(double &x, double &y, double &z) const; //@} @@ -173,7 +173,7 @@ public: /** * Get the maximum point of the bounding box. */ - const double *GetMaxPoint() const; + const double *GetMaxPoint() const VTK_SIZEHINT(3); void GetMaxPoint(double &x, double &y, double &z) const; //@} diff --git a/Common/DataModel/vtkBox.h b/Common/DataModel/vtkBox.h index 3c3aa113ca9780021bc567d62965b537097cd003..ea536c43a57076ce3999d8abd114173bf91e0646 100644 --- a/Common/DataModel/vtkBox.h +++ b/Common/DataModel/vtkBox.h @@ -80,7 +80,7 @@ public: double &yMin, double &yMax, double &zMin, double &zMax); void GetBounds(double bounds[6]); - double *GetBounds(); + double *GetBounds() VTK_SIZEHINT(6); /** * A special method that allows union set operation on bounding boxes. diff --git a/Common/DataModel/vtkCell.h b/Common/DataModel/vtkCell.h index 011a9e7d65cd8e0bc4f8f6ffa5d2c112ad96ba76..26704f6f2b2ce7f713fb8e6796ebf099b6c8f9a8 100644 --- a/Common/DataModel/vtkCell.h +++ b/Common/DataModel/vtkCell.h @@ -297,7 +297,7 @@ public: * Compute cell bounding box (xmin,xmax,ymin,ymax,zmin,zmax). Return pointer * to array of six double values. */ - double *GetBounds(); + double *GetBounds() VTK_SIZEHINT(6); /** diff --git a/Common/DataModel/vtkDataSet.h b/Common/DataModel/vtkDataSet.h index d9d0d5fd08278b2c8b67add71f87f46c51bdbc1e..1f78b557ae5279c53416b1687c37c6f3468702c7 100644 --- a/Common/DataModel/vtkDataSet.h +++ b/Common/DataModel/vtkDataSet.h @@ -90,7 +90,7 @@ public: * Get point coordinates with ptId such that: 0 <= ptId < NumberOfPoints. * THIS METHOD IS NOT THREAD SAFE. */ - virtual double *GetPoint(vtkIdType ptId) = 0; + virtual double *GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) = 0; /** * Copy point coordinates into user provided array x[3] for specified @@ -271,7 +271,7 @@ public: * (xmin,xmax, ymin,ymax, zmin,zmax). * THIS METHOD IS NOT THREAD SAFE. */ - double *GetBounds(); + double *GetBounds() VTK_SIZEHINT(6); /** * Return a pointer to the geometry bounding box in the form @@ -285,7 +285,7 @@ public: * Get the center of the bounding box. * THIS METHOD IS NOT THREAD SAFE. */ - double *GetCenter(); + double *GetCenter() VTK_SIZEHINT(3); /** * Get the center of the bounding box. @@ -328,7 +328,7 @@ public: * Update to create or refresh the scalars before calling this method. * THIS METHOD IS NOT THREAD SAFE. */ - double *GetScalarRange(); + double *GetScalarRange() VTK_SIZEHINT(2); /** * Convenience method returns largest cell size in dataset. This is generally diff --git a/Common/DataModel/vtkGraph.h b/Common/DataModel/vtkGraph.h index 271868a3c0c34169eab59776e31e3429ad20a4f5..eb61f65f86d17db4743d3fec311a8a617933df69 100644 --- a/Common/DataModel/vtkGraph.h +++ b/Common/DataModel/vtkGraph.h @@ -559,7 +559,7 @@ public: /** * Get the x,y,z location of a point along edge e. */ - double* GetEdgePoint(vtkIdType e, vtkIdType i); + double* GetEdgePoint(vtkIdType e, vtkIdType i) VTK_SIZEHINT(3); /** * Clear all points associated with an edge. diff --git a/Common/DataModel/vtkHexahedron.h b/Common/DataModel/vtkHexahedron.h index 500e938ed3a946a4a8abd5fca53368fc893c1a93..8a0158944050d2a097976c5af99592829be97baf 100644 --- a/Common/DataModel/vtkHexahedron.h +++ b/Common/DataModel/vtkHexahedron.h @@ -110,8 +110,8 @@ public: * Return the ids of the vertices defining edge/face (`edgeId`/`faceId'). * Ids are related to the cell, not to the dataset. */ - static int *GetEdgeArray(int edgeId); - static int *GetFaceArray(int faceId); + static int *GetEdgeArray(int edgeId) VTK_SIZEHINT(2); + static int *GetFaceArray(int faceId) VTK_SIZEHINT(4); //@} /** diff --git a/Common/DataModel/vtkHyperOctree.h b/Common/DataModel/vtkHyperOctree.h index c5de97fe59be3b1d58bd7ce03bf95c8c58736f93..aa6467175c5bc74b936525948df41038add192c8 100644 --- a/Common/DataModel/vtkHyperOctree.h +++ b/Common/DataModel/vtkHyperOctree.h @@ -302,7 +302,7 @@ public: * Get point coordinates with ptId such that: 0 <= ptId < NumberOfPoints. * THIS METHOD IS NOT THREAD SAFE. */ - double *GetPoint(vtkIdType ptId) override; + double *GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) override; /** * Copy point coordinates into user provided array x[3] for specified diff --git a/Common/DataModel/vtkImageData.h b/Common/DataModel/vtkImageData.h index 6fe981f84e152744500ddd329ff0e8e56381eb26..69529de1c5b5a1483be634ecb585cfdd7c3ac501 100644 --- a/Common/DataModel/vtkImageData.h +++ b/Common/DataModel/vtkImageData.h @@ -61,7 +61,7 @@ public: */ vtkIdType GetNumberOfCells() override; vtkIdType GetNumberOfPoints() override; - double *GetPoint(vtkIdType ptId) override; + double *GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) override; void GetPoint(vtkIdType id, double x[3]) override; vtkCell *GetCell(vtkIdType cellId) override; vtkCell *GetCell(int i, int j, int k) override; @@ -113,7 +113,7 @@ public: * Dimensions are computed from Extents during this call. * \warning Non thread-safe, use second signature if you want it to be. */ - virtual int *GetDimensions(); + virtual int *GetDimensions() VTK_SIZEHINT(3); /** * Get dimensions of this structured points dataset. @@ -228,10 +228,10 @@ public: * up to date. The first three methods compute the increments based on the * active scalar field while the next three, the scalar field is passed in. */ - virtual vtkIdType *GetIncrements(); + virtual vtkIdType *GetIncrements() VTK_SIZEHINT(3); virtual void GetIncrements(vtkIdType &incX, vtkIdType &incY, vtkIdType &incZ); virtual void GetIncrements(vtkIdType inc[3]); - virtual vtkIdType *GetIncrements(vtkDataArray *scalars); + virtual vtkIdType *GetIncrements(vtkDataArray *scalars) VTK_SIZEHINT(3); virtual void GetIncrements(vtkDataArray *scalars, vtkIdType &incX, vtkIdType &incY, vtkIdType &incZ); virtual void GetIncrements(vtkDataArray *scalars, vtkIdType inc[3]); diff --git a/Common/DataModel/vtkImplicitFunction.h b/Common/DataModel/vtkImplicitFunction.h index 9ae9c0e3415655832fdb33706736bad01e2537f0..921dbe9c7ab24f24bb7c73f146ad84c7f7b44d90 100644 --- a/Common/DataModel/vtkImplicitFunction.h +++ b/Common/DataModel/vtkImplicitFunction.h @@ -86,10 +86,10 @@ public: * x[3] is transformed through transform (if provided). */ void FunctionGradient(const double x[3], double g[3]); - double *FunctionGradient(const double x[3]) { + double *FunctionGradient(const double x[3]) VTK_SIZEHINT(3) { this->FunctionGradient(x,this->ReturnValue); return this->ReturnValue; }; - double *FunctionGradient(double x, double y, double z) { + double *FunctionGradient(double x, double y, double z) VTK_SIZEHINT(3) { double xyz[3] = {x, y, z}; return this->FunctionGradient(xyz); }; //@} diff --git a/Common/DataModel/vtkKdNode.h b/Common/DataModel/vtkKdNode.h index cfdfe1bddcad84bcf9528030500ccb5f0f680a96..3b07448ee68120632c6052752462bd16a4219b3b 100644 --- a/Common/DataModel/vtkKdNode.h +++ b/Common/DataModel/vtkKdNode.h @@ -104,8 +104,8 @@ public: * Get a pointer to the 3 bound minima (xmin, ymin and zmin) or the * 3 bound maxima (xmax, ymax, zmax). Don't free this pointer. */ - double *GetMinBounds() {return this->Min;} - double *GetMaxBounds() {return this->Max;} + double *GetMinBounds() VTK_SIZEHINT(3) {return this->Min;} + double *GetMaxBounds() VTK_SIZEHINT(3) {return this->Max;} /** * Set the xmin, ymin and zmin value of the bounds of this region @@ -121,8 +121,8 @@ public: * Get a pointer to the 3 data bound minima (xmin, ymin and zmin) or the * 3 data bound maxima (xmax, ymax, zmax). Don't free this pointer. */ - double *GetMinDataBounds() {return this->MinVal;} - double *GetMaxDataBounds() {return this->MaxVal;} + double *GetMinDataBounds() VTK_SIZEHINT(3) {return this->MinVal;} + double *GetMaxDataBounds() VTK_SIZEHINT(3) {return this->MaxVal;} /** * Set the xmin, ymin and zmin value of the bounds of this diff --git a/Common/DataModel/vtkLagrangeInterpolation.h b/Common/DataModel/vtkLagrangeInterpolation.h index 5d9599214f0b0b0f409706217b4355ef3155a09f..39fea8ed4f502e23791e19e470d95d7a5c1fdfa3 100644 --- a/Common/DataModel/vtkLagrangeInterpolation.h +++ b/Common/DataModel/vtkLagrangeInterpolation.h @@ -66,8 +66,8 @@ public: static int GetVaryingParameterOfHexEdge(int edgeId); static vtkVector2i GetFixedParametersOfHexEdge(int edgeId); - static const int* GetPointIndicesBoundingHexFace(int faceId); - static const int* GetEdgeIndicesBoundingHexFace(int faceId); + static const int* GetPointIndicesBoundingHexFace(int faceId) VTK_SIZEHINT(4); + static const int* GetEdgeIndicesBoundingHexFace(int faceId) VTK_SIZEHINT(4); static vtkVector2i GetVaryingParametersOfHexFace(int faceId); static int GetFixedParameterOfHexFace(int faceId); @@ -76,8 +76,8 @@ public: static int GetVaryingParameterOfWedgeEdge(int edgeId); static vtkVector2i GetFixedParametersOfWedgeEdge(int edgeId); - static const int* GetPointIndicesBoundingWedgeFace(int faceId); - static const int* GetEdgeIndicesBoundingWedgeFace(int faceId); + static const int* GetPointIndicesBoundingWedgeFace(int faceId) VTK_SIZEHINT(4); + static const int* GetEdgeIndicesBoundingWedgeFace(int faceId) VTK_SIZEHINT(4); static vtkVector2i GetVaryingParametersOfWedgeFace(int faceId); static int GetFixedParameterOfWedgeFace(int faceId); diff --git a/Common/DataModel/vtkPointSet.h b/Common/DataModel/vtkPointSet.h index 39e4e57e52162657e74a1d3ff1ce17772a60a417..06199b452c6a1165bb73530e7d88a8ed188455f0 100644 --- a/Common/DataModel/vtkPointSet.h +++ b/Common/DataModel/vtkPointSet.h @@ -77,7 +77,7 @@ public: * and its values are only valid as long as another method invocation is not * performed. Prefer GetPoint() with the return value in argument. */ - double *GetPoint(vtkIdType ptId) override + double *GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) override {return this->Points->GetPoint(ptId);}; /** diff --git a/Common/DataModel/vtkPyramid.h b/Common/DataModel/vtkPyramid.h index 148a1e544f993c94ae8f8a43a21887e43ae006bf..83978d37ea7809a528ab1a796f5967304cf0ddfe 100644 --- a/Common/DataModel/vtkPyramid.h +++ b/Common/DataModel/vtkPyramid.h @@ -119,8 +119,8 @@ public: * Return the ids of the vertices defining edge/face (`edgeId`/`faceId'). * Ids are related to the cell, not to the dataset. */ - static int *GetEdgeArray(int edgeId); - static int *GetFaceArray(int faceId); + static int *GetEdgeArray(int edgeId) VTK_SIZEHINT(2); + static int *GetFaceArray(int faceId) VTK_SIZEHINT(4); //@} protected: diff --git a/Common/DataModel/vtkRectilinearGrid.h b/Common/DataModel/vtkRectilinearGrid.h index 884ac8847ba30766d7105172b0cd427de320d95a..0cc40990015f785cecbcb10289aa1b04ecfef6bd 100644 --- a/Common/DataModel/vtkRectilinearGrid.h +++ b/Common/DataModel/vtkRectilinearGrid.h @@ -77,7 +77,7 @@ public: */ vtkIdType GetNumberOfCells() override; vtkIdType GetNumberOfPoints() override; - double *GetPoint(vtkIdType ptId) override; + double *GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) override; void GetPoint(vtkIdType id, double x[3]) override; vtkCell *GetCell(vtkIdType cellId) override; vtkCell *GetCell(int i, int j, int k) override; diff --git a/Common/DataModel/vtkStructuredGrid.h b/Common/DataModel/vtkStructuredGrid.h index 3f9ee86204bccf60764c0f9b090737221c668c83..c71571bbe8b391cd4f29c3c9be5d013cf01c735a 100644 --- a/Common/DataModel/vtkStructuredGrid.h +++ b/Common/DataModel/vtkStructuredGrid.h @@ -78,7 +78,7 @@ public: */ vtkIdType GetNumberOfPoints() override {return vtkPointSet::GetNumberOfPoints();} - double *GetPoint(vtkIdType ptId) override + double *GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) override {return this->vtkPointSet::GetPoint(ptId);} void GetPoint(vtkIdType ptId, double p[3]) override {this->vtkPointSet::GetPoint(ptId,p);} @@ -113,7 +113,7 @@ public: /** * Get dimensions of this structured points dataset. */ - virtual int *GetDimensions (); + virtual int *GetDimensions () VTK_SIZEHINT(3); virtual void GetDimensions (int dim[3]); //@} diff --git a/Common/DataModel/vtkTetra.h b/Common/DataModel/vtkTetra.h index 12d2b029d843826b3f37725f523413394dab9ff9..5f157a74ded8dee543ec11ea66405259ee797885 100644 --- a/Common/DataModel/vtkTetra.h +++ b/Common/DataModel/vtkTetra.h @@ -182,8 +182,8 @@ public: * Return the ids of the vertices defining edge/face (`edgeId`/`faceId'). * Ids are related to the cell, not to the dataset. */ - static int *GetEdgeArray(int edgeId); - static int *GetFaceArray(int faceId); + static int *GetEdgeArray(int edgeId) VTK_SIZEHINT(2); + static int *GetFaceArray(int faceId) VTK_SIZEHINT(3); //@} protected: diff --git a/Common/DataModel/vtkVoxel.h b/Common/DataModel/vtkVoxel.h index a49f0066034342c95b5861ba412a8ef03bc804d9..63c8839fa3e7d019ed44ff5d4e024d5fe8abc9cf 100644 --- a/Common/DataModel/vtkVoxel.h +++ b/Common/DataModel/vtkVoxel.h @@ -110,8 +110,8 @@ public: * Return the ids of the vertices defining edge/face (`edgeId`/`faceId'). * Ids are related to the cell, not to the dataset. */ - static int *GetEdgeArray(int edgeId); - static int *GetFaceArray(int faceId); + static int *GetEdgeArray(int edgeId) VTK_SIZEHINT(2); + static int *GetFaceArray(int faceId) VTK_SIZEHINT(4); //@} protected: diff --git a/Common/DataModel/vtkWedge.h b/Common/DataModel/vtkWedge.h index d3815809c64866353ad3192e60235857397b9de3..73ea4673fad796f591d0264f9e3d747ae2b12e15 100644 --- a/Common/DataModel/vtkWedge.h +++ b/Common/DataModel/vtkWedge.h @@ -118,8 +118,8 @@ public: * Return the ids of the vertices defining edge/face (`edgeId`/`faceId'). * Ids are related to the cell, not to the dataset. */ - static int *GetEdgeArray(int edgeId); - static int *GetFaceArray(int faceId); + static int *GetEdgeArray(int edgeId) VTK_SIZEHINT(2); + static int *GetFaceArray(int faceId) VTK_SIZEHINT(4); //@} protected: diff --git a/Common/ExecutionModel/vtkAlgorithm.h b/Common/ExecutionModel/vtkAlgorithm.h index 64b55ec2873477c22559c2e068a46b09dd68bba1..ebcbefe63c76747a0b3c01a085d8c556f9f7b5e9 100644 --- a/Common/ExecutionModel/vtkAlgorithm.h +++ b/Common/ExecutionModel/vtkAlgorithm.h @@ -660,11 +660,11 @@ public: * use 3D extents. Where port is not specified, it is assumed to * be 0. */ - int* GetUpdateExtent() + int* GetUpdateExtent() VTK_SIZEHINT(6) { return this->GetUpdateExtent(0); } - int* GetUpdateExtent(int port); + int* GetUpdateExtent(int port) VTK_SIZEHINT(6); void GetUpdateExtent(int& x0, int& x1, int& y0, int& y1, int& z0, int& z1) { diff --git a/Common/ExecutionModel/vtkExtentSplitter.h b/Common/ExecutionModel/vtkExtentSplitter.h index f51f757289aceef53ee0e280e73bb2cb9dba5433..e029669e05a9d9e6e869b4e1686d62c4755d36f7 100644 --- a/Common/ExecutionModel/vtkExtentSplitter.h +++ b/Common/ExecutionModel/vtkExtentSplitter.h @@ -85,7 +85,7 @@ public: * sub-extent should be read. Valid after a call to * ComputeSubExtents. */ - int* GetSubExtent(int index); + int* GetSubExtent(int index) VTK_SIZEHINT(6); void GetSubExtent(int index, int* extent); //@} diff --git a/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h index a5c35bb1b1f89f137e520971281292b6d37327e0..2a2672597d687d61896808335ff8e3f38f246fe9 100644 --- a/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h +++ b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h @@ -114,7 +114,7 @@ public: */ static int SetWholeExtent(vtkInformation *, int extent[6]); static void GetWholeExtent(vtkInformation *, int extent[6]); - static int* GetWholeExtent(vtkInformation *); + static int* GetWholeExtent(vtkInformation *) VTK_SIZEHINT(6); //@} //@{ diff --git a/Common/Math/vtkMatrix4x4.h b/Common/Math/vtkMatrix4x4.h index 5d7438a6aabaa6b1e0fe4bef3db6251fb86ee73e..f037cd14e1b1767d4397c2e95a1ec9fd9bbe8b26 100644 --- a/Common/Math/vtkMatrix4x4.h +++ b/Common/Math/vtkMatrix4x4.h @@ -124,11 +124,11 @@ public: * For use in Java or Python. The default MultiplyPoint() uses a * single-precision point. */ - float *MultiplyPoint(const float in[4]) + float *MultiplyPoint(const float in[4]) VTK_SIZEHINT(4) {return this->MultiplyFloatPoint(in); } - float *MultiplyFloatPoint(const float in[4]) + float *MultiplyFloatPoint(const float in[4]) VTK_SIZEHINT(4) {this->MultiplyPoint(in,this->FloatPoint); return this->FloatPoint; } - double *MultiplyDoublePoint(const double in[4]) + double *MultiplyDoublePoint(const double in[4]) VTK_SIZEHINT(4) {this->MultiplyPoint(in,this->DoublePoint); return this->DoublePoint; } //@{ diff --git a/Common/Misc/vtkFunctionParser.h b/Common/Misc/vtkFunctionParser.h index 56434526144bce3c1e15fe6f6ff6dc0808f28c5f..025df7fe045ec4e26dcca89fb33c710250a778ee 100644 --- a/Common/Misc/vtkFunctionParser.h +++ b/Common/Misc/vtkFunctionParser.h @@ -171,7 +171,7 @@ public: /** * Get a vector result from evaluating the input function. */ - double* GetVectorResult(); + double* GetVectorResult() VTK_SIZEHINT(3); void GetVectorResult(double result[3]) { double *r = this->GetVectorResult(); result[0] = r[0]; result[1] = r[1]; result[2] = r[2]; }; @@ -218,11 +218,11 @@ public: /** * Get the value of a vector variable. */ - double* GetVectorVariableValue(const char* variableName); + double* GetVectorVariableValue(const char* variableName) VTK_SIZEHINT(3); void GetVectorVariableValue(const char* variableName, double value[3]) { double *r = this->GetVectorVariableValue(variableName); value[0] = r[0]; value[1] = r[1]; value[2] = r[2]; }; - double* GetVectorVariableValue(int i); + double* GetVectorVariableValue(int i) VTK_SIZEHINT(3); void GetVectorVariableValue(int i, double value[3]) { double *r = this->GetVectorVariableValue(i); value[0] = r[0]; value[1] = r[1]; value[2] = r[2]; }; diff --git a/Common/Transforms/vtkAbstractTransform.h b/Common/Transforms/vtkAbstractTransform.h index 15a58d6356db5f69fc1d4b9b19b985d7ffc81a2c..b1b0d936eb5d0b417166d996c3a8ca89e353b137 100644 --- a/Common/Transforms/vtkAbstractTransform.h +++ b/Common/Transforms/vtkAbstractTransform.h @@ -59,37 +59,49 @@ public: * array to store both the input and output point. */ void TransformPoint(const float in[3], float out[3]) { - this->Update(); this->InternalTransformPoint(in,out); }; + this->Update(); this->InternalTransformPoint(in,out); } /** * Apply the transformation to a double-precision coordinate. * You can use the same array to store both the input and output point. */ void TransformPoint(const double in[3], double out[3]) { - this->Update(); this->InternalTransformPoint(in,out); }; + this->Update(); this->InternalTransformPoint(in,out); } /** * Apply the transformation to a double-precision coordinate. * Use this if you are programming in Python or Java. */ - double *TransformPoint(double x, double y, double z) { - return this->TransformDoublePoint(x,y,z); } - double *TransformPoint(const double point[3]) { - return this->TransformPoint(point[0],point[1],point[2]); }; + double *TransformPoint(double x, double y, double z) + VTK_SIZEHINT(3) + { + return this->TransformDoublePoint(x,y,z); + } + double *TransformPoint(const double point[3]) + VTK_SIZEHINT(3) + { + return this->TransformPoint(point[0],point[1],point[2]); + } //@{ /** * Apply the transformation to an (x,y,z) coordinate. * Use this if you are programming in Python or Java. */ - float *TransformFloatPoint(float x, float y, float z) { + float *TransformFloatPoint(float x, float y, float z) + VTK_SIZEHINT(3) + { this->InternalFloatPoint[0] = x; this->InternalFloatPoint[1] = y; this->InternalFloatPoint[2] = z; this->TransformPoint(this->InternalFloatPoint,this->InternalFloatPoint); - return this->InternalFloatPoint; }; - float *TransformFloatPoint(const float point[3]) { - return this->TransformFloatPoint(point[0],point[1],point[2]); }; + return this->InternalFloatPoint; + } + float *TransformFloatPoint(const float point[3]) + VTK_SIZEHINT(3) + { + return this->TransformFloatPoint(point[0],point[1],point[2]); + } //@} //@{ @@ -97,14 +109,20 @@ public: * Apply the transformation to a double-precision (x,y,z) coordinate. * Use this if you are programming in Python or Java. */ - double *TransformDoublePoint(double x, double y, double z) { + double *TransformDoublePoint(double x, double y, double z) + VTK_SIZEHINT(3) + { this->InternalDoublePoint[0] = x; this->InternalDoublePoint[1] = y; this->InternalDoublePoint[2] = z; this->TransformPoint(this->InternalDoublePoint,this->InternalDoublePoint); - return this->InternalDoublePoint; }; - double *TransformDoublePoint(const double point[3]) { - return this->TransformDoublePoint(point[0],point[1],point[2]); }; + return this->InternalDoublePoint; + } + double *TransformDoublePoint(const double point[3]) + VTK_SIZEHINT(3) + { + return this->TransformDoublePoint(point[0],point[1],point[2]); + } //@} //@{ @@ -120,9 +138,12 @@ public: //@} double *TransformNormalAtPoint(const double point[3], - const double normal[3]) { + const double normal[3]) + VTK_SIZEHINT(3) + { this->TransformNormalAtPoint(point,normal,this->InternalDoublePoint); - return this->InternalDoublePoint; }; + return this->InternalDoublePoint; + } //@{ /** @@ -131,9 +152,12 @@ public: * TransformDoubleNormal() instead. */ double *TransformDoubleNormalAtPoint(const double point[3], - const double normal[3]) { + const double normal[3]) + VTK_SIZEHINT(3) + { this->TransformNormalAtPoint(point,normal,this->InternalDoublePoint); - return this->InternalDoublePoint; }; + return this->InternalDoublePoint; + } //@} //@{ @@ -143,9 +167,12 @@ public: * TransformFloatNormal() instead. */ float *TransformFloatNormalAtPoint(const float point[3], - const float normal[3]) { + const float normal[3]) + VTK_SIZEHINT(3) + { this->TransformNormalAtPoint(point,normal,this->InternalFloatPoint); - return this->InternalFloatPoint; }; + return this->InternalFloatPoint; + } //@} //@{ @@ -161,9 +188,12 @@ public: //@} double *TransformVectorAtPoint(const double point[3], - const double vector[3]) { + const double vector[3]) + VTK_SIZEHINT(3) + { this->TransformVectorAtPoint(point,vector,this->InternalDoublePoint); - return this->InternalDoublePoint; }; + return this->InternalDoublePoint; + } //@{ /** @@ -172,9 +202,12 @@ public: * TransformDoubleVector() instead. */ double *TransformDoubleVectorAtPoint(const double point[3], - const double vector[3]) { + const double vector[3]) + VTK_SIZEHINT(3) + { this->TransformVectorAtPoint(point,vector,this->InternalDoublePoint); - return this->InternalDoublePoint; }; + return this->InternalDoublePoint; + } //@} //@{ @@ -184,9 +217,12 @@ public: * TransformFloatVector() instead. */ float *TransformFloatVectorAtPoint(const float point[3], - const float vector[3]) { + const float vector[3]) + VTK_SIZEHINT(3) + { this->TransformVectorAtPoint(point,vector,this->InternalFloatPoint); - return this->InternalFloatPoint; }; + return this->InternalFloatPoint; + } //@} /** @@ -348,7 +384,7 @@ public: void SwapForwardInverse() { vtkAbstractTransform *tmp = this->ForwardTransform; this->ForwardTransform = this->InverseTransform; - this->InverseTransform = tmp; }; + this->InverseTransform = tmp; } }; // .NAME vtkTransformConcatenation - store a series of transformations. @@ -359,8 +395,8 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransformConcatenation { public: static vtkTransformConcatenation *New() { - return new vtkTransformConcatenation(); }; - void Delete() { delete this; }; + return new vtkTransformConcatenation(); } + void Delete() { delete this; } /** * add a transform to the list according to Pre/PostMultiply semantics @@ -376,8 +412,8 @@ public: /** * set/get the PreMultiply flag */ - void SetPreMultiplyFlag(int flag) { this->PreMultiplyFlag = flag; }; - int GetPreMultiplyFlag() { return this->PreMultiplyFlag; }; + void SetPreMultiplyFlag(int flag) { this->PreMultiplyFlag = flag; } + int GetPreMultiplyFlag() { return this->PreMultiplyFlag; } //@} //@{ @@ -397,7 +433,7 @@ public: /** * get the inverse flag */ - int GetInverseFlag() { return this->InverseFlag; }; + int GetInverseFlag() { return this->InverseFlag; } /** * identity simply clears the transform list @@ -410,20 +446,20 @@ public: /** * the number of stored transforms */ - int GetNumberOfTransforms() { return this->NumberOfTransforms; }; + int GetNumberOfTransforms() { return this->NumberOfTransforms; } /** * the number of transforms that were pre-concatenated (note that * whenever Iverse() is called, the pre-concatenated and * post-concatenated transforms are switched) */ - int GetNumberOfPreTransforms() { return this->NumberOfPreTransforms; }; + int GetNumberOfPreTransforms() { return this->NumberOfPreTransforms; } /** * the number of transforms that were post-concatenated. */ int GetNumberOfPostTransforms() { - return this->NumberOfTransforms-this->NumberOfPreTransforms; }; + return this->NumberOfTransforms-this->NumberOfPreTransforms; } /** * get one of the transforms diff --git a/Common/Transforms/vtkLinearTransform.h b/Common/Transforms/vtkLinearTransform.h index 3500f4fbdf2bfe3c3e0fbe769ac8f13374b070f0..99e244a60c00a9ab57353c5b7d461b1db2f3177d 100644 --- a/Common/Transforms/vtkLinearTransform.h +++ b/Common/Transforms/vtkLinearTransform.h @@ -53,9 +53,9 @@ public: * Synonymous with TransformDoubleNormal(x,y,z). * Use this if you are programming in python or Java. */ - double *TransformNormal(double x, double y, double z) { + double *TransformNormal(double x, double y, double z) VTK_SIZEHINT(3) { return this->TransformDoubleNormal(x,y,z); } - double *TransformNormal(const double normal[3]) { + double *TransformNormal(const double normal[3]) VTK_SIZEHINT(3) { return this->TransformDoubleNormal(normal[0],normal[1],normal[2]); }; //@{ @@ -63,13 +63,13 @@ public: * Apply the transformation to an (x,y,z) normal. * Use this if you are programming in python or Java. */ - float *TransformFloatNormal(float x, float y, float z) { + float *TransformFloatNormal(float x, float y, float z) VTK_SIZEHINT(3) { this->InternalFloatPoint[0] = x; this->InternalFloatPoint[1] = y; this->InternalFloatPoint[2] = z; this->TransformNormal(this->InternalFloatPoint,this->InternalFloatPoint); return this->InternalFloatPoint; }; - float *TransformFloatNormal(const float normal[3]) { + float *TransformFloatNormal(const float normal[3]) VTK_SIZEHINT(3) { return this->TransformFloatNormal(normal[0],normal[1],normal[2]); }; //@} @@ -78,13 +78,13 @@ public: * Apply the transformation to a double-precision (x,y,z) normal. * Use this if you are programming in python or Java. */ - double *TransformDoubleNormal(double x, double y, double z) { + double *TransformDoubleNormal(double x, double y, double z) VTK_SIZEHINT(3) { this->InternalDoublePoint[0] = x; this->InternalDoublePoint[1] = y; this->InternalDoublePoint[2] = z; this->TransformNormal(this->InternalDoublePoint,this->InternalDoublePoint); return this->InternalDoublePoint; }; - double *TransformDoubleNormal(const double normal[3]) { + double *TransformDoubleNormal(const double normal[3]) VTK_SIZEHINT(3) { return this->TransformDoubleNormal(normal[0],normal[1],normal[2]); }; //@} @@ -92,9 +92,9 @@ public: * Synonymous with TransformDoubleVector(x,y,z). * Use this if you are programming in python or Java. */ - double *TransformVector(double x, double y, double z) { + double *TransformVector(double x, double y, double z) VTK_SIZEHINT(3) { return this->TransformDoubleVector(x,y,z); } - double *TransformVector(const double normal[3]) { + double *TransformVector(const double normal[3]) VTK_SIZEHINT(3) { return this->TransformDoubleVector(normal[0],normal[1],normal[2]); }; /** @@ -116,13 +116,13 @@ public: * Apply the transformation to an (x,y,z) vector. * Use this if you are programming in python or Java. */ - float *TransformFloatVector(float x, float y, float z) { + float *TransformFloatVector(float x, float y, float z) VTK_SIZEHINT(3) { this->InternalFloatPoint[0] = x; this->InternalFloatPoint[1] = y; this->InternalFloatPoint[2] = z; this->TransformVector(this->InternalFloatPoint,this->InternalFloatPoint); return this->InternalFloatPoint; }; - float *TransformFloatVector(const float vec[3]) { + float *TransformFloatVector(const float vec[3]) VTK_SIZEHINT(3) { return this->TransformFloatVector(vec[0],vec[1],vec[2]); }; //@} @@ -131,13 +131,13 @@ public: * Apply the transformation to a double-precision (x,y,z) vector. * Use this if you are programming in python or Java. */ - double *TransformDoubleVector(double x, double y, double z) { + double *TransformDoubleVector(double x, double y, double z) VTK_SIZEHINT(3) { this->InternalDoublePoint[0] = x; this->InternalDoublePoint[1] = y; this->InternalDoublePoint[2] = z; this->TransformVector(this->InternalDoublePoint,this->InternalDoublePoint); return this->InternalDoublePoint; }; - double *TransformDoubleVector(const double vec[3]) { + double *TransformDoubleVector(const double vec[3]) VTK_SIZEHINT(3) { return this->TransformDoubleVector(vec[0],vec[1],vec[2]); }; //@} diff --git a/Common/Transforms/vtkTransform.h b/Common/Transforms/vtkTransform.h index c47a55ca2024e449caefbe8657b745a181bd9075..ac316bcdf056da7d1e11c23e6e1ae9cf72c08af3 100644 --- a/Common/Transforms/vtkTransform.h +++ b/Common/Transforms/vtkTransform.h @@ -228,7 +228,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform orient[0] = static_cast(temp[0]); orient[1] = static_cast(temp[1]); orient[2] = static_cast(temp[2]); }; - double *GetOrientation() { + double *GetOrientation() VTK_SIZEHINT(3) { this->GetOrientation(this->ReturnValue); return this->ReturnValue; }; //@} @@ -250,7 +250,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform wxyz[1]=static_cast(temp[1]); wxyz[2]=static_cast(temp[2]); wxyz[3]=static_cast(temp[3]);}; - double *GetOrientationWXYZ() { + double *GetOrientationWXYZ() VTK_SIZEHINT(4) { this->GetOrientationWXYZ(this->ReturnValue); return this->ReturnValue; }; //@} @@ -266,7 +266,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform pos[0] = static_cast(temp[0]); pos[1] = static_cast(temp[1]); pos[2] = static_cast(temp[2]); }; - double *GetPosition() { + double *GetPosition() VTK_SIZEHINT(3) { this->GetPosition(this->ReturnValue); return this->ReturnValue; }; //@} @@ -283,7 +283,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform scale[0] = static_cast(temp[0]); scale[1] = static_cast(temp[1]); scale[2] = static_cast(temp[2]); }; - double *GetScale() { + double *GetScale() VTK_SIZEHINT(3) { this->GetScale(this->ReturnValue); return this->ReturnValue; }; //@} diff --git a/Examples/Build/vtkMy/CMakeOptions.cmake b/Examples/Build/vtkMy/CMakeOptions.cmake index 6b31907d449d70bb72eba1f85cc128c8614cfcff..62a68f78519b4e4e20a6615e6dbe471513b74d37 100644 --- a/Examples/Build/vtkMy/CMakeOptions.cmake +++ b/Examples/Build/vtkMy/CMakeOptions.cmake @@ -119,6 +119,3 @@ else () endif () endif () - -# Setup our local hints file in case wrappers need them. -set(VTK_WRAP_HINTS ${VTKMY_SOURCE_DIR}/Wrapping/hints) diff --git a/Examples/Build/vtkMy/Wrapping/hints b/Examples/Build/vtkMy/Wrapping/hints deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/Filters/Core/vtkQuadricClustering.h b/Filters/Core/vtkQuadricClustering.h index 0725aa0fad8c1c766f41018d145944ecbc7617cc..71364197a1692d09dc26c00bf66423e78fb0606e 100644 --- a/Filters/Core/vtkQuadricClustering.h +++ b/Filters/Core/vtkQuadricClustering.h @@ -123,7 +123,7 @@ public: void SetNumberOfDivisions(int div[3]) { this->SetNumberOfDivisions(div[0], div[1], div[2]); } void SetNumberOfDivisions(int div0, int div1, int div2); - int *GetNumberOfDivisions(); + int *GetNumberOfDivisions() VTK_SIZEHINT(3); void GetNumberOfDivisions(int div[3]); //@} diff --git a/Filters/Extraction/vtkExtractUnstructuredGrid.h b/Filters/Extraction/vtkExtractUnstructuredGrid.h index 37ce2a28d59e3e7ffed4a49f0fa658f48d405e81..8e9363ba92273fc1dd16efadab5710e4639ede5e 100644 --- a/Filters/Extraction/vtkExtractUnstructuredGrid.h +++ b/Filters/Extraction/vtkExtractUnstructuredGrid.h @@ -125,7 +125,7 @@ public: * Set / get a (xmin,xmax, ymin,ymax, zmin,zmax) bounding box to clip data. */ void SetExtent(double extent[6]); - double *GetExtent() { return this->Extent;}; + double *GetExtent() VTK_SIZEHINT(6) { return this->Extent;}; //@} //@{ diff --git a/Filters/General/vtkHyperStreamline.h b/Filters/General/vtkHyperStreamline.h index d8ff54215762fe59e5a2c4e7d2b7a2cb23c54390..fb77abcc81f137afd2f317e9d5f7b6dc259647ae 100644 --- a/Filters/General/vtkHyperStreamline.h +++ b/Filters/General/vtkHyperStreamline.h @@ -112,7 +112,7 @@ public: /** * Get the start position of the hyperstreamline in global x-y-z coordinates. */ - double *GetStartPosition(); + double *GetStartPosition() VTK_SIZEHINT(3); //@{ /** diff --git a/Filters/General/vtkWarpLens.h b/Filters/General/vtkWarpLens.h index 22273943d036c4e5c6f2f135318a895e31ac2324..773619dfed0af8112605c6844283e63aeba6425e 100644 --- a/Filters/General/vtkWarpLens.h +++ b/Filters/General/vtkWarpLens.h @@ -48,7 +48,7 @@ public: * This is obsoleted by newer instance variables. */ void SetCenter(double centerX, double centerY); - double *GetCenter(); + double *GetCenter() VTK_SIZEHINT(2); //@} //@{ diff --git a/Filters/Geometry/vtkGeometryFilter.h b/Filters/Geometry/vtkGeometryFilter.h index 969bfb91b7a54f65a8771a432f69ecd000e640e2..f90cde37b7de2a40f739764fe4cb6023a91b71ef 100644 --- a/Filters/Geometry/vtkGeometryFilter.h +++ b/Filters/Geometry/vtkGeometryFilter.h @@ -135,7 +135,7 @@ public: * Set / get a (xmin,xmax, ymin,ymax, zmin,zmax) bounding box to clip data. */ void SetExtent(double extent[6]); - double *GetExtent() { return this->Extent;}; + double *GetExtent() VTK_SIZEHINT(6) { return this->Extent;}; //@} //@{ diff --git a/IO/Image/vtkDICOMImageReader.h b/IO/Image/vtkDICOMImageReader.h index 80d7b70c5ed0a40dfdd3f4e25384e5f43eb86960..e61d5007553e28787b0e3abd670780f39dbe8e83 100644 --- a/IO/Image/vtkDICOMImageReader.h +++ b/IO/Image/vtkDICOMImageReader.h @@ -99,7 +99,7 @@ class VTKIOIMAGE_EXPORT vtkDICOMImageReader : public vtkImageReader2 * thickness. If there is more than one slice, it is set to the distance * between the first two slices. */ - double* GetPixelSpacing(); + double* GetPixelSpacing() VTK_SIZEHINT(3); /** * Returns the image width. @@ -116,14 +116,14 @@ class VTKIOIMAGE_EXPORT vtkDICOMImageReader : public vtkImageReader2 * image (upper left hand corner) of the last image processed by the * DICOMParser */ - float* GetImagePositionPatient(); + float* GetImagePositionPatient() VTK_SIZEHINT(3); /** * Get the (DICOM) directions cosines. It consist of the components * of the first two vectors. The third vector needs to be computed * to form an orthonormal basis. */ - float* GetImageOrientationPatient(); + float* GetImageOrientationPatient() VTK_SIZEHINT(6); /** * Get the number of bits allocated for each pixel in the file. diff --git a/IO/Image/vtkImageExport.h b/IO/Image/vtkImageExport.h index 3f01b8cf968b8260f70798013149d50d99d63d75..d91552b30bae70ad0324e065d5b4f9e0bd7c90c7 100644 --- a/IO/Image/vtkImageExport.h +++ b/IO/Image/vtkImageExport.h @@ -53,7 +53,7 @@ public: * that C arrays are indexed in decreasing order, i.e. array[z][y][x]. */ void GetDataDimensions(int *ptr); - int *GetDataDimensions() { + int *GetDataDimensions() VTK_SIZEHINT(3) { this->GetDataDimensions(this->DataDimensions); return this->DataDimensions; } //@} @@ -77,11 +77,11 @@ public: /** * Get miscellaneous additional information about the data. */ - int *GetDataExtent(); + int *GetDataExtent() VTK_SIZEHINT(6); void GetDataExtent(int *ptr); - double *GetDataSpacing(); + double *GetDataSpacing() VTK_SIZEHINT(3); void GetDataSpacing(double *ptr); - double *GetDataOrigin(); + double *GetDataOrigin() VTK_SIZEHINT(3); void GetDataOrigin(double *ptr); //@} diff --git a/IO/Image/vtkMedicalImageProperties.h b/IO/Image/vtkMedicalImageProperties.h index 79b54a810c402932a837d46c055a7f29ff5de982..d90beb5a0c3757b3623d0687031adacdf0e5d62e 100644 --- a/IO/Image/vtkMedicalImageProperties.h +++ b/IO/Image/vtkMedicalImageProperties.h @@ -441,7 +441,7 @@ public: virtual int HasWindowLevelPreset(double w, double l); virtual int GetWindowLevelPresetIndex(double w, double l); virtual int GetNthWindowLevelPreset(int idx, double *w, double *l); - virtual double* GetNthWindowLevelPreset(int idx); + virtual double* GetNthWindowLevelPreset(int idx) VTK_SIZEHINT(2); virtual void SetNthWindowLevelPresetComment(int idx, const char *comment); virtual const char* GetNthWindowLevelPresetComment(int idx); //@} diff --git a/IO/MINC/vtkMINCImageReader.h b/IO/MINC/vtkMINCImageReader.h index 95b0a027908ac2fe96b3fe3bbf2af7e3918ceda3..c73da98e3a6dd7e6a56df7f9a1d2fe21eb6a3602 100644 --- a/IO/MINC/vtkMINCImageReader.h +++ b/IO/MINC/vtkMINCImageReader.h @@ -147,7 +147,7 @@ public: * scalar range, but in some cases the MINC file stores an * incorrect valid_range and the DataRange will be incorrect. */ - virtual double *GetDataRange(); + virtual double *GetDataRange() VTK_SIZEHINT(2); virtual void GetDataRange(double range[2]) { double *r = this->GetDataRange(); range[0] = r[0]; range[1] = r[1]; }; diff --git a/Imaging/Core/vtkImageClip.h b/Imaging/Core/vtkImageClip.h index f204e73122e4bdc2dae89a33ec33ec4943f80946..982ba438f0cf2572b999050d3ad5f59e7528e8a9 100644 --- a/Imaging/Core/vtkImageClip.h +++ b/Imaging/Core/vtkImageClip.h @@ -49,7 +49,7 @@ public: void SetOutputWholeExtent(int minX, int maxX, int minY, int maxY, int minZ, int maxZ); void GetOutputWholeExtent(int extent[6]); - int *GetOutputWholeExtent() {return this->OutputWholeExtent;} + int *GetOutputWholeExtent() VTK_SIZEHINT(6) {return this->OutputWholeExtent;} //@} void ResetOutputWholeExtent(); diff --git a/Imaging/Core/vtkImagePadFilter.h b/Imaging/Core/vtkImagePadFilter.h index a50ea6c7710dae75a4c4069cfc9f18690ae49ee1..5f3bfa52729bc02b639b8dc8d92c3f3428616c90 100644 --- a/Imaging/Core/vtkImagePadFilter.h +++ b/Imaging/Core/vtkImagePadFilter.h @@ -43,7 +43,7 @@ public: void SetOutputWholeExtent(int minX, int maxX, int minY, int maxY, int minZ, int maxZ); void GetOutputWholeExtent(int extent[6]); - int *GetOutputWholeExtent() {return this->OutputWholeExtent;} + int *GetOutputWholeExtent() VTK_SIZEHINT(6) {return this->OutputWholeExtent;} //@} //@{ diff --git a/Imaging/Core/vtkImagePointDataIterator.h b/Imaging/Core/vtkImagePointDataIterator.h index 763e73c248e3907b6110cbd4067fe88dc6fe174d..2538857ac35e5b8f6198bcaefa26d59801837405 100644 --- a/Imaging/Core/vtkImagePointDataIterator.h +++ b/Imaging/Core/vtkImagePointDataIterator.h @@ -111,7 +111,7 @@ public: /** * Get the index at the beginning of the current span. */ - const int *GetIndex() + const int *GetIndex() VTK_SIZEHINT(3) { return this->Index; } diff --git a/Imaging/Core/vtkImagePointIterator.h b/Imaging/Core/vtkImagePointIterator.h index e6537ffa7327d61af852b476bd677a1e7a376f49..0ace5758e39e53c5a550b23b507eece14d24c2b4 100644 --- a/Imaging/Core/vtkImagePointIterator.h +++ b/Imaging/Core/vtkImagePointIterator.h @@ -110,7 +110,7 @@ public: /** * Get the current position. */ - double *GetPosition() + double *GetPosition() VTK_SIZEHINT(3) { return this->Position; } diff --git a/Imaging/Core/vtkImageReslice.h b/Imaging/Core/vtkImageReslice.h index def0dddac5b4829572f61408f96aa8de3b8475ff..c3f008e32f49bccb9712f1688d69b64a0c9b1757 100644 --- a/Imaging/Core/vtkImageReslice.h +++ b/Imaging/Core/vtkImageReslice.h @@ -119,7 +119,7 @@ public: void GetResliceAxesDirectionCosines(double x[3], double y[3], double z[3]); void GetResliceAxesDirectionCosines(double xyz[9]) { this->GetResliceAxesDirectionCosines(&xyz[0], &xyz[3], &xyz[6]); }; - double *GetResliceAxesDirectionCosines() { + double *GetResliceAxesDirectionCosines() VTK_SIZEHINT(9) { this->GetResliceAxesDirectionCosines(this->ResliceAxesDirectionCosines); return this->ResliceAxesDirectionCosines; }; //@} @@ -135,7 +135,7 @@ public: void SetResliceAxesOrigin(const double xyz[3]) { this->SetResliceAxesOrigin(xyz[0], xyz[1], xyz[2]); }; void GetResliceAxesOrigin(double xyz[3]); - double *GetResliceAxesOrigin() { + double *GetResliceAxesOrigin() VTK_SIZEHINT(3) { this->GetResliceAxesOrigin(this->ResliceAxesOrigin); return this->ResliceAxesOrigin; }; //@} diff --git a/Imaging/Core/vtkImageSincInterpolator.h b/Imaging/Core/vtkImageSincInterpolator.h index 60e3b7849eb3f61eb4753cbe117013aeba91fda9..a13915ad8740e332a5ea778e8f11f2cbc7d8459a 100644 --- a/Imaging/Core/vtkImageSincInterpolator.h +++ b/Imaging/Core/vtkImageSincInterpolator.h @@ -148,7 +148,7 @@ public: f[0] = this->BlurFactors[0]; f[1] = this->BlurFactors[1]; f[2] = this->BlurFactors[2]; } - double *GetBlurFactors() { return this->BlurFactors; } + double *GetBlurFactors() VTK_SIZEHINT(3) { return this->BlurFactors; } //@} /** diff --git a/Imaging/General/vtkImageConvolve.h b/Imaging/General/vtkImageConvolve.h index e529657e867d2097a72b4b6aafbe513a6c70936c..297a9c589a812bff429d8212a094a0be81391a41 100644 --- a/Imaging/General/vtkImageConvolve.h +++ b/Imaging/General/vtkImageConvolve.h @@ -60,13 +60,13 @@ public: /** * Return an array that contains the kernel. */ - double* GetKernel3x3(); + double* GetKernel3x3() VTK_SIZEHINT(9); void GetKernel3x3(double kernel[9]); - double* GetKernel5x5(); + double* GetKernel5x5() VTK_SIZEHINT(25); void GetKernel5x5(double kernel[25]); //@} - double* GetKernel7x7(); + double* GetKernel7x7() VTK_SIZEHINT(49); void GetKernel7x7(double kernel[49]); /** @@ -81,13 +81,13 @@ public: /** * Return an array that contains the kernel */ - double* GetKernel3x3x3(); + double* GetKernel3x3x3() VTK_SIZEHINT(27); void GetKernel3x3x3(double kernel[27]); //@} - double* GetKernel5x5x5(); + double* GetKernel5x5x5() VTK_SIZEHINT(125); void GetKernel5x5x5(double kernel[125]); - double* GetKernel7x7x7(); + double* GetKernel7x7x7() VTK_SIZEHINT(343); void GetKernel7x7x7(double kernel[343]); protected: diff --git a/Imaging/Sources/vtkImageEllipsoidSource.h b/Imaging/Sources/vtkImageEllipsoidSource.h index 1d59ec6f471adf891fc9e1a2994f0a63f16cda28..04f3cea9772adab0d9964f0bd94cee508cdc03f2 100644 --- a/Imaging/Sources/vtkImageEllipsoidSource.h +++ b/Imaging/Sources/vtkImageEllipsoidSource.h @@ -42,7 +42,7 @@ public: void SetWholeExtent(int minX, int maxX, int minY, int maxY, int minZ, int maxZ); void GetWholeExtent(int extent[6]); - int *GetWholeExtent() {return this->WholeExtent;} + int *GetWholeExtent() VTK_SIZEHINT(6) {return this->WholeExtent;} //@} //@{ diff --git a/Imaging/Sources/vtkImageMandelbrotSource.h b/Imaging/Sources/vtkImageMandelbrotSource.h index 02b16f8254067e3a88101060bf05652710814738..114dde512fafb1b36e31f5fd78a622824b2038e1 100644 --- a/Imaging/Sources/vtkImageMandelbrotSource.h +++ b/Imaging/Sources/vtkImageMandelbrotSource.h @@ -100,7 +100,7 @@ public: * Size is ignored when a dimension i 0 (collapsed). */ void SetSizeCX(double cReal, double cImag, double xReal, double xImag); - double *GetSizeCX(); + double *GetSizeCX() VTK_SIZEHINT(4); void GetSizeCX(double s[4]); //@} diff --git a/Imaging/Statistics/vtkImageAccumulate.h b/Imaging/Statistics/vtkImageAccumulate.h index 58d7839ec66a8505e0d2ba57b52651c892e9dc24..f7d142507f521937b51765ac809696bb8f4569d0 100644 --- a/Imaging/Statistics/vtkImageAccumulate.h +++ b/Imaging/Statistics/vtkImageAccumulate.h @@ -90,7 +90,7 @@ public: void SetComponentExtent(int minX, int maxX, int minY, int maxY, int minZ, int maxZ); void GetComponentExtent(int extent[6]); - int *GetComponentExtent() {return this->ComponentExtent;} + int *GetComponentExtent() VTK_SIZEHINT(6) {return this->ComponentExtent;} //@} diff --git a/Interaction/Image/vtkImageViewer.h b/Interaction/Image/vtkImageViewer.h index 7424f48313d0f3f8952fd6b18fb49a357a159972..ae4d9f7ecbf00a38ed61128a2936f72948247e5c 100644 --- a/Interaction/Image/vtkImageViewer.h +++ b/Interaction/Image/vtkImageViewer.h @@ -104,7 +104,7 @@ public: /** * Set/Get the position in screen coordinates of the rendering window. */ - int *GetPosition() {return this->RenderWindow->GetPosition();}; + int *GetPosition() VTK_SIZEHINT(2) {return this->RenderWindow->GetPosition();}; void SetPosition(int a,int b) {this->RenderWindow->SetPosition(a,b);}; virtual void SetPosition(int a[2]); //@} @@ -113,7 +113,7 @@ public: /** * Set/Get the size of the window in screen coordinates in pixels. */ - int *GetSize() {return this->RenderWindow->GetSize();}; + int *GetSize() VTK_SIZEHINT(2) {return this->RenderWindow->GetSize();}; void SetSize(int a,int b) {this->RenderWindow->SetSize(a,b);}; virtual void SetSize(int a[2]); //@} diff --git a/Interaction/Image/vtkImageViewer2.h b/Interaction/Image/vtkImageViewer2.h index ff150e1f5cd2f08655148c97518e9318b2eec992..aa4d400bc0153630a078317bb2a00e820e8e6a3c 100644 --- a/Interaction/Image/vtkImageViewer2.h +++ b/Interaction/Image/vtkImageViewer2.h @@ -177,7 +177,7 @@ public: /** * Set/Get the position in screen coordinates of the rendering window. */ - virtual int* GetPosition(); + virtual int* GetPosition() VTK_SIZEHINT(2); virtual void SetPosition(int a,int b); virtual void SetPosition(int a[2]) { this->SetPosition(a[0],a[1]); } //@} @@ -186,7 +186,7 @@ public: /** * Set/Get the size of the window in screen coordinates in pixels. */ - virtual int* GetSize(); + virtual int* GetSize() VTK_SIZEHINT(2); virtual void SetSize(int a, int b); virtual void SetSize(int a[2]) { this->SetSize(a[0],a[1]); } //@} diff --git a/Interaction/Widgets/vtkBoxRepresentation.h b/Interaction/Widgets/vtkBoxRepresentation.h index 36667672026eb8e36e128d2038d9374ba5b069dd..e4f23b82fb2f716aae2f7609f7067f77831b6c0a 100644 --- a/Interaction/Widgets/vtkBoxRepresentation.h +++ b/Interaction/Widgets/vtkBoxRepresentation.h @@ -194,7 +194,7 @@ public: int ComputeInteractionState(int X, int Y, int modify=0) override; void StartWidgetInteraction(double e[2]) override; void WidgetInteraction(double e[2]) override; - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; //@} //@{ diff --git a/Interaction/Widgets/vtkDistanceRepresentation.h b/Interaction/Widgets/vtkDistanceRepresentation.h index 206a935b38cce7d6cc83aed5b5990c6d69a53ccd..a01d2fc70ae184f4641150b120769d89104a6224 100644 --- a/Interaction/Widgets/vtkDistanceRepresentation.h +++ b/Interaction/Widgets/vtkDistanceRepresentation.h @@ -58,8 +58,8 @@ public: */ virtual void GetPoint1WorldPosition(double pos[3]) = 0; virtual void GetPoint2WorldPosition(double pos[3]) = 0; - virtual double* GetPoint1WorldPosition() = 0; - virtual double* GetPoint2WorldPosition() = 0; + virtual double* GetPoint1WorldPosition() VTK_SIZEHINT(3) = 0; + virtual double* GetPoint2WorldPosition() VTK_SIZEHINT(3) = 0; virtual void SetPoint1DisplayPosition(double pos[3]) = 0; virtual void SetPoint2DisplayPosition(double pos[3]) = 0; virtual void GetPoint1DisplayPosition(double pos[3]) = 0; diff --git a/Interaction/Widgets/vtkHandleRepresentation.h b/Interaction/Widgets/vtkHandleRepresentation.h index 22ab43044f185ac962c831979d343a6a7d24a346..e231dcfcec2654365b62f008f8a97c709c636871 100644 --- a/Interaction/Widgets/vtkHandleRepresentation.h +++ b/Interaction/Widgets/vtkHandleRepresentation.h @@ -74,10 +74,10 @@ public: */ virtual void SetDisplayPosition(double pos[3]); virtual void GetDisplayPosition(double pos[3]); - virtual double* GetDisplayPosition(); + virtual double* GetDisplayPosition() VTK_SIZEHINT(3); virtual void SetWorldPosition(double pos[3]); virtual void GetWorldPosition(double pos[3]); - virtual double* GetWorldPosition(); + virtual double* GetWorldPosition() VTK_SIZEHINT(3); //@} //@{ diff --git a/Interaction/Widgets/vtkImagePlaneWidget.h b/Interaction/Widgets/vtkImagePlaneWidget.h index 9283cb4de9566300066713355de7c4668db1b948..167e8bf3e351ef1c2fd11ca878dc46fbbe1cfe9f 100644 --- a/Interaction/Widgets/vtkImagePlaneWidget.h +++ b/Interaction/Widgets/vtkImagePlaneWidget.h @@ -162,7 +162,7 @@ public: */ void SetOrigin(double x, double y, double z); void SetOrigin(double xyz[3]); - double* GetOrigin(); + double* GetOrigin() VTK_SIZEHINT(3); void GetOrigin(double xyz[3]); //@} @@ -172,7 +172,7 @@ public: */ void SetPoint1(double x, double y, double z); void SetPoint1(double xyz[3]); - double* GetPoint1(); + double* GetPoint1() VTK_SIZEHINT(3); void GetPoint1(double xyz[3]); //@} @@ -182,7 +182,7 @@ public: */ void SetPoint2(double x, double y, double z); void SetPoint2(double xyz[3]); - double* GetPoint2(); + double* GetPoint2() VTK_SIZEHINT(3); void GetPoint2(double xyz[3]); //@} @@ -190,7 +190,7 @@ public: /** * Get the center of the plane. */ - double* GetCenter(); + double* GetCenter() VTK_SIZEHINT(3); void GetCenter(double xyz[3]); //@} @@ -198,7 +198,7 @@ public: /** * Get the normal to the plane. */ - double* GetNormal(); + double* GetNormal() VTK_SIZEHINT(3); void GetNormal(double xyz[3]); //@} diff --git a/Interaction/Widgets/vtkImageTracerWidget.h b/Interaction/Widgets/vtkImageTracerWidget.h index 506f05e1103dd447bb01baab56ad937b5f8e7c39..91e8cb304d6f232cd04174e1d3fe0ee6037b4f6e 100644 --- a/Interaction/Widgets/vtkImageTracerWidget.h +++ b/Interaction/Widgets/vtkImageTracerWidget.h @@ -226,7 +226,7 @@ public: void SetHandlePosition(int handle, double xyz[3]); void SetHandlePosition(int handle, double x, double y, double z); void GetHandlePosition(int handle, double xyz[3]); - double* GetHandlePosition(int handle); + double* GetHandlePosition(int handle) VTK_SIZEHINT(3); //@} //@{ diff --git a/Interaction/Widgets/vtkImplicitCylinderRepresentation.h b/Interaction/Widgets/vtkImplicitCylinderRepresentation.h index 6078fa31913c15063d6e1a33517a9970c9d7f396..55e2c20a66b8e8302124f3a5548a7f5b99092951 100644 --- a/Interaction/Widgets/vtkImplicitCylinderRepresentation.h +++ b/Interaction/Widgets/vtkImplicitCylinderRepresentation.h @@ -85,7 +85,7 @@ public: */ void SetCenter(double x, double y, double z); void SetCenter(double x[3]); - double* GetCenter(); + double* GetCenter() VTK_SIZEHINT(3); void GetCenter(double xyz[3]); //@} @@ -96,7 +96,7 @@ public: */ void SetAxis(double x, double y, double z); void SetAxis(double a[3]); - double* GetAxis(); + double* GetAxis() VTK_SIZEHINT(3); void GetAxis(double a[3]); //@} diff --git a/Interaction/Widgets/vtkImplicitPlaneRepresentation.h b/Interaction/Widgets/vtkImplicitPlaneRepresentation.h index b8828b59a2f46c3cd3b52d7f93ef3a0cd6327d13..1f2076a3002c976476ac8eb4d6cf41a35eef0e97 100644 --- a/Interaction/Widgets/vtkImplicitPlaneRepresentation.h +++ b/Interaction/Widgets/vtkImplicitPlaneRepresentation.h @@ -83,7 +83,7 @@ public: */ void SetOrigin(double x, double y, double z); void SetOrigin(double x[3]); - double* GetOrigin(); + double* GetOrigin() VTK_SIZEHINT(3); void GetOrigin(double xyz[3]); //@} @@ -94,7 +94,7 @@ public: void SetNormal(double x, double y, double z); void SetNormal(double x[3]); void SetNormalToCamera(); - double* GetNormal(); + double* GetNormal() VTK_SIZEHINT(3); void GetNormal(double xyz[3]); //@} @@ -347,7 +347,7 @@ public: /** * Methods supporting the rendering process. */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetActors(vtkPropCollection *pc) override; void ReleaseGraphicsResources(vtkWindow*) override; int RenderOpaqueGeometry(vtkViewport*) override; diff --git a/Interaction/Widgets/vtkImplicitPlaneWidget.h b/Interaction/Widgets/vtkImplicitPlaneWidget.h index 9ba3ec1c46f93fa68fd02a1239c234b9451c8e72..0cce9ebdaba82507a921a676145dababb0db99b4 100644 --- a/Interaction/Widgets/vtkImplicitPlaneWidget.h +++ b/Interaction/Widgets/vtkImplicitPlaneWidget.h @@ -113,7 +113,7 @@ public: */ virtual void SetOrigin(double x, double y, double z); virtual void SetOrigin(double x[3]); - double* GetOrigin(); + double* GetOrigin() VTK_SIZEHINT(3); void GetOrigin(double xyz[3]); //@} @@ -123,7 +123,7 @@ public: */ void SetNormal(double x, double y, double z); void SetNormal(double x[3]); - double* GetNormal(); + double* GetNormal() VTK_SIZEHINT(3); void GetNormal(double xyz[3]); //@} diff --git a/Interaction/Widgets/vtkLineRepresentation.h b/Interaction/Widgets/vtkLineRepresentation.h index eb3af780686f3a14df9e178168b5050bfd80cd82..260e4f77d3aeb2faa0cd7826a3e648b38efe6b11 100644 --- a/Interaction/Widgets/vtkLineRepresentation.h +++ b/Interaction/Widgets/vtkLineRepresentation.h @@ -78,15 +78,15 @@ public: * display and world coordinates. */ void GetPoint1WorldPosition(double pos[3]); - double* GetPoint1WorldPosition(); + double* GetPoint1WorldPosition() VTK_SIZEHINT(3); void GetPoint1DisplayPosition(double pos[3]); - double* GetPoint1DisplayPosition(); + double* GetPoint1DisplayPosition() VTK_SIZEHINT(3); void SetPoint1WorldPosition(double pos[3]); void SetPoint1DisplayPosition(double pos[3]); void GetPoint2DisplayPosition(double pos[3]); - double* GetPoint2DisplayPosition(); + double* GetPoint2DisplayPosition() VTK_SIZEHINT(3); void GetPoint2WorldPosition(double pos[3]); - double* GetPoint2WorldPosition(); + double* GetPoint2WorldPosition() VTK_SIZEHINT(3); void SetPoint2WorldPosition(double pos[3]); void SetPoint2DisplayPosition(double pos[3]); //@} @@ -181,7 +181,7 @@ public: int ComputeInteractionState(int X, int Y, int modify=0) override; void StartWidgetInteraction(double e[2]) override; void WidgetInteraction(double e[2]) override; - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; //@} //@{ @@ -273,7 +273,7 @@ public: this->SetDistanceAnnotationScale(scale); } virtual void SetDistanceAnnotationScale( double scale[3] ); - virtual double * GetDistanceAnnotationScale(); + virtual double * GetDistanceAnnotationScale() VTK_SIZEHINT(3); //@} /** diff --git a/Interaction/Widgets/vtkLineWidget.h b/Interaction/Widgets/vtkLineWidget.h index 44cc4b5a208ef3332d1170cc068487eb9e084d15..16477728d1d5a49951b16cf17fed78f5e80c3545 100644 --- a/Interaction/Widgets/vtkLineWidget.h +++ b/Interaction/Widgets/vtkLineWidget.h @@ -122,7 +122,7 @@ public: void SetPoint1(double x, double y, double z); void SetPoint1(double x[3]) {this->SetPoint1(x[0], x[1], x[2]); } - double* GetPoint1() + double* GetPoint1() VTK_SIZEHINT(3) {return this->LineSource->GetPoint1();} void GetPoint1(double xyz[3]) {this->LineSource->GetPoint1(xyz);} @@ -133,7 +133,7 @@ public: void SetPoint2(double x, double y, double z); void SetPoint2(double x[3]) {this->SetPoint2(x[0], x[1], x[2]);} - double* GetPoint2() + double* GetPoint2() VTK_SIZEHINT(3) {return this->LineSource->GetPoint2();} void GetPoint2(double xyz[3]) {this->LineSource->GetPoint2(xyz);} diff --git a/Interaction/Widgets/vtkParallelopipedRepresentation.h b/Interaction/Widgets/vtkParallelopipedRepresentation.h index f7a2104e0214d09bd6aef96490449842bd51cc79..44701ff22e19a620f14b5870ca0dff7c67ce3b87 100644 --- a/Interaction/Widgets/vtkParallelopipedRepresentation.h +++ b/Interaction/Widgets/vtkParallelopipedRepresentation.h @@ -113,7 +113,7 @@ public: /** * The parallelopiped polydata. */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; //@{ /** diff --git a/Interaction/Widgets/vtkPlaneWidget.h b/Interaction/Widgets/vtkPlaneWidget.h index d2bb8ca32d8549031136c992c6359932c24452bd..bd7d06e5526c32e1d0f17d14b51e35dcd78081ca 100644 --- a/Interaction/Widgets/vtkPlaneWidget.h +++ b/Interaction/Widgets/vtkPlaneWidget.h @@ -135,7 +135,7 @@ public: */ void SetOrigin(double x, double y, double z); void SetOrigin(double x[3]); - double* GetOrigin(); + double* GetOrigin() VTK_SIZEHINT(3); void GetOrigin(double xyz[3]); //@} @@ -145,7 +145,7 @@ public: */ void SetPoint1(double x, double y, double z); void SetPoint1(double x[3]); - double* GetPoint1(); + double* GetPoint1() VTK_SIZEHINT(3); void GetPoint1(double xyz[3]); //@} @@ -155,7 +155,7 @@ public: */ void SetPoint2(double x, double y, double z); void SetPoint2(double x[3]); - double* GetPoint2(); + double* GetPoint2() VTK_SIZEHINT(3); void GetPoint2(double xyz[3]); //@} @@ -165,7 +165,7 @@ public: */ void SetCenter(double x, double y, double z); void SetCenter(double x[3]); - double* GetCenter(); + double* GetCenter() VTK_SIZEHINT(3); void GetCenter(double xyz[3]); //@} @@ -175,7 +175,7 @@ public: */ void SetNormal(double x, double y, double z); void SetNormal(double x[3]); - double* GetNormal(); + double* GetNormal() VTK_SIZEHINT(3); void GetNormal(double xyz[3]); //@} diff --git a/Interaction/Widgets/vtkPointHandleRepresentation2D.h b/Interaction/Widgets/vtkPointHandleRepresentation2D.h index d2e4ca408c23334354be4d06f87a957f8e4ce65b..f011886fb8353657c0a25fbe0a9df1950e392e38 100644 --- a/Interaction/Widgets/vtkPointHandleRepresentation2D.h +++ b/Interaction/Widgets/vtkPointHandleRepresentation2D.h @@ -89,7 +89,7 @@ public: * methods. These are the methods that the widget and its representation * use to communicate with each other. */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void BuildRepresentation() override; void StartWidgetInteraction(double eventPos[2]) override; void WidgetInteraction(double eventPos[2]) override; diff --git a/Interaction/Widgets/vtkPointHandleRepresentation3D.h b/Interaction/Widgets/vtkPointHandleRepresentation3D.h index c25fadbbe1c540d12d21396028fec98375102a93..444c39a243277bd5e7e001b19c228600fea3b2bb 100644 --- a/Interaction/Widgets/vtkPointHandleRepresentation3D.h +++ b/Interaction/Widgets/vtkPointHandleRepresentation3D.h @@ -180,7 +180,7 @@ public: /** * Methods to make this class properly act like a vtkWidgetRepresentation. */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void BuildRepresentation() override; void StartWidgetInteraction(double eventPos[2]) override; void WidgetInteraction(double eventPos[2]) override; diff --git a/Interaction/Widgets/vtkPointWidget.h b/Interaction/Widgets/vtkPointWidget.h index 3b899c8ca82798d6be28912b56031a8901b549cb..c293202f2863b676b1120d7c61abf2537ecb47d9 100644 --- a/Interaction/Widgets/vtkPointWidget.h +++ b/Interaction/Widgets/vtkPointWidget.h @@ -113,7 +113,7 @@ public: {this->Cursor3D->SetFocalPoint(x,y,z);} void SetPosition(double x[3]) {this->SetPosition(x[0],x[1],x[2]);} - double* GetPosition() + double* GetPosition() VTK_SIZEHINT(3) {return this->Cursor3D->GetFocalPoint();} void GetPosition(double xyz[3]) {this->Cursor3D->GetFocalPoint(xyz);} diff --git a/Interaction/Widgets/vtkSliderRepresentation3D.h b/Interaction/Widgets/vtkSliderRepresentation3D.h index ed778a0f7830a25014bb78c0180a00d2f7a250ea..3c23da4c078f0723e215034760bce010768baa70 100644 --- a/Interaction/Widgets/vtkSliderRepresentation3D.h +++ b/Interaction/Widgets/vtkSliderRepresentation3D.h @@ -157,7 +157,7 @@ public: /** * Methods supporting the rendering process. */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetActors(vtkPropCollection*) override; void ReleaseGraphicsResources(vtkWindow*) override; int RenderOpaqueGeometry(vtkViewport*) override; diff --git a/Interaction/Widgets/vtkSphereHandleRepresentation.h b/Interaction/Widgets/vtkSphereHandleRepresentation.h index 0a3a6cf1afed6abe68a1564376e045324ae00356..c5fe90603e855491c75ec7c35ab63773b821bd03 100644 --- a/Interaction/Widgets/vtkSphereHandleRepresentation.h +++ b/Interaction/Widgets/vtkSphereHandleRepresentation.h @@ -114,7 +114,7 @@ public: /** * Methods to make this class properly act like a vtkWidgetRepresentation. */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void BuildRepresentation() override; void StartWidgetInteraction(double eventPos[2]) override; void WidgetInteraction(double eventPos[2]) override; diff --git a/Interaction/Widgets/vtkSphereRepresentation.h b/Interaction/Widgets/vtkSphereRepresentation.h index 1daa9d046b0ea19ba7c621881e213fcd7666da65..83fd1df922c9e5955cb9dc6edb8ca2da81734f19 100644 --- a/Interaction/Widgets/vtkSphereRepresentation.h +++ b/Interaction/Widgets/vtkSphereRepresentation.h @@ -130,7 +130,7 @@ public: void SetCenter(double c[3]); void SetCenter(double x, double y, double z) {double c[3]; c[0]=x; c[1]=y; c[2]=z; this->SetCenter(c);} - double* GetCenter() + double* GetCenter() VTK_SIZEHINT(3) {return this->SphereSource->GetCenter();} void GetCenter(double xyz[3]) {this->SphereSource->GetCenter(xyz);} diff --git a/Interaction/Widgets/vtkSphereWidget.h b/Interaction/Widgets/vtkSphereWidget.h index 9aa06f00dd4032c212950e691f94c7c2666d93a7..63b87209c96f356e2fcaf93ed899f5ae15c1be42 100644 --- a/Interaction/Widgets/vtkSphereWidget.h +++ b/Interaction/Widgets/vtkSphereWidget.h @@ -156,7 +156,7 @@ public: { this->SetCenter(x[0], x[1], x[2]); } - double* GetCenter() + double* GetCenter() VTK_SIZEHINT(3) {return this->SphereSource->GetCenter();} void GetCenter(double xyz[3]) {this->SphereSource->GetCenter(xyz);} diff --git a/Interaction/Widgets/vtkSplineWidget.h b/Interaction/Widgets/vtkSplineWidget.h index 3232643e01b0b8287f0631041020fb56470aaeff..d5518aa6e5af4f6aebe99ee0cceb3f3e42d42e68 100644 --- a/Interaction/Widgets/vtkSplineWidget.h +++ b/Interaction/Widgets/vtkSplineWidget.h @@ -237,7 +237,7 @@ public: void SetHandlePosition(int handle, double x, double y, double z); void SetHandlePosition(int handle, double xyz[3]); void GetHandlePosition(int handle, double xyz[3]); - double* GetHandlePosition(int handle); + double* GetHandlePosition(int handle) VTK_SIZEHINT(3); //@} //@{ diff --git a/Interaction/Widgets/vtkWidgetRepresentation.h b/Interaction/Widgets/vtkWidgetRepresentation.h index 87ccc6b6dadd0b5499a09ad299f1a0e6b5b44e2b..b4d7b1109406e4b40af790917bd3278a93ac3d60 100644 --- a/Interaction/Widgets/vtkWidgetRepresentation.h +++ b/Interaction/Widgets/vtkWidgetRepresentation.h @@ -212,7 +212,7 @@ public: * (i.e., not implementing the Render() methods properly) or leaking graphics resources * (i.e., not implementing ReleaseGraphicsResources() properly). */ - double *GetBounds() override {return nullptr;} + double *GetBounds() VTK_SIZEHINT(6) override {return nullptr;} void ShallowCopy(vtkProp *prop) override; void GetActors(vtkPropCollection *) override {} void GetActors2D(vtkPropCollection *) override {} diff --git a/Rendering/Annotation/vtkAnnotatedCubeActor.h b/Rendering/Annotation/vtkAnnotatedCubeActor.h index fb6e7877e85323e977286c28965d013682ed4fea..46d12ee66b2822920f9ef92d53045cee3e4fdb42 100644 --- a/Rendering/Annotation/vtkAnnotatedCubeActor.h +++ b/Rendering/Annotation/vtkAnnotatedCubeActor.h @@ -99,7 +99,7 @@ public: * method GetBounds(double bounds[6]) is available from the superclass.) */ void GetBounds(double bounds[6]); - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; //@} /** diff --git a/Rendering/Annotation/vtkAxesActor.h b/Rendering/Annotation/vtkAxesActor.h index fb2a879bb7bed8243f32ce0dfa4edcec7fefb3ab..35b2e9f2b00100df5c23072d5f4df95019c98cac 100644 --- a/Rendering/Annotation/vtkAxesActor.h +++ b/Rendering/Annotation/vtkAxesActor.h @@ -108,7 +108,7 @@ public: * method GetBounds(double bounds[6]) is available from the superclass.) */ void GetBounds(double bounds[6]); - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; //@} /** diff --git a/Rendering/Annotation/vtkAxisActor.h b/Rendering/Annotation/vtkAxisActor.h index 603d117a9bdd3613da657272ff2b06a344bd540a..1f3ce15afcc02a4cb054dd7347051e42845b0727 100644 --- a/Rendering/Annotation/vtkAxisActor.h +++ b/Rendering/Annotation/vtkAxisActor.h @@ -114,7 +114,7 @@ public: */ void SetBounds(const double bounds[6]); void SetBounds(double xmin, double xmax, double ymin, double ymax, double zmin, double zmax); - double* GetBounds(void) override; + double* GetBounds(void) VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]); //@} diff --git a/Rendering/Annotation/vtkCubeAxesActor.h b/Rendering/Annotation/vtkCubeAxesActor.h index 6d598decf0fc61b7c35364184842891266010c88..eb34f202782a80775117b191bda210f52e72748b 100644 --- a/Rendering/Annotation/vtkCubeAxesActor.h +++ b/Rendering/Annotation/vtkCubeAxesActor.h @@ -104,7 +104,7 @@ public: */ vtkSetVector6Macro(Bounds,double); using Superclass::GetBounds; - double *GetBounds() override { return this->Bounds; } + double *GetBounds() VTK_SIZEHINT(6) override { return this->Bounds; } //@} //@{ diff --git a/Rendering/Annotation/vtkCubeAxesActor2D.h b/Rendering/Annotation/vtkCubeAxesActor2D.h index 0bc9d23afaedd96595d5a09c34d389d06e41ca38..b88202cba5d294918a7b9159d57b33fe23391b90 100644 --- a/Rendering/Annotation/vtkCubeAxesActor2D.h +++ b/Rendering/Annotation/vtkCubeAxesActor2D.h @@ -112,7 +112,7 @@ public: * sure that the min's are less than the max's. */ vtkSetVector6Macro(Bounds,double); - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double& xmin, double& xmax, double& ymin, double& ymax, double& zmin, double& zmax); void GetBounds(double bounds[6]); @@ -125,7 +125,7 @@ public: * making sure that the min's are less than the max's. */ vtkSetVector6Macro(Ranges,double); - double *GetRanges(); + double *GetRanges() VTK_SIZEHINT(6); void GetRanges(double& xmin, double& xmax, double& ymin, double& ymax, double& zmin, double& zmax); void GetRanges(double ranges[6]); diff --git a/Rendering/Annotation/vtkLegendBoxActor.h b/Rendering/Annotation/vtkLegendBoxActor.h index 4ae9d566078ac60c08d9ec60fc68652107148659..e6481203eabd591f72391adc41d51ec8040aec96 100644 --- a/Rendering/Annotation/vtkLegendBoxActor.h +++ b/Rendering/Annotation/vtkLegendBoxActor.h @@ -100,7 +100,7 @@ public: vtkPolyData* GetEntrySymbol(int i); vtkImageData* GetEntryIcon(int i); const char* GetEntryString(int i); - double* GetEntryColor(int i); + double* GetEntryColor(int i) VTK_SIZEHINT(3); //@{ /** diff --git a/Rendering/Annotation/vtkXYPlotActor.h b/Rendering/Annotation/vtkXYPlotActor.h index 96c3f584a503292f1b9d5d5c119d66b6035cf80b..f2545b709415515132896e6a6a3057562f9e9f9f 100644 --- a/Rendering/Annotation/vtkXYPlotActor.h +++ b/Rendering/Annotation/vtkXYPlotActor.h @@ -279,7 +279,7 @@ public: void SetPlotColor(int i, double r, double g, double b); void SetPlotColor(int i, const double color[3]) { this->SetPlotColor(i, color[0], color[1], color[2]); }; - double *GetPlotColor(int i); + double *GetPlotColor(int i) VTK_SIZEHINT(3); void SetPlotSymbol(int i,vtkPolyData *input); vtkPolyData *GetPlotSymbol(int i); void SetPlotLabel(int i, const char *label); diff --git a/Rendering/Core/vtkAbstractMapper3D.h b/Rendering/Core/vtkAbstractMapper3D.h index d078db2b60ee74815bd652d656c66f775fe63279..1ea389d5cc417ef5195236611dad39a47b31e750 100644 --- a/Rendering/Core/vtkAbstractMapper3D.h +++ b/Rendering/Core/vtkAbstractMapper3D.h @@ -50,7 +50,7 @@ public: * (xmin,xmax, ymin,ymax, zmin,zmax). * Update this->Bounds as a side effect. */ - virtual double *GetBounds() = 0; + virtual double *GetBounds() VTK_SIZEHINT(6) = 0; /** * Get the bounds for this mapper as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax). @@ -61,7 +61,7 @@ public: /** * Return the Center of this mapper's data. */ - double *GetCenter(); + double *GetCenter() VTK_SIZEHINT(3); void GetCenter(double center[3]) { double *rc = this->GetCenter(); diff --git a/Rendering/Core/vtkAbstractVolumeMapper.h b/Rendering/Core/vtkAbstractVolumeMapper.h index 352a4ce12490165a5516103a23593f65306fa9df..ec4562bacc3caf3d03a72f0f4a94be4cd590b00d 100644 --- a/Rendering/Core/vtkAbstractVolumeMapper.h +++ b/Rendering/Core/vtkAbstractVolumeMapper.h @@ -54,7 +54,7 @@ public: * Return bounding box (array of six doubles) of data expressed as * (xmin,xmax, ymin,ymax, zmin,zmax). */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) override { this->vtkAbstractMapper3D::GetBounds(bounds); }; //@} diff --git a/Rendering/Core/vtkActor.h b/Rendering/Core/vtkActor.h index baef9e2d16af0eeb84a4d10e13ab71f75083963b..1ed7bb0cc20a41b67ce77289b31f6ad6935b6e39 100644 --- a/Rendering/Core/vtkActor.h +++ b/Rendering/Core/vtkActor.h @@ -155,7 +155,7 @@ public: * method GetBounds(double bounds[6]) is available from the superclass.) */ using Superclass::GetBounds; - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; /** * Apply the current properties to all parts that compose this actor. diff --git a/Rendering/Core/vtkAssembly.h b/Rendering/Core/vtkAssembly.h index 0128f97988175d2b1b7c376fb2f7a43e4ab634fb..2550bfbbc433a4446a2c23344a609957cb44d18b 100644 --- a/Rendering/Core/vtkAssembly.h +++ b/Rendering/Core/vtkAssembly.h @@ -149,7 +149,7 @@ public: */ void GetBounds(double bounds[6]) { this->vtkProp3D::GetBounds( bounds ); } - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; /** * Override default GetMTime method to also consider all of the diff --git a/Rendering/Core/vtkCamera.h b/Rendering/Core/vtkCamera.h index a80b629d40b03fb4103e5757bb5ba876fe774f91..f233bbc53e8a697eda439873f6041087ed092386 100644 --- a/Rendering/Core/vtkCamera.h +++ b/Rendering/Core/vtkCamera.h @@ -609,8 +609,8 @@ public: /** * Get the orientation of the camera. */ - double *GetOrientation(); - double *GetOrientationWXYZ(); + double *GetOrientation() VTK_SIZEHINT(3); + double *GetOrientationWXYZ() VTK_SIZEHINT(4); //@} /** diff --git a/Rendering/Core/vtkColorTransferFunction.h b/Rendering/Core/vtkColorTransferFunction.h index a51e2fadd6d31d7e3e651ebb630729206eba13e1..0146f696408677996053b66cf034e1158a8d64ba 100644 --- a/Rendering/Core/vtkColorTransferFunction.h +++ b/Rendering/Core/vtkColorTransferFunction.h @@ -103,7 +103,7 @@ public: /** * Returns an RGB color for the specified scalar value */ - double *GetColor(double x) { + double *GetColor(double x) VTK_SIZEHINT(3) { return vtkScalarsToColors::GetColor(x); } void GetColor(double x, double rgb[3]) override; @@ -135,7 +135,7 @@ public: /** * Returns min and max position of all function points. */ - double* GetRange() override { return this->Range; } + double* GetRange() VTK_SIZEHINT(2) override { return this->Range; } virtual void GetRange(double& arg1, double& arg2) { arg1 = this->Range[0]; diff --git a/Rendering/Core/vtkCompositePolyDataMapper.h b/Rendering/Core/vtkCompositePolyDataMapper.h index 9b5f6c0389534c10949deaee9fab3dc8da9d3bc1..64ec105d54f45b264ffbcad2009f7edb8ac8b3e9 100644 --- a/Rendering/Core/vtkCompositePolyDataMapper.h +++ b/Rendering/Core/vtkCompositePolyDataMapper.h @@ -55,7 +55,7 @@ public: /** * Standard vtkProp method to get 3D bounds of a 3D prop */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) override { this->Superclass::GetBounds( bounds ); }; //@} diff --git a/Rendering/Core/vtkCoordinate.h b/Rendering/Core/vtkCoordinate.h index cdeced0e63cbc91388c9999b21b90bfb8845f196..d08400c1fb7f2b1e6582667859bbfa9db68fa3ee 100644 --- a/Rendering/Core/vtkCoordinate.h +++ b/Rendering/Core/vtkCoordinate.h @@ -142,22 +142,22 @@ public: /** * Return the computed value in a specified coordinate system. */ - double *GetComputedWorldValue(vtkViewport *); - int *GetComputedViewportValue(vtkViewport *); - int *GetComputedDisplayValue(vtkViewport *); - int *GetComputedLocalDisplayValue(vtkViewport *); + double *GetComputedWorldValue(vtkViewport *) VTK_SIZEHINT(3); + int *GetComputedViewportValue(vtkViewport *) VTK_SIZEHINT(2); + int *GetComputedDisplayValue(vtkViewport *) VTK_SIZEHINT(2); + int *GetComputedLocalDisplayValue(vtkViewport *) VTK_SIZEHINT(2); //@} - double *GetComputedDoubleViewportValue(vtkViewport *); - double *GetComputedDoubleDisplayValue(vtkViewport *); + double *GetComputedDoubleViewportValue(vtkViewport *) VTK_SIZEHINT(2); + double *GetComputedDoubleDisplayValue(vtkViewport *) VTK_SIZEHINT(2); /** * GetComputedValue() will return either World, Viewport or * Display based on what has been set as the coordinate system. * This is good for objects like vtkLineSource, where the - * user might want to use them as World or Viewport coordinates + * user might want to use them as World or Viewport coordinates. */ - double *GetComputedValue(vtkViewport *); + double *GetComputedValue(vtkViewport *) VTK_SIZEHINT(3); /** * GetComputedUserDefinedValue() is to be used only when @@ -166,7 +166,7 @@ public: * when set as the TransformCoordinate in 2D-Mappers, the user * can customize display of 2D polygons */ - virtual double *GetComputedUserDefinedValue(vtkViewport *) + virtual double *GetComputedUserDefinedValue(vtkViewport *) VTK_SIZEHINT(3) { return this->Value; } protected: diff --git a/Rendering/Core/vtkGraphMapper.h b/Rendering/Core/vtkGraphMapper.h index 638e8b8b5e55195fada60524ac123944f6140e3b..d2a4c810470cc036762592ff77db2668463eac42 100644 --- a/Rendering/Core/vtkGraphMapper.h +++ b/Rendering/Core/vtkGraphMapper.h @@ -251,7 +251,7 @@ public: * Return bounding box (array of six doubles) of data expressed as * (xmin,xmax, ymin,ymax, zmin,zmax). */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double* bounds) override { Superclass::GetBounds(bounds); } diff --git a/Rendering/Core/vtkImageActor.h b/Rendering/Core/vtkImageActor.h index 3aa00d9adbbfecb33e088c32f007cf8dda7f18df..10169c307256a5ecb460eeb1db63fe1fefbce9ee 100644 --- a/Rendering/Core/vtkImageActor.h +++ b/Rendering/Core/vtkImageActor.h @@ -91,7 +91,7 @@ public: void SetDisplayExtent(int minX, int maxX, int minY, int maxY, int minZ, int maxZ); void GetDisplayExtent(int extent[6]); - int *GetDisplayExtent() {return this->DisplayExtent;} + int *GetDisplayExtent() VTK_SIZEHINT(6) {return this->DisplayExtent;} //@} //@{ @@ -101,7 +101,7 @@ public: * In either case the bounds is expressed as a 6-vector * (xmin,xmax, ymin,ymax, zmin,zmax). */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) { this->Superclass::GetBounds(bounds); }; //@} diff --git a/Rendering/Core/vtkLODProp3D.h b/Rendering/Core/vtkLODProp3D.h index 57957f660f6a12df405782851c9e0615b235d890..bf49f812d40e8ae60c1fdc45163113cd73fa1d63 100644 --- a/Rendering/Core/vtkLODProp3D.h +++ b/Rendering/Core/vtkLODProp3D.h @@ -68,7 +68,7 @@ public: /** * Standard vtkProp method to get 3D bounds of a 3D prop */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) { this->vtkProp3D::GetBounds( bounds ); } diff --git a/Rendering/Core/vtkLight.h b/Rendering/Core/vtkLight.h index 29a8e4db6a051105c1940ceb5c127ffae562e8eb..2044c16e0ce7184b5fb48462461e72f9d5d2764b 100644 --- a/Rendering/Core/vtkLight.h +++ b/Rendering/Core/vtkLight.h @@ -200,7 +200,7 @@ public: */ void GetTransformedPosition(double &a0, double &a1, double &a2); void GetTransformedPosition(double a[3]); - double *GetTransformedPosition(); + double *GetTransformedPosition() VTK_SIZEHINT(3); //@} //@{ @@ -210,7 +210,7 @@ public: */ void GetTransformedFocalPoint(double &a0, double &a1, double &a2); void GetTransformedFocalPoint(double a[3]); - double *GetTransformedFocalPoint(); + double *GetTransformedFocalPoint() VTK_SIZEHINT(3); //@} //@{ diff --git a/Rendering/Core/vtkMapper.h b/Rendering/Core/vtkMapper.h index 9d3c16eea59895bdda4e84aa922386e8059c1f66..0cb092fbe3cba4beba5246696c1b58378649dc48 100644 --- a/Rendering/Core/vtkMapper.h +++ b/Rendering/Core/vtkMapper.h @@ -418,7 +418,7 @@ public: * Return bounding box (array of six doubles) of data expressed as * (xmin,xmax, ymin,ymax, zmin,zmax). */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) override { this->vtkAbstractMapper3D::GetBounds(bounds); } diff --git a/Rendering/Core/vtkPolyDataMapper.h b/Rendering/Core/vtkPolyDataMapper.h index 79eabf6265ca469d5a76d02acdedc8b334a5b18d..10cd232a5a7616decb221e06c90441c7586e13d9 100644 --- a/Rendering/Core/vtkPolyDataMapper.h +++ b/Rendering/Core/vtkPolyDataMapper.h @@ -92,7 +92,7 @@ public: * Return bounding box (array of six doubles) of data expressed as * (xmin,xmax, ymin,ymax, zmin,zmax). */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) override { this->Superclass::GetBounds(bounds); } diff --git a/Rendering/Core/vtkProp.h b/Rendering/Core/vtkProp.h index 75cde4cf313d326929a6b49f9e4b3b72313ab6c7..078fce3e343e3f5397d034c58a84c1b990162933 100644 --- a/Rendering/Core/vtkProp.h +++ b/Rendering/Core/vtkProp.h @@ -121,7 +121,7 @@ public: * Get the bounds for this Prop as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax). * in world coordinates. NULL means that the bounds are not defined. */ - virtual double *GetBounds() + virtual double *GetBounds() VTK_SIZEHINT(6) { return nullptr; } /** diff --git a/Rendering/Core/vtkProp3D.h b/Rendering/Core/vtkProp3D.h index 742bc886462dd32b1df722168e8badda654d0a6a..cbd7780f98a864e3956fea81c4384e7456363500 100644 --- a/Rendering/Core/vtkProp3D.h +++ b/Rendering/Core/vtkProp3D.h @@ -181,28 +181,28 @@ public: * Get the bounds for this Prop3D as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax). */ void GetBounds(double bounds[6]); - double *GetBounds() override = 0; + double *GetBounds() VTK_SIZEHINT(6) override = 0; //@} /** * Get the center of the bounding box in world coordinates. */ - double *GetCenter(); + double *GetCenter() VTK_SIZEHINT(3); /** * Get the Prop3D's x range in world coordinates. */ - double *GetXRange(); + double *GetXRange() VTK_SIZEHINT(2); /** * Get the Prop3D's y range in world coordinates. */ - double *GetYRange(); + double *GetYRange() VTK_SIZEHINT(2); /** * Get the Prop3D's z range in world coordinates. */ - double *GetZRange(); + double *GetZRange() VTK_SIZEHINT(2); /** * Get the length of the diagonal of the bounding box. @@ -265,14 +265,14 @@ public: * same matrix is RotateZ, RotateX, and finally RotateY. See also * SetOrientation. */ - double *GetOrientation(); + double *GetOrientation() VTK_SIZEHINT(3); void GetOrientation(double orentation[3]); //@} /** * Returns the WXYZ orientation of the Prop3D. */ - double *GetOrientationWXYZ(); + double *GetOrientationWXYZ() VTK_SIZEHINT(4); /** * Add to the current orientation. See SetOrientation and diff --git a/Rendering/Core/vtkPropAssembly.h b/Rendering/Core/vtkPropAssembly.h index 96b45a70c1a126888e10336b7fccde64e0811920..a5cccfb837625e83dfe3f1fcfa70d75990accbe0 100644 --- a/Rendering/Core/vtkPropAssembly.h +++ b/Rendering/Core/vtkPropAssembly.h @@ -101,7 +101,7 @@ public: * Get the bounds for this prop assembly as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax). * May return NULL in some cases (meaning the bounds is undefined). */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; /** * Shallow copy of this vtkPropAssembly. diff --git a/Rendering/Core/vtkProperty.h b/Rendering/Core/vtkProperty.h index e748086acf5232e0d28d0241d8502f24be2f9d11..82ce67dc7efc475dceb8afa863a0f56c554f7e6c 100644 --- a/Rendering/Core/vtkProperty.h +++ b/Rendering/Core/vtkProperty.h @@ -171,7 +171,7 @@ public: */ virtual void SetColor(double r, double g, double b); virtual void SetColor(double a[3]); - double *GetColor(); + double *GetColor() VTK_SIZEHINT(3); void GetColor(double rgb[3]); void GetColor(double &r, double &g, double &b); //@} diff --git a/Rendering/Core/vtkRenderer.h b/Rendering/Core/vtkRenderer.h index e9a3e0d65f154f0d55a34d509044b5bd91f50559..8ba4716db62cde2a0c80150c6a9248f091066208 100644 --- a/Rendering/Core/vtkRenderer.h +++ b/Rendering/Core/vtkRenderer.h @@ -338,7 +338,7 @@ public: /** * Wrapper-friendly version of ComputeVisiblePropBounds */ - double *ComputeVisiblePropBounds(); + double *ComputeVisiblePropBounds() VTK_SIZEHINT(6); /** * Reset the camera clipping range based on the bounds of the diff --git a/Rendering/Core/vtkTextActor3D.h b/Rendering/Core/vtkTextActor3D.h index f6ef7ce7ad1b86d2ecf3f4ddbc94b0dbbc91a568..2aa88a723aae6fed9d619cb75a9c01adffa616af 100644 --- a/Rendering/Core/vtkTextActor3D.h +++ b/Rendering/Core/vtkTextActor3D.h @@ -81,7 +81,7 @@ public: /** * Get the bounds for this Prop3D as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax). */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) {this->vtkProp3D::GetBounds( bounds );} /** diff --git a/Rendering/Core/vtkViewport.h b/Rendering/Core/vtkViewport.h index d720b89ee042ad6d91fce15d55cff6a414cfd97f..63d3957b7490c61f86a40ae916f6be4b0a9a1abd 100644 --- a/Rendering/Core/vtkViewport.h +++ b/Rendering/Core/vtkViewport.h @@ -187,7 +187,7 @@ public: /** * Return the center of this viewport in display coordinates. */ - virtual double *GetCenter(); + virtual double *GetCenter() VTK_SIZEHINT(2); /** * Is a given display point in this Viewport's viewport. @@ -257,8 +257,8 @@ public: * if the window has not yet been realized, GetSize() and GetOrigin() * return (0,0). */ - virtual int *GetSize(); - virtual int *GetOrigin(); + virtual int *GetSize() VTK_SIZEHINT(2); + virtual int *GetOrigin() VTK_SIZEHINT(2); void GetTiledSize(int *width, int *height); virtual void GetTiledSizeAndOrigin(int *width, int *height, int *lowerLeftX, int *lowerLeftY); diff --git a/Rendering/Core/vtkVolume.h b/Rendering/Core/vtkVolume.h index d43c14b43af774f1ae0d4737691b66c2ea7d209a..12ab95a799949f9515269b0649d01fea40e18f1d 100644 --- a/Rendering/Core/vtkVolume.h +++ b/Rendering/Core/vtkVolume.h @@ -87,7 +87,7 @@ public: * Get the bounds - either all six at once * (xmin, xmax, ymin, ymax, zmin, zmax) or one at a time. */ - double *GetBounds() override; + double *GetBounds() VTK_SIZEHINT(6) override; void GetBounds(double bounds[6]) { this->vtkProp3D::GetBounds(bounds); } double GetMinXBound(); diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindow.h b/Rendering/OpenGL2/vtkCocoaRenderWindow.h index 9089effda57b6e40b78dacd27ec69780186123a0..1ca0755d8438478ea3da0d13cc25a209f8b60cef 100644 --- a/Rendering/OpenGL2/vtkCocoaRenderWindow.h +++ b/Rendering/OpenGL2/vtkCocoaRenderWindow.h @@ -108,7 +108,7 @@ public: /** * Get the current size of the window in pixels. */ - int *GetSize() override; + int *GetSize() VTK_SIZEHINT(2) override; //@{ /** @@ -121,12 +121,12 @@ public: /** * Get the current size of the screen in pixels. */ - int *GetScreenSize() override; + int *GetScreenSize() VTK_SIZEHINT(2) override; /** * Get the position in screen coordinates of the window. */ - int *GetPosition() override; + int *GetPosition() VTK_SIZEHINT(2) override; /** * Set the name of the window. This appears at the top of the window diff --git a/Rendering/OpenGL2/vtkEGLRenderWindow.h b/Rendering/OpenGL2/vtkEGLRenderWindow.h index 7e1171debfd996b907505f3017e1bf1b03026985..a7d2d1b2043126207d3fa371b47228656f5287ae 100644 --- a/Rendering/OpenGL2/vtkEGLRenderWindow.h +++ b/Rendering/OpenGL2/vtkEGLRenderWindow.h @@ -115,12 +115,12 @@ public: /** * Get the current size of the screen in pixels. */ - virtual int *GetScreenSize(); + virtual int *GetScreenSize() VTK_SIZEHINT(2); /** * Get the position in screen coordinates (pixels) of the window. */ - virtual int *GetPosition(); + virtual int *GetPosition() VTK_SIZEHINT(2); //@{ /** diff --git a/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h index 64643befcebcd096e9342911696636fb021b1790..47a11cfe907a4c02be9ec61a91bffcd856bad8a1 100644 --- a/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h +++ b/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h @@ -96,7 +96,7 @@ public: void* GetGenericDrawable() override; void SetWindowInfo(char*) override; void SetParentInfo(char*) override; - int* GetScreenSize() override; + int* GetScreenSize() VTK_SIZEHINT(2) override; void Start() override; void HideCursor() override; void ShowCursor() override; diff --git a/Rendering/OpenGL2/vtkIOSRenderWindow.h b/Rendering/OpenGL2/vtkIOSRenderWindow.h index 35ef7d79ca5a93b9c08b3ecbefbfe4289ea4b6dd..7a0f833539f9cb8f285b47d80d7abd8c4793f866 100644 --- a/Rendering/OpenGL2/vtkIOSRenderWindow.h +++ b/Rendering/OpenGL2/vtkIOSRenderWindow.h @@ -107,7 +107,7 @@ public: /** * Get the current size of the window in pixels. */ - int *GetSize() override; + int *GetSize() VTK_SIZEHINT(2) override; //@{ /** @@ -120,12 +120,12 @@ public: /** * Get the current size of the screen in pixels. */ - int *GetScreenSize() override; + int *GetScreenSize() VTK_SIZEHINT(2) override; /** * Get the position in screen coordinates of the window. */ - int *GetPosition() override; + int *GetPosition() VTK_SIZEHINT(2) override; /** * Set the name of the window. This appears at the top of the window diff --git a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h index c7770df0a874f4010415beaada15adcd24d81940..dee52afd24df0ac95696aa9e7c6bf1c7a43e37d7 100644 --- a/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h +++ b/Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h @@ -88,12 +88,12 @@ public: /** * Get the current size of the screen in pixels. */ - virtual int *GetScreenSize(); + virtual int *GetScreenSize() VTK_SIZEHINT(2); /** * Get the position in screen coordinates (pixels) of the window. */ - virtual int *GetPosition(); + virtual int *GetPosition() VTK_SIZEHINT(2); //@{ /** diff --git a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h index ba91f7643a339f77bc8a0b8ea1a1a1bdddf17794..b1ed9be0e6267adb212dbcf663f947e37ba62073 100644 --- a/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h +++ b/Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h @@ -95,7 +95,7 @@ public: /** * Get the current size of the window in pixels. */ - int *GetSize() override; + int *GetSize() VTK_SIZEHINT(2) override; //@{ /** @@ -108,12 +108,12 @@ public: /** * Get the current size of the screen in pixels. */ - int *GetScreenSize() override; + int *GetScreenSize() VTK_SIZEHINT(2) override; /** * Get the position in screen coordinates of the window. */ - int *GetPosition() override; + int *GetPosition() VTK_SIZEHINT(2) override; /** * Set the name of the window. This appears at the top of the window diff --git a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h index b5f903866760736b951572f501df45be0dd321dd..10da672159c2ebea55f733301934d496a1444873 100644 --- a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h +++ b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h @@ -160,12 +160,12 @@ public: /** * Get the current size of the screen in pixels. */ - int *GetScreenSize() override; + int *GetScreenSize() VTK_SIZEHINT(2) override; /** * Get the position in screen coordinates (pixels) of the window. */ - int *GetPosition() override; + int *GetPosition() VTK_SIZEHINT(2) override; /** * Get this RenderWindow's X display id. diff --git a/Rendering/Volume/vtkDirectionEncoder.h b/Rendering/Volume/vtkDirectionEncoder.h index 88a489afad90ff6c16df20fff58a4c53b1e91279..ce98167ca87b5fcd77cefd463fb479ca79f0038d 100644 --- a/Rendering/Volume/vtkDirectionEncoder.h +++ b/Rendering/Volume/vtkDirectionEncoder.h @@ -55,7 +55,7 @@ public: /** * / Given an encoded value, return a pointer to the normal vector */ - virtual float *GetDecodedGradient( int value )=0; + virtual float *GetDecodedGradient( int value ) VTK_SIZEHINT(3) = 0; /** * Return the number of encoded directions diff --git a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h index 58615fa0cb7ca3c726a29a0c6160ded25926f95b..a1ac2c91d0dc0c930c7de605203e3e0212fda9bd 100644 --- a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h +++ b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h @@ -54,7 +54,7 @@ public: /** * / Given an encoded value, return a pointer to the normal vector */ - float *GetDecodedGradient( int value ) override; + float *GetDecodedGradient( int value ) VTK_SIZEHINT(3) override; /** * Return the number of encoded directions diff --git a/Rendering/Volume/vtkSphericalDirectionEncoder.h b/Rendering/Volume/vtkSphericalDirectionEncoder.h index b7ae7961c9c746d4552b45043f56727b5bef2d57..b580dfe036dd1c296116f62596d3dcdba4c35c35 100644 --- a/Rendering/Volume/vtkSphericalDirectionEncoder.h +++ b/Rendering/Volume/vtkSphericalDirectionEncoder.h @@ -51,7 +51,7 @@ public: /** * / Given an encoded value, return a pointer to the normal vector */ - float *GetDecodedGradient( int value ) override; + float *GetDecodedGradient( int value ) VTK_SIZEHINT(3) override; /** * Return the number of encoded directions diff --git a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h index cbdfbb4bf3ac717f7272dd2f7fa2b19f5c6ffcb2..fffa4e93fe5d4a801ba2b55b0daaf42a6cc5c2ef 100644 --- a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h +++ b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h @@ -135,7 +135,7 @@ public: planes[0],planes[1],planes[2], planes[3],planes[4],planes[5]);} void GetCroppingRegionPlanes(double *planes) override; - double *GetCroppingRegionPlanes() override; + double *GetCroppingRegionPlanes() VTK_SIZEHINT(6) override; //@} //@{ /** diff --git a/Wrapping/Tools/hints b/Wrapping/Tools/hints deleted file mode 100644 index c5ceb5dba3e4067cd3e31afea6d1c510532a5899..0000000000000000000000000000000000000000 --- a/Wrapping/Tools/hints +++ /dev/null @@ -1,296 +0,0 @@ -vtkAbstractMapper3D GetBounds 307 6 -vtkAbstractMapper3D GetCenter 307 3 -vtkAbstractTransform TransformDoubleNormalAtPoint 307 3 -vtkAbstractTransform TransformDoublePoint 307 3 -vtkAbstractTransform TransformDoubleVectorAtPoint 307 3 -vtkAbstractTransform TransformFloatNormalAtPoint 301 3 -vtkAbstractTransform TransformFloatPoint 301 3 -vtkAbstractTransform TransformFloatVectorAtPoint 301 3 -vtkAbstractTransform TransformNormalAtPoint 307 3 -vtkAbstractTransform TransformPoint 307 3 -vtkAbstractTransform TransformVectorAtPoint 307 3 -vtkAbstractVolumeMapper GetBounds 307 6 -vtkActor GetBounds 307 6 -vtkAlgorithm GetUpdateExtent 304 6 -vtkAMRVolumeMapper GetCroppingRegionPlanes 307 6 -vtkAnnotatedCubeActor GetBounds 307 6 -vtkAssembly GetBounds 307 6 -vtkAxesActor GetBounds 307 6 -vtkAxisActor GetBounds 307 6 -vtkBoundingBox GetMinPoint 307 3 -vtkBoundingBox GetMaxPoint 307 3 -vtkBox GetBounds 307 6 -vtkBoxRepresentation GetBounds 307 6 -vtkCamera GetOrientation 307 3 -vtkCamera GetOrientationWXYZ 307 4 -vtkCell GetBounds 307 6 -vtkCharArray GetValueRange 303 2 -vtkCocoaRenderWindow GetPosition 304 2 -vtkCocoaRenderWindow GetScreenSize 304 2 -vtkCocoaRenderWindow GetSize 304 2 -vtkColorTransferFunction GetColor 307 3 -vtkColorTransferFunction GetRange 307 2 -vtkCompositePolyDataMapper2 GetBounds 307 6 -vtkCompositePolyDataMapper GetBounds 307 6 -vtkCoordinate GetComputedDisplayValue 304 2 -vtkCoordinate GetComputedDoubleDisplayValue 307 2 -vtkCoordinate GetComputedDoubleViewportValue 307 2 -vtkCoordinate GetComputedLocalDisplayValue 304 2 -vtkCoordinate GetComputedViewportValue 304 2 -vtkCoordinate GetComputedWorldValue 307 3 -vtkCubeAxesActor2D GetBounds 307 6 -vtkCubeAxesActor2D GetRanges 307 6 -vtkCubeAxesActor GetBounds 307 6 -vtkDataArray GetRange 307 2 -vtkDataArray GetTuple2 307 2 -vtkDataArray GetTuple3 307 3 -vtkDataArray GetTuple4 307 4 -vtkDataArray GetTuple6 307 6 -vtkDataArray GetTuple9 307 9 -vtkDataObject GetUpdateExtent 304 6 -vtkDataObject GetWholeExtent 304 6 -vtkDataSet GetBounds 307 6 -vtkDataSet GetCenter 307 3 -vtkDataSet GetPoint 307 3 -vtkDataSet GetScalarRange 307 2 -vtkDICOMImageReader GetImageOrientationPatient 301 6 -vtkDICOMImageReader GetImagePositionPatient 301 3 -vtkDICOMImageReader GetPixelSpacing 307 3 -vtkDirectionEncoder GetDecodedGradient 301 3 -vtkDistanceRepresentation GetPoint1WorldPosition 307 3 -vtkDistanceRepresentation GetPoint2WorldPosition 307 3 -vtkDoubleArray GetValueRange 307 2 -vtkEGLRenderWindow GetPosition 304 2 -vtkEGLRenderWindow GetScreenSize 304 2 -vtkEGLRenderWindow GetSize 304 2 -vtkExodusIIReader GetModeShapesRange 304 2 -vtkExtentSplitter GetSubExtent 304 6 -vtkExtractUnstructuredGrid GetExtent 307 6 -vtkFloatArray GetValueRange 301 2 -vtkFunctionParser GetVectorResult 307 3 -vtkFunctionParser GetVectorVariableValue 307 3 -vtkGenericOpenGLRenderWindow GetPosition 304 2 -vtkGenericOpenGLRenderWindow GetScreenSize 304 2 -vtkGenericOpenGLRenderWindow GetSize 304 2 -vtkGeometryFilter GetExtent 307 6 -vtkGraph GetEdgePoint 307 3 -vtkGraphMapper GetBounds 307 6 -vtkGridSynchronizedTemplates3D GetExecuteExtent 304 6 -vtkHandleRepresentation GetDisplayPosition 307 3 -vtkHandleRepresentation GetWorldPosition 307 3 -vtkHexahedron GetEdgeArray 304 2 -vtkHexahedron GetFaceArray 304 4 -vtkHyperOctree GetPoint 307 3 -vtkHyperStreamline GetStartPosition 307 3 -vtkIDTypeArray GetValueRange 30A 2 -vtkImageAccumulate GetComponentExtent 304 6 -vtkImageActor GetBounds 307 6 -vtkImageActor GetDisplayExtent 304 6 -vtkImageButterworthHighPass GetCutOff 307 3 -vtkImageButterworthLowPass GetCutOff 307 3 -vtkImageClip GetOutputWholeExtent 304 6 -vtkImageConvolve GetKernel3x3 301 9 -vtkImageConvolve GetKernel3x3x3 301 27 -vtkImageConvolve GetKernel5x5 301 25 -vtkImageData GetDimensions 304 3 -vtkImageData GetExtent 304 6 -vtkImageData GetIncrements 30A 3 -vtkImageData GetPoint 307 3 -vtkImageEllipsoidSource GetWholeExtent 304 6 -vtkImageExport GetDataDimensions 304 3 -vtkImageExport GetDataExtent 304 6 -vtkImageExport GetDataOrigin 307 3 -vtkImageExport GetDataSpacing 307 3 -vtkImageMandelbrotSource GetSizeCX 307 4 -vtkImagePadFilter GetOutputWholeExtent 304 6 -vtkImagePlaneWidget GetCenter 307 3 -vtkImagePlaneWidget GetNormal 307 3 -vtkImagePlaneWidget GetOrigin 307 3 -vtkImagePlaneWidget GetPoint1 307 3 -vtkImagePlaneWidget GetPoint2 307 3 -vtkImagePointDataIterator GetIndex 304 3 -vtkImagePointIterator GetPosition 307 3 -vtkImageReslice GetResliceAxesDirectionCosines 307 9 -vtkImageReslice GetResliceAxesOrigin 307 3 -vtkImageSincInterpolator GetBlurFactors 307 3 -vtkImageSource GetExecuteExtent 304 6 -vtkImageSpatialAlgorithm GetKernelMiddle 304 3 -vtkImageSpatialAlgorithm GetKernelSize 304 3 -vtkImageSpatialFilter GetKernelMiddle 304 3 -vtkImageSpatialFilter GetKernelSize 304 3 -vtkImageTracerWidget GetHandlePosition 307 3 -vtkImageVectorConvolve GetKernel 301 3 -vtkImageViewer GetPosition 304 2 -vtkImageViewer GetSize 304 2 -vtkImplicitFunction FunctionGradient 307 3 -vtkImplicitCylinderRepresentation GetCenter 307 3 -vtkImplicitCylinderRepresentation GetAxis 307 3 -vtkImplicitPlaneRepresentation GetBounds 307 6 -vtkImplicitPlaneRepresentation GetNormal 307 3 -vtkImplicitPlaneRepresentation GetOrigin 307 3 -vtkImplicitPlaneWidget GetNormal 307 3 -vtkImplicitPlaneWidget GetOrigin 307 3 -vtkIntArray GetValueRange 304 2 -vtkIOSRenderWindow GetPosition 304 2 -vtkIOSRenderWindow GetScreenSize 304 2 -vtkIOSRenderWindow GetSize 304 2 -vtkKdNode GetMaxBounds 307 3 -vtkKdNode GetMaxDataBounds 307 3 -vtkKdNode GetMinBounds 307 3 -vtkKdNode GetMinDataBounds 307 3 -vtkLagrangeInterpolation GetPointIndicesBoundingHexFace 304 4 -vtkLagrangeInterpolation GetEdgeIndicesBoundingHexFace 304 4 -vtkLagrangeInterpolation GetPointIndicesBoundingWedgeFace 304 4 -vtkLagrangeInterpolation GetEdgeIndicesBoundingWedgeFace 304 4 -vtkLegendBoxActor GetEntryColor 307 3 -vtkLight GetColor 307 3 -vtkLight GetTransformedFocalPoint 307 3 -vtkLight GetTransformedPosition 307 3 -vtkLinearTransform TransformDoubleNormal 307 3 -vtkLinearTransform TransformDoubleVector 307 3 -vtkLinearTransform TransformFloatNormal 301 3 -vtkLinearTransform TransformFloatVector 301 3 -vtkLinearTransform TransformNormal 307 3 -vtkLinearTransform TransformVector 307 3 -vtkLineRepresentation GetBounds 307 6 -vtkLineRepresentation GetPoint1DisplayPosition 307 3 -vtkLineRepresentation GetPoint1WorldPosition 307 3 -vtkLineRepresentation GetPoint2DisplayPosition 307 3 -vtkLineRepresentation GetPoint2WorldPosition 307 3 -vtkLineWidget GetPoint1 307 3 -vtkLineWidget GetPoint2 307 3 -vtkLODProp3D GetBounds 307 6 -vtkLongArray GetValueRange 306 2 -vtkLongLongArray GetValueRange 30B 2 -vtkLookupTable GetColor 307 3 -vtkLookupTable GetRange 307 2 -vtkLookupTable GetAlphaRange 307 2 -vtkLookupTable GetHueRange 307 2 -vtkLookupTable GetSaturationRange 307 2 -vtkLookupTable GetTableValue 307 4 -vtkMapper GetBounds 307 6 -vtkMath HSVToRGB 307 3 -vtkMath LabToRGB 307 3 -vtkMath LabToXYZ 307 3 -vtkMath RGBToHSV 307 3 -vtkMath RGBToLab 307 3 -vtkMath RGBToXYZ 307 3 -vtkMath SolveCubic 307 5 -vtkMath SolveLinear 307 3 -vtkMath SolveQuadratic 307 4 -vtkMath XYZToLab 307 3 -vtkMath XYZToRGB 307 3 -vtkMatrix4x4 MultiplyDoublePoint 307 4 -vtkMatrix4x4 MultiplyFloatPoint 301 4 -vtkMatrix4x4 MultiplyPoint 301 4 -vtkMedicalImageProperties GetNthWindowLevelPreset 307 2 -vtkMedicalImageProperties GetWindowLevelPreset 307 2 -vtkMINCImageReader GetDataRange 307 2 -vtkOSOpenGLRenderWindow GetPosition 304 2 -vtkOSOpenGLRenderWindow GetScreenSize 304 2 -vtkOSOpenGLRenderWindow GetSize 304 2 -vtkPainterPolyDataMapper GetBounds 307 6 -vtkParallelopipedRepresentation GetBounds 307 6 -vtkPiecewiseFunction GetRange 307 2 -vtkPlaneWidget GetCenter 307 3 -vtkPlaneWidget GetNormal 307 3 -vtkPlaneWidget GetOrigin 307 3 -vtkPlaneWidget GetPoint1 307 3 -vtkPlaneWidget GetPoint2 307 3 -vtkPointHandleRepresentation2D GetBounds 307 6 -vtkPointHandleRepresentation3D GetBounds 307 6 -vtkPointSet GetPoint 307 3 -vtkPoints GetBounds 307 6 -vtkPoints GetPoint 307 3 -vtkPoints2D GetBounds 307 4 -vtkPoints2D GetPoint 307 2 -vtkPointWidget GetPosition 307 3 -vtkPolyData GetUpdateExtent 304 6 -vtkPolyDataMapper GetBounds 307 6 -vtkPolygon ConvertEllipseToImplicit 307 5 -vtkPolygon FitEllipse 307 6 -vtkPolyLine ConvertEllipseToImplicit 307 5 -vtkPolyLine EllipseToImplicit 307 3 -vtkPolyLine FitEllipse 307 6 -vtkProjectedPolyDataRayBounder GetRayBounds 301 2 -vtkProp3D GetBounds 307 6 -vtkProp3D GetCenter 307 3 -vtkProp3D GetOrientation 307 3 -vtkProp3D GetOrientationWXYZ 307 4 -vtkProp3D GetXRange 307 2 -vtkProp3D GetYRange 307 2 -vtkProp3D GetZRange 307 2 -vtkPropAssembly GetBounds 307 6 -vtkProperty GetColor 307 3 -vtkProp GetBounds 307 6 -vtkPyramid GetEdgeArray 304 2 -vtkPyramid GetFaceArray 304 4 -vtkQuadricClustering GetNumberOfDivisions 304 3 -vtkRayCaster GetParallelIncrements 301 2 -vtkRayCaster GetParallelStartPosition 301 3 -vtkRectilinearGrid GetExtent 304 6 -vtkRectilinearGrid GetPoint 307 3 -vtkRecursiveSphereDirectionEncoder GetDecodedGradient 301 3 -vtkRenderer ComputeVisiblePropBounds 307 6 -vtkScalarsToColors GetColor 307 3 -vtkScalarsToColors GetRange 307 2 -vtkShortArray GetValueRange 305 2 -vtkSignedCharArray GetValueRange 30D 2 -vtkSliderRepresentation3D GetBounds 307 6 -vtkSphereHandleRepresentation GetBounds 307 6 -vtkSphereRepresentation GetCenter 307 3 -vtkSphereWidget GetCenter 307 3 -vtkSphericalDirectionEncoder GetDecodedGradient 301 3 -vtkSplineWidget GetHandlePosition 307 3 -vtkStreamer GetStartPosition 307 3 -vtkStreamingDemandDrivenPipeline GetWholeExtent 304 6 -vtkStructuredGrid GetDimensions 304 3 -vtkStructuredGrid GetExtent 304 6 -vtkStructuredGrid GetPoint 307 3 -vtkStructuredGrid GetScalarRange 307 2 -vtkStructuredPointsGeometryFilter GetExtent 304 6 -vtkSynchronizedTemplates3D GetExecuteExtent 304 6 -vtkTetra GetEdgeArray 304 2 -vtkTetra GetFaceArray 304 3 -vtkTextActor3D GetBounds 307 6 -vtkTransform GetDoublePoint 307 4 -vtkTransform GetOrientation 307 3 -vtkTransform GetOrientationWXYZ 307 4 -vtkTransform GetPoint 307 4 -vtkTransform GetPosition 307 3 -vtkTransform GetScale 307 3 -vtkTypeInt64Array GetValueRange 30B 2 -vtkTypeInt64Array GetValueRange 30C 2 -vtkTypeUInt64Array GetValueRange 31B 2 -vtkTypeUInt64Array GetValueRange 31C 2 -vtkUnsignedCharArray GetValueRange 313 2 -vtkUnsignedIntArray GetValueRange 314 2 -vtkUnsignedLongArray GetValueRange 316 2 -vtkUnsignedLongLongArray GetValueRange 31B 2 -vtkUnsignedShortArray GetValueRange 315 2 -vtkUnstructuredGrid GetUpdateExtent 304 6 -vtkViewport GetCenter 307 2 -vtkViewport GetOrigin 304 2 -vtkViewport GetSize 304 2 -vtkViewRays GetParallelIncrements 301 2 -vtkViewRays GetParallelStartPosition 301 3 -vtkVolume GetBounds 307 6 -vtkVolumeMapper GetBounds 307 6 -vtkVoxel GetEdgeArray 304 2 -vtkVoxel GetFaceArray 304 4 -vtkWarpLens GetCenter 307 2 -vtkWedge GetEdgeArray 304 2 -vtkWedge GetFaceArray 304 4 -vtkWidgetRepresentation GetBounds 307 6 -vtkWin32OpenGLRenderWindow GetPosition 304 2 -vtkWin32OpenGLRenderWindow GetScreenSize 304 2 -vtkWin32OpenGLRenderWindow GetSize 304 2 -vtkWindow GetPosition 304 2 -vtkWindow GetSize 304 2 -vtkWindow GetScreenSize 304 2 -vtkWindowLevelLookupTable GetMaximumTableValue 307 4 -vtkWindowLevelLookupTable GetMinimumTableValue 307 4 -vtkXOpenGLRenderWindow GetPosition 304 2 -vtkXOpenGLRenderWindow GetScreenSize 304 2 -vtkXOpenGLRenderWindow GetSize 304 2 -vtkXYPlotActor GetPlotColor 307 3