Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-09-25 11:30:50 +0300
committerCampbell Barton <campbell@blender.org>2022-09-25 11:31:10 +0300
commitc7b247a118e302a3afc6473797e53b6af28b69e2 (patch)
treed11149a165bfd8f3b3b791f24547499f041b133b /source/blender/blenlib/tests
parent891949cbb47143420f4324cb60efc05ef5d70b39 (diff)
Cleanup: replace static_casts with functional casts for numeric types
Diffstat (limited to 'source/blender/blenlib/tests')
-rw-r--r--source/blender/blenlib/tests/BLI_delaunay_2d_test.cc18
-rw-r--r--source/blender/blenlib/tests/BLI_mesh_intersect_test.cc2
-rw-r--r--source/blender/blenlib/tests/BLI_span_test.cc2
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
index 25ee523ebc0..adcfe7f5d2d 100644
--- a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
+++ b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
@@ -99,7 +99,7 @@ template<typename T> CDT_input<T> fill_input_from_string(const char *spec)
*/
static int get_orig_index(const Array<Vector<int>> &out_to_orig, int orig_index)
{
- int n = static_cast<int>(out_to_orig.size());
+ int n = int(out_to_orig.size());
for (int i = 0; i < n; ++i) {
for (int orig : out_to_orig[i]) {
if (orig == orig_index) {
@@ -147,7 +147,7 @@ template<> double math_abs(const double v)
*/
template<typename T> int get_vertex_by_coord(const CDT_result<T> &out, double x, double y)
{
- int nv = static_cast<int>(out.vert.size());
+ int nv = int(out.vert.size());
for (int i = 0; i < nv; ++i) {
double vx = math_to_double(out.vert[i][0]);
double vy = math_to_double(out.vert[i][1]);
@@ -162,7 +162,7 @@ template<typename T> int get_vertex_by_coord(const CDT_result<T> &out, double x,
template<typename T>
int get_output_edge_index(const CDT_result<T> &out, int out_index_1, int out_index_2)
{
- int ne = static_cast<int>(out.edge.size());
+ int ne = int(out.edge.size());
for (int i = 0; i < ne; ++i) {
if ((out.edge[i].first == out_index_1 && out.edge[i].second == out_index_2) ||
(out.edge[i].first == out_index_2 && out.edge[i].second == out_index_1)) {
@@ -175,7 +175,7 @@ int get_output_edge_index(const CDT_result<T> &out, int out_index_1, int out_ind
template<typename T>
bool output_edge_has_input_id(const CDT_result<T> &out, int out_edge_index, int in_edge_index)
{
- return out_edge_index < static_cast<int>(out.edge_orig.size()) &&
+ return out_edge_index < int(out.edge_orig.size()) &&
out.edge_orig[out_edge_index].contains(in_edge_index);
}
@@ -184,8 +184,8 @@ bool output_edge_has_input_id(const CDT_result<T> &out, int out_edge_index, int
*/
template<typename T> int get_output_face_index(const CDT_result<T> &out, const Array<int> &poly)
{
- int nf = static_cast<int>(out.face.size());
- int npolyv = static_cast<int>(poly.size());
+ int nf = int(out.face.size());
+ int npolyv = int(poly.size());
for (int f = 0; f < nf; ++f) {
if (out.face[f].size() != poly.size()) {
continue;
@@ -218,7 +218,7 @@ int get_output_tri_index(const CDT_result<T> &out,
template<typename T>
bool output_face_has_input_id(const CDT_result<T> &out, int out_face_index, int in_face_index)
{
- return out_face_index < static_cast<int>(out.face_orig.size()) &&
+ return out_face_index < int(out.face_orig.size()) &&
out.face_orig[out_face_index].contains(in_face_index);
}
@@ -310,10 +310,10 @@ void graph_draw(const std::string &label,
double height = maxy - miny;
double aspect = height / width;
int view_width = max_draw_width;
- int view_height = static_cast<int>(view_width * aspect);
+ int view_height = int(view_width * aspect);
if (view_height > max_draw_height) {
view_height = max_draw_height;
- view_width = static_cast<int>(view_height / aspect);
+ view_width = int(view_height / aspect);
}
double scale = view_width / width;
diff --git a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
index c155068b94a..67a5771593a 100644
--- a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
+++ b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
@@ -153,7 +153,7 @@ static int find_edge_pos_in_tri(const Vert *v0, const Vert *v1, const Face *f)
for (int pos : f->index_range()) {
int nextpos = f->next_pos(pos);
if (((*f)[pos] == v0 && (*f)[nextpos] == v1) || ((*f)[pos] == v1 && (*f)[nextpos] == v0)) {
- return static_cast<int>(pos);
+ return int(pos);
}
}
return -1;
diff --git a/source/blender/blenlib/tests/BLI_span_test.cc b/source/blender/blenlib/tests/BLI_span_test.cc
index 0bd34250deb..0d974786a1a 100644
--- a/source/blender/blenlib/tests/BLI_span_test.cc
+++ b/source/blender/blenlib/tests/BLI_span_test.cc
@@ -237,7 +237,7 @@ TEST(span, SizeInBytes)
{
std::array<int, 10> a{};
Span<int> a_span(a);
- EXPECT_EQ(a_span.size_in_bytes(), static_cast<int64_t>(sizeof(a)));
+ EXPECT_EQ(a_span.size_in_bytes(), int64_t(sizeof(a)));
EXPECT_EQ(a_span.size_in_bytes(), 40);
}