From c680d0615421834fbdb3da8399a1cfd3394e5585 Mon Sep 17 00:00:00 2001 From: Baldvin Kovacs Date: Sun, 31 Mar 2024 17:11:28 +0200 Subject: [PATCH] Fixed signedness warnings. --- include/tinynurbs/core/check.h | 10 +++---- include/tinynurbs/core/evaluate.h | 16 +++++------ include/tinynurbs/core/modify.h | 44 +++++++++++++++---------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/tinynurbs/core/check.h b/include/tinynurbs/core/check.h index 4bc7fd5..5f49718 100644 --- a/include/tinynurbs/core/check.h +++ b/include/tinynurbs/core/check.h @@ -164,7 +164,7 @@ bool surfaceIsValid(unsigned int degree_u, unsigned int degree_v, const std::vec */ template bool isKnotVectorClosed(unsigned int degree, const std::vector &knots) { - for (int i = 0; i < degree - 1; ++i) + for (unsigned int i = 0; i < degree - 1; ++i) { int j = knots.size() - degree + i; if (std::abs((knots[i + 1] - knots[i]) - (knots[j + 1] - knots[j])) > @@ -185,7 +185,7 @@ template bool isKnotVectorClosed(unsigned int degree, const std::ve */ template bool isArray1Closed(unsigned int degree, const std::vector &vec) { - for (int i = 0; i < degree; ++i) + for (unsigned int i = 0; i < degree; ++i) { int j = vec.size() - degree + i; if (glm::length(vec[i] - vec[j]) > 1e-5) @@ -205,7 +205,7 @@ template bool isArray1Closed(unsigned int degree, const std::vector */ template bool isArray2ClosedU(unsigned int degree_u, const array2 &arr) { - for (int i = 0; i < degree_u; ++i) + for (unsigned int i = 0; i < degree_u; ++i) { for (int j = 0; j < arr.cols(); ++j) { @@ -228,9 +228,9 @@ template bool isArray2ClosedU(unsigned int degree_u, const array2 bool isArray2ClosedV(unsigned int degree_v, const array2 &arr) { - for (int i = 0; i < arr.rows(); ++i) + for (unsigned int i = 0; i < arr.rows(); ++i) { - for (int j = 0; j < degree_v; j++) + for (unsigned int j = 0; j < degree_v; j++) { int k = arr.rows() - degree_v + i; if (glm::length(arr(i, j) - arr(i, k)) > 1e-5) diff --git a/include/tinynurbs/core/evaluate.h b/include/tinynurbs/core/evaluate.h index 3267ae5..444bb67 100644 --- a/include/tinynurbs/core/evaluate.h +++ b/include/tinynurbs/core/evaluate.h @@ -124,10 +124,10 @@ glm::vec surfacePoint(unsigned int degree_u, unsigned int degree_v, std::vector Nu = bsplineBasis(degree_u, span_u, knots_u, u); std::vector Nv = bsplineBasis(degree_v, span_v, knots_v, v); - for (int l = 0; l <= degree_v; l++) + for (unsigned int l = 0; l <= degree_v; l++) { glm::vec temp(0.0); - for (int k = 0; k <= degree_u; k++) + for (unsigned int k = 0; k <= degree_u; k++) { temp += static_cast(Nu[k]) * control_points(span_u - degree_u + k, span_v - degree_v + l); @@ -160,9 +160,9 @@ surfaceDerivatives(unsigned int degree_u, unsigned int degree_v, const std::vect array2> surf_ders(num_ders + 1, num_ders + 1, glm::vec(0.0)); // Set higher order derivatives to 0 - for (int k = degree_u + 1; k <= num_ders; k++) + for (unsigned int k = degree_u + 1; k <= num_ders; k++) { - for (int l = degree_v + 1; l <= num_ders; l++) + for (unsigned int l = degree_v + 1; l <= num_ders; l++) { surf_ders(k, l) = glm::vec(0.0); } @@ -181,12 +181,12 @@ surfaceDerivatives(unsigned int degree_u, unsigned int degree_v, const std::vect std::vector> temp; temp.resize(degree_v + 1); // Compute derivatives - for (int k = 0; k <= du; k++) + for (unsigned int k = 0; k <= du; k++) { - for (int s = 0; s <= degree_v; s++) + for (unsigned int s = 0; s <= degree_v; s++) { temp[s] = glm::vec(0.0); - for (int r = 0; r <= degree_u; r++) + for (unsigned int r = 0; r <= degree_u; r++) { temp[s] += static_cast(ders_u(k, r)) * control_points(span_u - degree_u + r, span_v - degree_v + s); @@ -197,7 +197,7 @@ surfaceDerivatives(unsigned int degree_u, unsigned int degree_v, const std::vect for (int l = 0; l <= dd; l++) { - for (int s = 0; s <= degree_v; s++) + for (unsigned int s = 0; s <= degree_v; s++) { surf_ders(k, l) += ders_v(l, s) * temp[s]; } diff --git a/include/tinynurbs/core/modify.h b/include/tinynurbs/core/modify.h index 7109825..1698e13 100644 --- a/include/tinynurbs/core/modify.h +++ b/include/tinynurbs/core/modify.h @@ -69,7 +69,7 @@ void curveKnotInsert(unsigned int deg, const std::vector &knots, } // Copy unaffected control points new_cp.resize(cp.size() + r); - for (int i = 0; i < k - deg + 1; ++i) + for (unsigned int i = 0; i < k - deg + 1; ++i) { new_cp[i] = cp[i]; } @@ -80,15 +80,15 @@ void curveKnotInsert(unsigned int deg, const std::vector &knots, // Copy affected control points std::vector> tmp; tmp.resize(deg - s + 1); - for (int i = 0; i < deg - s + 1; ++i) + for (unsigned int i = 0; i < deg - s + 1; ++i) { tmp[i] = cp[k - deg + i]; } // Modify affected control points - for (int j = 1; j <= r; ++j) + for (unsigned int j = 1; j <= r; ++j) { int L = k - deg + j; - for (int i = 0; i < deg - j - s + 1; ++i) + for (unsigned int i = 0; i < deg - j - s + 1; ++i) { T a = (u - knots[L + i]) / (knots[i + k + 1] - knots[L + i]); tmp[i] = (1 - a) * tmp[i] + a * tmp[i + 1]; @@ -97,7 +97,7 @@ void curveKnotInsert(unsigned int deg, const std::vector &knots, new_cp[k + r - j - s] = tmp[deg - j - s]; } int L = k - deg + r; - for (int i = L + 1; i < k - s; ++i) + for (unsigned int i = L + 1; i < k - s; ++i) { new_cp[i] = tmp[i - L]; } @@ -139,7 +139,7 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, { new_knots[i] = knots[i]; } - for (int i = 1; i <= r; ++i) + for (unsigned int i = 1; i <= r; ++i) { new_knots[span + i] = knot; } @@ -149,10 +149,10 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, } // Compute alpha array2 alpha(degree - s, r + 1, T(0)); - for (int j = 1; j <= r; ++j) + for (unsigned int j = 1; j <= r; ++j) { int L = span - degree + j; - for (int i = 0; i <= degree - j - s; ++i) + for (unsigned int i = 0; i <= degree - j - s; ++i) { alpha(i, j) = (knot - knots[L + i]) / (knots[i + span + 1] - knots[L + i]); } @@ -171,7 +171,7 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, for (int col = 0; col < cp.cols(); ++col) { // Copy unaffected control points - for (int i = 0; i <= span - degree; ++i) + for (unsigned int i = 0; i <= span - degree; ++i) { new_cp(i, col) = cp(i, col); } @@ -180,15 +180,15 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, new_cp(i + r, col) = cp(i, col); } // Copy affected control points to temp array - for (int i = 0; i < degree - s + 1; ++i) + for (unsigned int i = 0; i < degree - s + 1; ++i) { tmp[i] = cp(span - degree + i, col); } // Insert knot - for (int j = 1; j <= r; ++j) + for (unsigned int j = 1; j <= r; ++j) { int L = span - degree + j; - for (int i = 0; i <= degree - j - s; ++i) + for (unsigned int i = 0; i <= degree - j - s; ++i) { T a = alpha(i, j); tmp[i] = (1 - a) * tmp[i] + a * tmp[i + 1]; @@ -197,7 +197,7 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, new_cp(span + r - j - s, col) = tmp[degree - j - s]; } int L = span - degree + r; - for (int i = L + 1; i < span - s; ++i) + for (unsigned int i = L + 1; i < span - s; ++i) { new_cp(i, col) = tmp[i - L]; } @@ -213,7 +213,7 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, for (int row = 0; row < cp.rows(); ++row) { // Copy unaffected control points - for (int i = 0; i <= span - degree; ++i) + for (unsigned int i = 0; i <= span - degree; ++i) { new_cp(row, i) = cp(row, i); } @@ -222,15 +222,15 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, new_cp(row, i + r) = cp(row, i); } // Copy affected control points to temp array - for (int i = 0; i < degree - s + 1; ++i) + for (unsigned int i = 0; i < degree - s + 1; ++i) { tmp[i] = cp(row, span - degree + i); } // Insert knot - for (int j = 1; j <= r; ++j) + for (unsigned int j = 1; j <= r; ++j) { int L = span - degree + j; - for (int i = 0; i <= degree - j - s; ++i) + for (unsigned int i = 0; i <= degree - j - s; ++i) { T a = alpha(i, j); tmp[i] = (1 - a) * tmp[i] + a * tmp[i + 1]; @@ -239,7 +239,7 @@ void surfaceKnotInsert(unsigned int degree, const std::vector &knots, new_cp(row, span + r - j - s) = tmp[degree - j - s]; } int L = span - degree + r; - for (int i = L + 1; i < span - s; ++i) + for (unsigned int i = L + 1; i < span - s; ++i) { new_cp(row, i) = tmp[i - L]; } @@ -284,7 +284,7 @@ void curveSplit(unsigned int degree, const std::vector &knots, } left_knots.push_back(u); - for (int i = 0; i < degree + 1; ++i) + for (unsigned int i = 0; i < degree + 1; ++i) { right_knots.push_back(u); } @@ -340,7 +340,7 @@ void surfaceSplit(unsigned int degree, const std::vector &knots, } left_knots.push_back(param); - for (int i = 0; i < degree + 1; ++i) + for (unsigned int i = 0; i < degree + 1; ++i) { right_knots.push_back(param); } @@ -354,7 +354,7 @@ void surfaceSplit(unsigned int degree, const std::vector &knots, { size_t ii = 0; left_control_points.resize(ks + r, tmp_cp.cols()); - for (int i = 0; i < ks + r; ++i) + for (unsigned int i = 0; i < ks + r; ++i) { for (int j = 0; j < tmp_cp.cols(); ++j) { @@ -377,7 +377,7 @@ void surfaceSplit(unsigned int degree, const std::vector &knots, left_control_points.resize(tmp_cp.rows(), ks + r); for (int i = 0; i < tmp_cp.rows(); ++i) { - for (int j = 0; j < ks + r; ++j) + for (unsigned int j = 0; j < ks + r; ++j) { left_control_points[ii++] = tmp_cp(i, j); }