Commit d9313162 authored by Sean McBride's avatar Sean McBride

Fixed tonnes of -Wmissing-prototypes warnings

Just added 'static' in front of many private functions.

Change-Id: I892a46d684e00a44e7f84a7343e2cf5690f07eed
parent 8068bafd
......@@ -49,7 +49,7 @@ int periodical_2009[] = {197, 166, 176, 231, 171, 152, 166, 131, 184, 191, 143,
int audiobook_2009[] = {1213, 1076, 926, 987, 903, 1196, 1073, 1144, 1203, 1038, 874, 1173};
int video_2009[] = {2293, 1561, 1542, 1627, 1588, 1179, 1563, 1445, 1811, 1565, 1524, 1816};
void build_array(const char *name, vtkIntArray *array, int c_array[])
static void build_array(const char *name, vtkIntArray *array, int c_array[])
{
array->SetName(name);
for (int i = 0; i < num_months; ++i)
......
......@@ -638,9 +638,9 @@ void OTTetra::GetFacePoints(int i, OTFace *face)
// Routines used to sort the points based on id.
extern "C" {
#ifdef _WIN32_WCE
int __cdecl vtkSortOnIds(const void *val1, const void *val2)
static int __cdecl vtkSortOnIds(const void *val1, const void *val2)
#else
int vtkSortOnIds(const void *val1, const void *val2)
static int vtkSortOnIds(const void *val1, const void *val2)
#endif
{
if (((OTPoint *)val1)->SortId < ((OTPoint *)val2)->SortId)
......@@ -660,9 +660,9 @@ extern "C" {
extern "C" {
#ifdef _WIN32_WCE
int __cdecl vtkSortOnTwoIds(const void *val1, const void *val2)
static int __cdecl vtkSortOnTwoIds(const void *val1, const void *val2)
#else
int vtkSortOnTwoIds(const void *val1, const void *val2)
static int vtkSortOnTwoIds(const void *val1, const void *val2)
#endif
{
if (((OTPoint *)val1)->SortId2 < ((OTPoint *)val2)->SortId2)
......
......@@ -435,7 +435,7 @@ static int __cdecl vtkidsortcompare(const void *arg1, const void *arg2)
#else
extern "C"
{
int vtkidsortcompare(const void *arg1, const void *arg2)
static int vtkidsortcompare(const void *arg1, const void *arg2)
#endif
{
idsort *v1 = (idsort *)arg1;
......
......@@ -454,7 +454,7 @@ inline double evaluateHorner( double* P, int d, double x )
return val;
}
int vtkGetSignChanges(
static int vtkGetSignChanges(
double* P, int* degP, int* offsets, int count, double val, int* fsign = 0 )
{
int oldVal = 0;
......@@ -509,7 +509,7 @@ int vtkGetSignChanges(
//
// This algorithm is modified from
// BPR, Algorithms in Real Algebraic Geometry, page 318
int vtkGetHabichtSequence(
static int vtkGetHabichtSequence(
double* P, int d, double * SSS, int* degrees, int* offsets, double rtol )
{
//const static double high = pow(2.,256);
......@@ -615,7 +615,7 @@ int vtkGetHabichtSequence(
// Gets the sturm sequence. SSS and degrees and offsets are expected to
// be large enough and the number of non-zero items
// is returned. P is expected to have degree at least 1.
int vtkGetSturmSequence(
static int vtkGetSturmSequence(
double* P, int d, double* SSS, int* degrees, int* offsets, double rtol )
{
degrees[0] = d;
......@@ -668,7 +668,7 @@ int vtkGetSturmSequence(
extern "C" {
int vtkPolynomialSolversUnivariateCompareRoots( const void* a, const void* b )
static int vtkPolynomialSolversUnivariateCompareRoots( const void* a, const void* b )
{
return ( *( (const double*) a ) ) < ( *( (const double*) b ) ) ? -1 : 1;
}
......@@ -692,7 +692,7 @@ int vtkPolynomialSolversUnivariateCompareRoots( const void* a, const void* b )
//
// It probably would have been better to originally have had the tolerance be a
// relative tolerance rather than an absolute tolerance.
int vtkHabichtOrSturmBisectionSolve(
static int vtkHabichtOrSturmBisectionSolve(
double* P, int d, double* a, double* upperBnds, double tol,
int intervalType, int divideGCD, int method )
{
......@@ -1349,7 +1349,7 @@ int vtkPolynomialSolversUnivariate::SturmBisectionSolve(
// Furthermore assume that dP is large enough.
// Stores
// {f,f',f^(2)/2!,f^(3)/3!,...,f^(p)/p!}.
void vtkGetDerivativeSequence( double* dP, int p )
static void vtkGetDerivativeSequence( double* dP, int p )
{
int offsetA = 0;
int offsetB = p+1;
......@@ -1364,7 +1364,7 @@ void vtkGetDerivativeSequence( double* dP, int p )
}
}
int vtkGetSignChangesForDerivativeSequence( double* dP, int count, double val )
static int vtkGetSignChangesForDerivativeSequence( double* dP, int count, double val )
{
int oldVal = 0;
double v;
......
......@@ -179,7 +179,7 @@ public:
//do something with. If we see something, bump char ptr passed it, and return
//a code that says what we found. Skip over chars we don't recognize. When
//nothing is left in the string return -1.
int vtkDataObjectGeneratorGetNextToken(char **str)
static int vtkDataObjectGeneratorGetNextToken(char **str)
{
if (!str || !*str)
{
......@@ -208,7 +208,7 @@ int vtkDataObjectGeneratorGetNextToken(char **str)
}
//----------------------------------------------------------------------------
vtkInternalStructureCache *vtkDataObjectGeneratorParseStructure(char *Program)
static vtkInternalStructureCache *vtkDataObjectGeneratorParseStructure(char *Program)
{
vtkInternalStructureCache *structure = new vtkInternalStructureCache();
vtkInternalStructureCache *sptr = structure;
......
......@@ -99,14 +99,15 @@ unsigned long vtkGridSynchronizedTemplates3D::GetMTime()
}
//----------------------------------------------------------------------------
void vtkGridSynchronizedTemplates3DInitializeOutput(int *ext,
int precision,
vtkStructuredGrid *input,
vtkPolyData *o,
vtkFloatArray *scalars,
vtkFloatArray *normals,
vtkFloatArray *gradients,
vtkDataArray *inScalars)
static void vtkGridSynchronizedTemplates3DInitializeOutput(
int *ext,
int precision,
vtkStructuredGrid *input,
vtkPolyData *o,
vtkFloatArray *scalars,
vtkFloatArray *normals,
vtkFloatArray *gradients,
vtkDataArray *inScalars)
{
vtkPoints *newPts;
vtkCellArray *newPolys;
......
......@@ -86,7 +86,7 @@ unsigned long vtkRectilinearSynchronizedTemplates::GetMTime()
}
//----------------------------------------------------------------------------
void vtkRectilinearSynchronizedTemplatesInitializeOutput(
static void vtkRectilinearSynchronizedTemplatesInitializeOutput(
int *ext, vtkRectilinearGrid *input, vtkPolyData *o, vtkFloatArray *scalars,
vtkFloatArray *normals, vtkFloatArray *gradients, vtkDataArray *inScalars)
{
......
......@@ -293,7 +293,7 @@ const vtkEdgeSubdivisionCriterion* vtkStreamingTessellator::GetSubdivisionAlgori
// Returns true if || a0a1 || < || b0b1 ||
// We use this to test which triangulation has the best
// aspect ratio when there are 2 to choose from.
bool compareHopfCrossStringDist( const double* a0, const double* a1, const double* b0, const double* b1 )
static bool compareHopfCrossStringDist( const double* a0, const double* a1, const double* b0, const double* b1 )
{
double SqMagA = 0.;
double SqMagB = 0.;
......
......@@ -130,7 +130,7 @@ int vtkExtractSelectedIds::RequestData(
}
// Copy the points marked as "in" and build a pointmap
void vtkExtractSelectedIdsCopyPoints(vtkDataSet* input,
static void vtkExtractSelectedIdsCopyPoints(vtkDataSet* input,
vtkDataSet* output, signed char* inArray, vtkIdType* pointMap)
{
vtkPoints* newPts = vtkPoints::New();
......
......@@ -111,7 +111,7 @@ int vtkExtractSelectedLocations::RequestData(
}
// Copy the points marked as "in" and build a pointmap
void vtkExtractSelectedLocationsCopyPoints(vtkDataSet* input, vtkDataSet* output, signed char* inArray, vtkIdType* pointMap)
static void vtkExtractSelectedLocationsCopyPoints(vtkDataSet* input, vtkDataSet* output, signed char* inArray, vtkIdType* pointMap)
{
vtkPoints* newPts = vtkPoints::New();
......
......@@ -612,27 +612,27 @@ void vtkModifiedBSPTree::GenerateRepresentationLeafs(vtkPolyData *pd)
//////////////////////////////////////////////////////////////////////////////
// Ray->Box edge t-distance tests
double _getMinDistPOS_X(const double origin[3], const double dir[3], const double B[6])
static double _getMinDistPOS_X(const double origin[3], const double dir[3], const double B[6])
{
return ((B[0] - origin[0]) / dir[0]);
}
double _getMinDistNEG_X(const double origin[3], const double dir[3], const double B[6])
static double _getMinDistNEG_X(const double origin[3], const double dir[3], const double B[6])
{
return ((B[1] - origin[0]) / dir[0]);
}
double _getMinDistPOS_Y(const double origin[3], const double dir[3], const double B[6])
static double _getMinDistPOS_Y(const double origin[3], const double dir[3], const double B[6])
{
return ((B[2] - origin[1]) / dir[1]);
}
double _getMinDistNEG_Y(const double origin[3], const double dir[3], const double B[6])
static double _getMinDistNEG_Y(const double origin[3], const double dir[3], const double B[6])
{
return ((B[3] - origin[1]) / dir[1]);
}
double _getMinDistPOS_Z(const double origin[3], const double dir[3], const double B[6])
static double _getMinDistPOS_Z(const double origin[3], const double dir[3], const double B[6])
{
return ((B[4] - origin[2]) / dir[2]);
}
double _getMinDistNEG_Z(const double origin[3], const double dir[3], const double B[6])
static double _getMinDistNEG_Z(const double origin[3], const double dir[3], const double B[6])
{
return ((B[5] - origin[2]) / dir[2]);
}
......
......@@ -1278,7 +1278,7 @@ typedef std::vector<boxLevel> boxlist;
typedef std::pair<vtkCellTreeLocator::vtkCellTreeNode*, boxLevel> nodeBoxLevel;
typedef std::stack<nodeBoxLevel, std::vector<nodeBoxLevel> > nodeinfostack;
//---------------------------------------------------------------------------
void SplitNodeBox(vtkCellTreeLocator::vtkCellTreeNode *n, vtkBoundingBox &b, vtkBoundingBox &l, vtkBoundingBox &r)
static void SplitNodeBox(vtkCellTreeLocator::vtkCellTreeNode *n, vtkBoundingBox &b, vtkBoundingBox &l, vtkBoundingBox &r)
{
double minpt[3], maxpt[3];
// create a box for left node
......@@ -1295,7 +1295,7 @@ void SplitNodeBox(vtkCellTreeLocator::vtkCellTreeNode *n, vtkBoundingBox &b, vtk
r = rr;
}
//---------------------------------------------------------------------------
void AddBox(vtkPolyData *pd, double *bounds, int level)
static void AddBox(vtkPolyData *pd, double *bounds, int level)
{
vtkPoints *pts = pd->GetPoints();
vtkCellArray *lines = pd->GetLines();
......
......@@ -2579,7 +2579,7 @@ int vtkCCSCheckPolygonSense(
// The values of pp, bounds, and tol2 must be precomputed
// by calling vtkCCSPrepareForPolyInPoly() on outerPoly.
int vtkCCSPolyInPoly(
static int vtkCCSPolyInPoly(
const vtkCCSPoly &outerPoly, const vtkCCSPoly &innerPoly,
vtkPoints *points, const double normal[3],
const double *pp, const double bounds[6],
......@@ -2640,7 +2640,7 @@ int vtkCCSPolyInPoly(
// tol2: a tolerance value based on the size of the polygon
// (note: pp must be pre-allocated to the 3*outerPoly.size())
void vtkCCSPrepareForPolyInPoly(
static void vtkCCSPrepareForPolyInPoly(
const vtkCCSPoly &outerPoly, vtkPoints *points,
double *pp, double bounds[6], double &tol2)
{
......@@ -2802,7 +2802,7 @@ void vtkCCSMakeHoleyPolys(
// Return value of zero means check failed and the cut is not
// usable.
int vtkCCSCheckCut(
static int vtkCCSCheckCut(
const std::vector<vtkCCSPoly> &polys, vtkPoints *points,
const double normal[3], const vtkCCSPolyGroup &polyGroup,
size_t outerPolyId, size_t innerPolyId,
......@@ -2938,7 +2938,7 @@ int vtkCCSCheckCut(
// line segment that it joins to. Smaller values indicate a
// higher quality cut.
double vtkCCSCutQuality(
static double vtkCCSCutQuality(
const vtkCCSPoly &outerPoly, const vtkCCSPoly &innerPoly,
size_t i, size_t j, vtkPoints *points)
{
......@@ -3014,7 +3014,7 @@ double vtkCCSCutQuality(
// ---------------------------------------------------
// Find the two sharpest verts on an inner (i.e. inside-out) poly.
void vtkCCSFindSharpestVerts(
static void vtkCCSFindSharpestVerts(
const vtkCCSPoly &poly, vtkPoints *points, const double normal[3],
size_t verts[2])
{
......@@ -3072,7 +3072,7 @@ void vtkCCSFindSharpestVerts(
// Find two valid cuts between outerPoly and innerPoly.
// Used by vtkCCSCutHoleyPolys.
int vtkCCSFindCuts(
static int vtkCCSFindCuts(
const std::vector<vtkCCSPoly> &polys,
const vtkCCSPolyGroup &polyGroup, size_t outerPolyId, size_t innerPolyId,
vtkPoints *points, const double normal[3], size_t cuts[2][2],
......@@ -3170,7 +3170,7 @@ int vtkCCSFindCuts(
// Helper for vtkCCSCutHoleyPolys. Change a polygon and a hole
// into two separate polygons by making two cuts between them.
void vtkCCSMakeCuts(
static void vtkCCSMakeCuts(
std::vector<vtkCCSPoly> &polys,
std::vector<vtkCCSPolyEdges> &polyEdges,
size_t outerPolyId, size_t innerPolyId,
......
......@@ -148,10 +148,10 @@ inline void vtkNearestHelper(double displacement[3], double derivatives[3][3],
derivatives[2][2] = gridPtr1[2] - gridPtr0[2];
}
void vtkNearestNeighborInterpolation(double point[3], double displacement[3],
double derivatives[3][3], void *gridPtr,
int gridType, int gridExt[6],
vtkIdType gridInc[3])
static void vtkNearestNeighborInterpolation(double point[3], double displacement[3],
double derivatives[3][3], void *gridPtr,
int gridType, int gridExt[6],
vtkIdType gridInc[3])
{
if (derivatives == NULL)
{
......@@ -304,9 +304,9 @@ inline void vtkLinearHelper(double displacement[3], double derivatives[3][3],
}
}
void vtkTrilinearInterpolation(double point[3], double displacement[3],
double derivatives[3][3], void *gridPtr, int gridType,
int gridExt[6], vtkIdType gridInc[3])
static void vtkTrilinearInterpolation(double point[3], double displacement[3],
double derivatives[3][3], void *gridPtr, int gridType,
int gridExt[6], vtkIdType gridInc[3])
{
// change point into integer plus fraction
double f[3];
......@@ -391,8 +391,8 @@ void vtkTrilinearInterpolation(double point[3], double displacement[3],
// helper function: set up the lookup indices and the interpolation
// coefficients
void vtkSetTricubicInterpCoeffs(double F[4], int *l, int *m, double f,
int interpMode)
static void vtkSetTricubicInterpCoeffs(double F[4], int *l, int *m, double f,
int interpMode)
{
double fp1,fm1,fm2;
......@@ -443,8 +443,8 @@ void vtkSetTricubicInterpCoeffs(double F[4], int *l, int *m, double f,
}
// set coefficients to be used to find the derivative of the cubic
void vtkSetTricubicDerivCoeffs(double F[4], double G[4], int *l, int *m,
double f, int interpMode)
static void vtkSetTricubicDerivCoeffs(double F[4], double G[4], int *l, int *m,
double f, int interpMode)
{
double fp1,fm1,fm2;
......@@ -612,10 +612,10 @@ inline void vtkCubicHelper(double displacement[3], double derivatives[3][3],
}
}
void vtkTricubicInterpolation(double point[3], double displacement[3],
double derivatives[3][3], void *gridPtr,
int gridType, int gridExt[6],
vtkIdType gridInc[3])
static void vtkTricubicInterpolation(double point[3], double displacement[3],
double derivatives[3][3], void *gridPtr,
int gridType, int gridExt[6],
vtkIdType gridInc[3])
{
vtkIdType factX[4],factY[4],factZ[4];
......
......@@ -37,7 +37,7 @@
#include <vtksys/stl/stack>
#include <vtksys/stl/utility>
vtksys_stl::pair<vtkGeoImageNode*, double>
static vtksys_stl::pair<vtkGeoImageNode*, double>
vtkGeoAlignedImageRepresentationFind(vtkGeoSource* source, vtkGeoImageNode* p, double* bounds, vtkGeoTreeNodeCache* nodeList)
{
if (!p->HasData())
......
......@@ -755,9 +755,9 @@ void vtkGeoInteractorStyle::Dolly(double factor)
//-----------------------------------------------------------------------------
// Called by the renderer start event.
// Redraw the rectangle.
void vtkGeoInteractorStyleRenderCallback(vtkObject *caller,
unsigned long event,
void *clientData, void *)
static void vtkGeoInteractorStyleRenderCallback(vtkObject *caller,
unsigned long event,
void *clientData, void *)
{
(void)caller;
(void)event;
......
......@@ -34,7 +34,7 @@
#include <vtksys/stl/utility>
#include <vtksys/stl/vector>
VTK_THREAD_RETURN_TYPE vtkGeoSourceThreadStart(void* arg)
static VTK_THREAD_RETURN_TYPE vtkGeoSourceThreadStart(void* arg)
{
vtkGeoSource* self;
self = static_cast<vtkGeoSource *>(static_cast<vtkMultiThreader::ThreadInfo *>(arg)->UserData);
......
......@@ -39,7 +39,7 @@
// Description:
// Finds the block index (blockIndx) within the HDF5 file associated with
// the given file index.
bool FindBlockIndex( hid_t fileIndx, const int blockIdx, hid_t &rootIndx )
static bool FindBlockIndex( hid_t fileIndx, const int blockIdx, hid_t &rootIndx )
{
// retrieve the contents of the root directory to look for a group
// corresponding to the target block, if available, open that group
......@@ -82,7 +82,7 @@ bool FindBlockIndex( hid_t fileIndx, const int blockIdx, hid_t &rootIndx )
//------------------------------------------------------------------------------
// Description:
// Returns the double array
void GetDoubleArrayByName(
static void GetDoubleArrayByName(
const hid_t rootIdx, const char* name, std::vector<double> &array)
{
// turn off warnings
......
......@@ -37,7 +37,7 @@
// ----------------------------------------------------------------------------
std::string GetEnzoMajorFileName( const char * path )
static std::string GetEnzoMajorFileName( const char * path )
{
return(vtksys::SystemTools::GetFilenameName( std::string( path ) ) );
}
......
......@@ -40,7 +40,7 @@
// Helper function that reads the particle coordinates
// NOTE: it is assumed that H5DOpen has been called on the
// internal file index this->FileIndex.
void GetParticleCoordinates( hid_t &dataIdx,
static void GetParticleCoordinates( hid_t &dataIdx,
std::vector< double > &xcoords, std::vector< double > &ycoords,
std::vector< double > &zcoords,
vtkFlashReaderInternal *iReader,
......
......@@ -56,8 +56,9 @@ vtkEnSight6Reader::~vtkEnSight6Reader()
}
//----------------------------------------------------------------------------
void vtkEnSight6ReaderRead1(const char *line, const char *, int *pointId,
float *point1, float *point2, float *point3)
static void vtkEnSight6ReaderRead1(const char *line, const char *,
int *pointId, float *point1,
float *point2, float *point3)
{
#ifdef __CYGWIN__
// most cygwins are busted in sscanf, this is a work around
......@@ -83,8 +84,8 @@ void vtkEnSight6ReaderRead1(const char *line, const char *, int *pointId,
assert("post: all_items_match" && numEntries==4);
}
void vtkEnSight6ReaderRead2(const char *line, const char *,
float *point1, float *point2, float *point3)
static void vtkEnSight6ReaderRead2(const char *line, const char *,
float *point1, float *point2, float *point3)
{
#ifdef __CYGWIN__
// most cygwins are busted in sscanf, this is a work around
......@@ -108,9 +109,9 @@ void vtkEnSight6ReaderRead2(const char *line, const char *,
assert("post: all_items_match" && numEntries==3);
}
void vtkEnSight6ReaderRead3(const char *line, const char *,
float *point1, float *point2, float *point3,
float *point4, float *point5, float *point6)
static void vtkEnSight6ReaderRead3(const char *line, const char *,
float *point1, float *point2, float *point3,
float *point4, float *point5, float *point6)
{
#ifdef __CYGWIN__
// most cygwins are busted in sscanf, this is a work around
......@@ -143,7 +144,7 @@ void vtkEnSight6ReaderRead3(const char *line, const char *,
assert("post: all_items_match" && numEntries==6);
}
void vtkEnSight6ReaderRead4(const char *line, float *point1)
static void vtkEnSight6ReaderRead4(const char *line, float *point1)
{
#ifdef __CYGWIN__
// most cygwins are busted in sscanf, this is a work around
......
......@@ -437,9 +437,9 @@ void vtkGESignaReader::ExecuteInformation()
fclose(fp);
}
void vtkcopygenesisimage(FILE *infp, int width, int height, int compress,
short *map_left, short *map_wide,
unsigned short *output)
static void vtkcopygenesisimage(FILE *infp, int width, int height, int compress,
short *map_left, short *map_wide,
unsigned short *output)
{
unsigned short row;
unsigned short last_pixel=0;
......@@ -544,8 +544,8 @@ void vtkcopygenesisimage(FILE *infp, int width, int height, int compress,
}
void vtkGESignaReaderUpdate2(vtkGESignaReader *self, unsigned short *outPtr,
int *outExt, vtkIdType *)
static void vtkGESignaReaderUpdate2(vtkGESignaReader *self, unsigned short *outPtr,
int *outExt, vtkIdType *)
{
FILE *fp = fopen(self->GetInternalFileName(), "rb");
if (!fp)
......@@ -692,8 +692,8 @@ void vtkGESignaReaderUpdate2(vtkGESignaReader *self, unsigned short *outPtr,
//----------------------------------------------------------------------------
// This function reads in one data of data.
// templated to handle different data types.
void vtkGESignaReaderUpdate(vtkGESignaReader *self, vtkImageData *data,
unsigned short *outPtr)
static void vtkGESignaReaderUpdate(vtkGESignaReader *self, vtkImageData *data,
unsigned short *outPtr)
{
vtkIdType outIncr[3];
int outExtent[6];
......
......@@ -123,8 +123,8 @@ void vtkPNGWriter::Write()
extern "C"
{
void vtkPNGWriteInit(png_structp png_ptr, png_bytep data,
png_size_t sizeToWrite)
static void vtkPNGWriteInit(png_structp png_ptr, png_bytep data,
png_size_t sizeToWrite)
{
vtkPNGWriter *self =
vtkPNGWriter::SafeDownCast(static_cast<vtkObject *>
......@@ -141,15 +141,15 @@ extern "C"
extern "C"
{
void vtkPNGWriteFlush(png_structp vtkNotUsed(png_ptr))
static void vtkPNGWriteFlush(png_structp vtkNotUsed(png_ptr))
{
}
}
extern "C"
{
void vtkPNGWriteWarningFunction(png_structp png_ptr,
png_const_charp warning_msg)
static void vtkPNGWriteWarningFunction(png_structp png_ptr,
png_const_charp warning_msg)
{
PNG_CONST char *name = "UNKNOWN (ERROR!)";
char *test;
......@@ -167,8 +167,8 @@ extern "C"
{
/* The PNG library does not expect the error function to return.
Therefore we must use this ugly longjmp call. */
void vtkPNGWriteErrorFunction(png_structp png_ptr,
png_const_charp error_msg)
static void vtkPNGWriteErrorFunction(png_structp png_ptr,
png_const_charp error_msg)
{
#if PNG_LIBPNG_VER >= 10400
vtkPNGWriteWarningFunction(png_ptr, error_msg);
......
......@@ -1747,7 +1747,7 @@ int vtkDataWriter::WritePedigreeIdData(ostream *fp, vtkAbstractArray *pedigreeId
return this->WriteArray(fp, pedigreeIds->GetDataType(), pedigreeIds, format, num, 1);
}
int vtkIsInTheList(int index, int* list, int numElem)
static int vtkIsInTheList(int index, int* list, int numElem)
{
for(int i=0; i<numElem; i++)
{
......
......@@ -948,7 +948,7 @@ T* vtkXMLParseAsciiData(istream& is, int* length, T*, long)
}
//----------------------------------------------------------------------------
char* vtkXMLParseAsciiData(istream& is, int* length, char*, int)
static char* vtkXMLParseAsciiData(istream& is, int* length, char*, int)
{
int dataLength = 0;
int dataBufferSize = 64;
......@@ -981,8 +981,10 @@ char* vtkXMLParseAsciiData(istream& is, int* length, char*, int)
}
//----------------------------------------------------------------------------
unsigned char* vtkXMLParseAsciiData(istream& is, int* length, unsigned char*,
int)
static unsigned char* vtkXMLParseAsciiData(istream& is,
int* length,
unsigned char*,
int)
{
int dataLength = 0;
int dataBufferSize = 64;
......@@ -1015,8 +1017,10 @@ unsigned char* vtkXMLParseAsciiData(istream& is, int* length, unsigned char*,
}
//----------------------------------------------------------------------------
signed char* vtkXMLParseAsciiData(istream& is, int* length, signed char*,
int)
static signed char* vtkXMLParseAsciiData(istream& is,
int* length,
signed char*,
int)
{
int dataLength = 0;
int dataBufferSize = 64;
......
......@@ -479,7 +479,7 @@ void vtkXMLUtilities::ReadElementFromAttributeArray(
}
//----------------------------------------------------------------------------
void vtkXMLUtilitiesFindSimilarElementsInternal(
static void vtkXMLUtilitiesFindSimilarElementsInternal(
vtkXMLDataElement *elem,
vtkXMLDataElement *tree,
vtkXMLUtilitiesDataElementContainer *results)
......
......@@ -163,11 +163,12 @@ int vtkImageMapToColors::RequestInformation (
//----------------------------------------------------------------------------
// This non-templated function executes the filter for any type of data.
void vtkImageMapToColorsExecute(vtkImageMapToColors *self,
vtkImageData *inData, void *inPtr,
vtkImageData *outData,
unsigned char *outPtr,
int outExt[6], int id)
static void vtkImageMapToColorsExecute(vtkImageMapToColors *self,
vtkImageData *inData,
void *inPtr,
vtkImageData *outData,
unsigned char *outPtr,
int outExt[6], int id)
{
int idxY, idxZ;
int extX, extY, extZ;
......
......@@ -34,8 +34,8 @@ int vtkImageFFT::IterativeRequestInformation(
}
//----------------------------------------------------------------------------
void vtkImageFFTInternalRequestUpdateExtent(int *inExt, int *outExt, int *wExt,
int iteration)
static void vtkImageFFTInternalRequestUpdateExtent(int *inExt, int *outExt,
int *wExt, int iteration)
{
memcpy(inExt, outExt, 6 * sizeof(int));
inExt[iteration*2] = wExt[iteration*2];
......
......@@ -180,7 +180,7 @@ void vtkImageEuclideanDistanceInitialize(vtkImageEuclideanDistance *self,
//
// Notations stay as close as possible to those used in the paper.
//
void vtkImageEuclideanDistanceExecuteSaito(vtkImageEuclideanDistance *self,
static void vtkImageEuclideanDistanceExecuteSaito(vtkImageEuclideanDistance *self,
vtkImageData *outData,
int outExt[6], double *outPtr )
{
......@@ -362,7 +362,7 @@ void vtkImageEuclideanDistanceExecuteSaito(vtkImageEuclideanDistance *self,
//----------------------------------------------------------------------------
// Execute Saito's algorithm, modified for Cache Efficiency
//
void vtkImageEuclideanDistanceExecuteSaitoCached(
static void vtkImageEuclideanDistanceExecuteSaitoCached(
vtkImageEuclideanDistance *self,
vtkImageData *outData, int outExt[6], double *outPtr )
{
......
......@@ -82,10 +82,10 @@ void vtkImageMedian3D::SetKernelSize(int size0, int size1, int size2)
//-----------------------------------------------------------------------------
// Add a sample to the median computation
double *vtkImageMedian3DAccumulateMedian(int &UpNum, int &DownNum,
int &UpMax, int &DownMax,
int &NumNeighborhood,
double *Median, double val)
static double *vtkImageMedian3DAccumulateMedian(int &UpNum, int &DownNum,
int &UpMax, int &DownMax,
int &NumNeighborhood,
double *Median, double val)
{
int idx, max;
double temp, *ptr;
......
......@@ -28,7 +28,7 @@ vtkCxxSetObjectMacro(vtkImageSeparableConvolution,ZKernel,vtkFloatArray);
// Actually do the convolution
void ExecuteConvolve (float* kernel, int kernelSize, float* image, float* outImage, int imageSize )
static void ExecuteConvolve (float* kernel, int kernelSize, float* image, float* outImage, int imageSize )
{
// Consider the kernel to be centered at (int) ( (kernelSize - 1 ) / 2.0 )
......
......@@ -36,35 +36,35 @@ vtkSurfaceReconstructionFilter::vtkSurfaceReconstructionFilter()
}