Commit eeef66fe authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'use-source-based-size-hints'

62f78ba7 Examples: remove hint file
67b32b87 hints: remove the hints file
6c9b59e7 Rendering/Volume: use VTK_SIZEHINT
f982c875 Interaction/Image: use VTK_SIZEHINT
07caabb7 Imaging/Statistics: use VTK_SIZEHINT
07d3d100 Imaging/Sources: use VTK_SIZEHINT
79079885 Imaging/General: use VTK_SIZEHINT
b06d713d Imaging/Core: use VTK_SIZEHINT
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Gobbi's avatarDavid Gobbi <david.gobbi@gmail.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !3706
parents 55a2dcc8 62f78ba7
......@@ -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)
......
......@@ -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); \
......
......@@ -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);
}
......
......@@ -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); }
/**
......
......@@ -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); }
......
......@@ -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);
//@}
//@{
......
......@@ -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.
......
......@@ -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.
......
......@@ -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;}
/**
......
......@@ -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; \
......
......@@ -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;
//@{
/**
......
......@@ -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;
//@}
......
......@@ -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.
......
......@@ -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);
/**
......
......@@ -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
......
......@@ -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.
......
......@@ -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);
//@}
/**
......
......@@ -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
......
......@@ -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]);
......
......@@ -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); };
//@}
......
......@@ -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
......
......@@ -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);
......
......@@ -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);};
/**
......
......@@ -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:
......
......@@ -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;
......
......@@ -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]);
//@}
......
......@@ -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:
......
......@@ -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:
......
......@@ -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:
......
......@@ -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)
{
......
......@@ -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);
//@}
......
......@@ -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);
//@}
//@{
......
......@@ -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; }
//@{
......
......@@ -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]) {