diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
commit | 3c4987f98378d44eda133311c65aa19412e4cd38 (patch) | |
tree | 4371b4117d3290e60a58190481e926ebb17fcf28 /source/blender/freestyle/intern/geometry | |
parent | ec33687d6cf74775e37fdc1a14e22dea08289cb1 (diff) |
Fix for a number of compiler warnings as well as a bug hidden by the warnings.
Patch contribution by Bastien Montagne, thanks!
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
-rwxr-xr-x | source/blender/freestyle/intern/geometry/FitCurve.cpp | 16 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Grid.cpp | 2 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Noise.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp index 7754fcda32b..f71af130d7f 100755 --- a/source/blender/freestyle/intern/geometry/FitCurve.cpp +++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp @@ -55,17 +55,17 @@ static Vector2 V2SubII(Vector2 a, Vector2 b); #define MAXPOINTS 1000 /* The most points you can have */ /* returns squared length of input vector */ -double V2SquaredLength(Vector2 *a) +static double V2SquaredLength(Vector2 *a) { return(((*a)[0] * (*a)[0])+((*a)[1] * (*a)[1])); } /* returns length of input vector */ -double V2Length(Vector2 *a) +static double V2Length(Vector2 *a) { return(sqrt(V2SquaredLength(a))); } -Vector2 *V2Scale(Vector2 *v, double newlen) +static Vector2 *V2Scale(Vector2 *v, double newlen) { double len = V2Length(v); if (len != 0.0) { (*v)[0] *= newlen/len; (*v)[1] *= newlen/len; } @@ -73,13 +73,13 @@ Vector2 *V2Scale(Vector2 *v, double newlen) } /* return the dot product of vectors a and b */ -double V2Dot(Vector2 *a, Vector2 *b) +static double V2Dot(Vector2 *a, Vector2 *b) { return(((*a)[0]*(*b)[0])+((*a)[1]*(*b)[1])); } /* return the distance between two points */ -double V2DistanceBetween2Points(Vector2 *a, Vector2 *b) +static double V2DistanceBetween2Points(Vector2 *a, Vector2 *b) { double dx = (*a)[0] - (*b)[0]; double dy = (*a)[1] - (*b)[1]; @@ -87,14 +87,14 @@ double dy = (*a)[1] - (*b)[1]; } /* return vector sum c = a+b */ -Vector2 *V2Add(Vector2 *a, Vector2 *b, Vector2 *c) +static Vector2 *V2Add(Vector2 *a, Vector2 *b, Vector2 *c) { (*c)[0] = (*a)[0]+(*b)[0]; (*c)[1] = (*a)[1]+(*b)[1]; return(c); } /* normalizes the input vector and returns it */ -Vector2 *V2Normalize(Vector2 *v) +static Vector2 *V2Normalize(Vector2 *v) { double len = V2Length(v); if (len != 0.0) { (*v)[0] /= len; (*v)[1] /= len; } @@ -102,7 +102,7 @@ double len = V2Length(v); } /* negates the input vector and returns it */ -Vector2 *V2Negate(Vector2 *v) +static Vector2 *V2Negate(Vector2 *v) { (*v)[0] = -(*v)[0]; (*v)[1] = -(*v)[1]; return(v); diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp index 0096297f48b..bb0b3d80c30 100755 --- a/source/blender/freestyle/intern/geometry/Grid.cpp +++ b/source/blender/freestyle/intern/geometry/Grid.cpp @@ -30,7 +30,7 @@ void allOccludersGridVisitor::examineOccluder(Polygon3r *occ){ occluders_.push_back(occ); } -bool inBox(const Vec3r& inter, const Vec3r& box_min, const Vec3r& box_max){ +static bool inBox(const Vec3r& inter, const Vec3r& box_min, const Vec3r& box_max){ if(((inter.x()>=box_min.x()) && (inter.x() <box_max.x())) && ((inter.y()>=box_min.y()) && (inter.y() <box_max.y())) && ((inter.z()>=box_min.z()) && (inter.z() <box_max.z())) diff --git a/source/blender/freestyle/intern/geometry/Noise.cpp b/source/blender/freestyle/intern/geometry/Noise.cpp index c9a80adc5ee..ede8c434d9d 100755 --- a/source/blender/freestyle/intern/geometry/Noise.cpp +++ b/source/blender/freestyle/intern/geometry/Noise.cpp @@ -58,7 +58,7 @@ r0 = t - (int)t;\ r1 = r0 - 1.; -void normalize2(float v[2]) +static void normalize2(float v[2]) { float s; @@ -67,7 +67,7 @@ void normalize2(float v[2]) v[1] = v[1] / s; } -void normalize3(float v[3]) +static void normalize3(float v[3]) { float s; |