diff options
Diffstat (limited to 'intern/dualcon')
-rw-r--r-- | intern/dualcon/intern/Projections.cpp | 4 | ||||
-rw-r--r-- | intern/dualcon/intern/dualcon_c_api.cpp | 2 | ||||
-rw-r--r-- | intern/dualcon/intern/octree.cpp | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/intern/dualcon/intern/Projections.cpp b/intern/dualcon/intern/Projections.cpp index 2a52cc9972a..f00d998591f 100644 --- a/intern/dualcon/intern/Projections.cpp +++ b/intern/dualcon/intern/Projections.cpp @@ -92,12 +92,12 @@ static void crossProduct(double res[3], const double a[3], const double b[3]) /** * Method to perform dot product */ -int64_t dotProduct(const int64_t a[3], const int64_t b[3]) +static int64_t dotProduct(const int64_t a[3], const int64_t b[3]) { return a[0] * b[0] + a[1] * b[1] + a[2] * b[2]; } -void normalize(double a[3]) +static void normalize(double a[3]) { double mag = a[0] * a[0] + a[1] * a[1] + a[2] * a[2]; if (mag > 0) { diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp index 894ab6b0873..c96415bfb54 100644 --- a/intern/dualcon/intern/dualcon_c_api.cpp +++ b/intern/dualcon/intern/dualcon_c_api.cpp @@ -32,7 +32,7 @@ #define isnan(n) _isnan(n) #endif -void veccopy(float dst[3], const float src[3]) +static void veccopy(float dst[3], const float src[3]) { dst[0] = src[0]; dst[1] = src[1]; diff --git a/intern/dualcon/intern/octree.cpp b/intern/dualcon/intern/octree.cpp index 9f44e7bbfdf..c74f8bf2f46 100644 --- a/intern/dualcon/intern/octree.cpp +++ b/intern/dualcon/intern/octree.cpp @@ -345,11 +345,13 @@ void Octree::addTriangle(Triangle *trian, int triind) delete proj; } -void print_depth(int height, int maxDepth) +#if 0 +static void print_depth(int height, int maxDepth) { for (int i = 0; i < maxDepth - height; i++) printf(" "); } +#endif InternalNode *Octree::addTriangle(InternalNode *node, CubeTriangleIsect *p, int height) { @@ -2108,8 +2110,8 @@ void pseudoInverse(const _Matrix_Type_ &a, svd.matrixU().adjoint(); } -void solve_least_squares(const float halfA[], const float b[], - const float midpoint[], float rvalue[]) +static void solve_least_squares(const float halfA[], const float b[], + const float midpoint[], float rvalue[]) { /* calculate pseudo-inverse */ Eigen::MatrixXf A(3, 3), pinv(3, 3); @@ -2126,8 +2128,8 @@ void solve_least_squares(const float halfA[], const float b[], rvalue[i] = result(i); } -void minimize(float rvalue[3], float mp[3], const float pts[12][3], - const float norms[12][3], const int parity[12]) +static void minimize(float rvalue[3], float mp[3], const float pts[12][3], + const float norms[12][3], const int parity[12]) { float ata[6] = {0, 0, 0, 0, 0, 0}; float atb[3] = {0, 0, 0}; |