[Bf-blender-cvs] [e39ca9d1e3c] master: Cleanup: use function style casts for integer types in C++
Campbell Barton
noreply at git.blender.org
Tue Jan 3 01:40:26 CET 2023
Commit: e39ca9d1e3c584a7ee1805a5d18332b6517384af
Author: Campbell Barton
Date: Tue Jan 3 11:04:16 2023 +1100
Branches: master
https://developer.blender.org/rBe39ca9d1e3c584a7ee1805a5d18332b6517384af
Cleanup: use function style casts for integer types in C++
Also remove redundant parenthesis.
===================================================================
M source/blender/blenkernel/intern/cloth.cc
M source/blender/blenkernel/intern/key.cc
M source/blender/blenkernel/intern/layer.cc
M source/blender/blenkernel/intern/mesh_remap.cc
M source/blender/blenloader/intern/versioning_300.cc
M source/blender/bmesh/intern/bmesh_mesh_normals.cc
M source/blender/draw/engines/overlay/overlay_engine.cc
M source/blender/draw/intern/draw_cache_impl_gpencil.cc
M source/blender/editors/interface/eyedroppers/eyedropper_color.cc
M source/blender/editors/interface/interface_draw.cc
M source/blender/editors/interface/interface_icons.cc
M source/blender/editors/interface/interface_layout.cc
M source/blender/editors/interface/interface_templates.cc
M source/blender/editors/interface/interface_widgets.cc
M source/blender/editors/interface/resources.cc
M source/blender/editors/sculpt_paint/paint_cursor.cc
M source/blender/editors/sculpt_paint/paint_image_proj.cc
M source/blender/editors/space_node/add_node_search.cc
M source/blender/editors/uvedit/uvedit_islands.cc
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
M source/blender/gpu/opengl/gl_texture.cc
M source/blender/io/alembic/intern/abc_customdata.cc
M source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
M source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
M source/blender/modifiers/intern/MOD_array.cc
M source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
M source/blender/nodes/texture/nodes/node_texture_bricks.cc
M source/blender/nodes/texture/nodes/node_texture_checker.cc
M source/blender/nodes/texture/nodes/node_texture_curves.cc
M source/blender/nodes/texture/nodes/node_texture_image.cc
M source/blender/nodes/texture/nodes/node_texture_math.cc
M source/blender/render/intern/multires_bake.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/cloth.cc b/source/blender/blenkernel/intern/cloth.cc
index 23bbaaf58b2..4f28bf5157c 100644
--- a/source/blender/blenkernel/intern/cloth.cc
+++ b/source/blender/blenkernel/intern/cloth.cc
@@ -1460,9 +1460,9 @@ static bool cloth_build_springs(ClothModifierData *clmd, Mesh *mesh)
Cloth *cloth = clmd->clothObject;
ClothSpring *spring = nullptr, *tspring = nullptr, *tspring2 = nullptr;
uint struct_springs = 0, shear_springs = 0, bend_springs = 0, struct_springs_real = 0;
- uint mvert_num = (uint)mesh->totvert;
+ uint mvert_num = uint(mesh->totvert);
uint numedges = uint(mesh->totedge);
- uint numpolys = (uint)mesh->totpoly;
+ uint numpolys = uint(mesh->totpoly);
float shrink_factor;
const MEdge *medge = BKE_mesh_edges(mesh);
const MPoly *mpoly = BKE_mesh_polys(mesh);
@@ -1647,7 +1647,7 @@ static bool cloth_build_springs(ClothModifierData *clmd, Mesh *mesh)
for (int i = 0; i < mvert_num; i++) {
if (cloth->verts[i].spring_count > 0) {
cloth->verts[i].avg_spring_len = cloth->verts[i].avg_spring_len * 0.49f /
- (float(cloth->verts[i].spring_count));
+ float(cloth->verts[i].spring_count);
}
}
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index e0af320ac48..b19ad6a3e97 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -732,7 +732,7 @@ static void cp_key(const int start,
if (flagflo) {
ktot += start * kd;
- a = (int)floor(ktot);
+ a = int(floor(ktot));
if (a) {
ktot -= a;
k1 += a * key->elemsize;
@@ -1078,7 +1078,7 @@ static void do_key(const int start,
if (flagdo & 1) {
if (flagflo & 1) {
k1tot += start * k1d;
- a = (int)floor(k1tot);
+ a = int(floor(k1tot));
if (a) {
k1tot -= a;
k1 += a * key->elemsize;
@@ -1091,7 +1091,7 @@ static void do_key(const int start,
if (flagdo & 2) {
if (flagflo & 2) {
k2tot += start * k2d;
- a = (int)floor(k2tot);
+ a = int(floor(k2tot));
if (a) {
k2tot -= a;
k2 += a * key->elemsize;
@@ -1104,7 +1104,7 @@ static void do_key(const int start,
if (flagdo & 4) {
if (flagflo & 4) {
k3tot += start * k3d;
- a = (int)floor(k3tot);
+ a = int(floor(k3tot));
if (a) {
k3tot -= a;
k3 += a * key->elemsize;
@@ -1117,7 +1117,7 @@ static void do_key(const int start,
if (flagdo & 8) {
if (flagflo & 8) {
k4tot += start * k4d;
- a = (int)floor(k4tot);
+ a = int(floor(k4tot));
if (a) {
k4tot -= a;
k4 += a * key->elemsize;
@@ -1661,7 +1661,7 @@ int BKE_keyblock_element_count(const Key *key)
size_t BKE_keyblock_element_calc_size_from_shape(const Key *key, const int shape_index)
{
- return (size_t)BKE_keyblock_element_count_from_shape(key, shape_index) * key->elemsize;
+ return size_t(BKE_keyblock_element_count_from_shape(key, shape_index)) * key->elemsize;
}
size_t BKE_keyblock_element_calc_size(const Key *key)
diff --git a/source/blender/blenkernel/intern/layer.cc b/source/blender/blenkernel/intern/layer.cc
index 198ad5b196f..95c341212d1 100644
--- a/source/blender/blenkernel/intern/layer.cc
+++ b/source/blender/blenkernel/intern/layer.cc
@@ -1057,7 +1057,7 @@ static void layer_collection_objects_sync(ViewLayer *view_layer,
}
/* Holdout and indirect only */
- if ((layer->flag & LAYER_COLLECTION_HOLDOUT)) {
+ if (layer->flag & LAYER_COLLECTION_HOLDOUT) {
base->flag_from_collection |= BASE_HOLDOUT;
}
if (layer->flag & LAYER_COLLECTION_INDIRECT_ONLY) {
diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc
index 142968de666..f66570bdcc7 100644
--- a/source/blender/blenkernel/intern/mesh_remap.cc
+++ b/source/blender/blenkernel/intern/mesh_remap.cc
@@ -1592,7 +1592,7 @@ void BKE_mesh_remap_calc_loops_from_mesh(const int mode,
}
}
- if ((size_t)mp_dst->totloop > islands_res_buff_size) {
+ if (size_t(mp_dst->totloop) > islands_res_buff_size) {
islands_res_buff_size = size_t(mp_dst->totloop) + MREMAP_DEFAULT_BUFSIZE;
for (tindex = 0; tindex < num_trees; tindex++) {
islands_res[tindex] = static_cast<IslandResult *>(
@@ -2257,7 +2257,7 @@ void BKE_mesh_remap_calc_polys_from_mesh(const int mode,
*/
RNG *rng = BLI_rng_new(0);
- const size_t numpolys_src = (size_t)me_src->totpoly;
+ const size_t numpolys_src = size_t(me_src->totpoly);
/* Here it's simpler to just allocate for all polys :/ */
int *indices = static_cast<int *>(MEM_mallocN(sizeof(*indices) * numpolys_src, __func__));
diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc
index 11392d04991..adc88a7caf5 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -3789,7 +3789,7 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
LISTBASE_FOREACH (MovieClip *, clip, &bmain->movieclips) {
MovieTracking *tracking = &clip->tracking;
- const float frame_center_x = (float(clip->lastsize[0])) / 2;
+ const float frame_center_x = float(clip->lastsize[0]) / 2;
const float frame_center_y = float(clip->lastsize[1]) / 2;
tracking->camera.principal_point[0] = (tracking->camera.principal_legacy[0] -
@@ -3828,8 +3828,8 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
- v3d->overlay.flag |= (int)(V3D_OVERLAY_SCULPT_SHOW_MASK |
- V3D_OVERLAY_SCULPT_SHOW_FACE_SETS);
+ v3d->overlay.flag |= int(V3D_OVERLAY_SCULPT_SHOW_MASK |
+ V3D_OVERLAY_SCULPT_SHOW_FACE_SETS);
}
}
}
diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.cc b/source/blender/bmesh/intern/bmesh_mesh_normals.cc
index 5d906e0a73f..41203f25b6b 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_normals.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_normals.cc
@@ -919,7 +919,7 @@ static void bm_mesh_loops_calc_normals_for_vert_with_clnors(BMesh *bm,
BLI_linklist_prepend_alloca(&loops_of_vert, l_curr);
loops_of_vert_count += 1;
- const uint index_test = (uint)BM_elem_index_get(l_curr);
+ const uint index_test = uint(BM_elem_index_get(l_curr));
if (index_best > index_test) {
index_best = index_test;
link_best = loops_of_vert;
diff --git a/source/blender/draw/engines/overlay/overlay_engine.cc b/source/blender/draw/engines/overlay/overlay_engine.cc
index 2eea0ad2f65..e8300e81f2f 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.cc
+++ b/source/blender/draw/engines/overlay/overlay_engine.cc
@@ -92,10 +92,10 @@ static void OVERLAY_engine_init(void *vedata)
}
if (ts->sculpt) {
- if (!(v3d->overlay.flag & (int)V3D_OVERLAY_SCULPT_SHOW_FACE_SETS)) {
+ if (!(v3d->overlay.flag & int(V3D_OVERLAY_SCULPT_SHOW_FACE_SETS))) {
pd->overlay.sculpt_mode_face_sets_opacity = 0.0f;
}
- if (!(v3d->overlay.flag & (int)V3D_OVERLAY_SCULPT_SHOW_MASK)) {
+ if (!(v3d->overlay.flag & int(V3D_OVERLAY_SCULPT_SHOW_MASK))) {
pd->overlay.sculpt_mode_mask_opacity = 0.0f;
}
}
diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.cc b/source/blender/draw/intern/draw_cache_impl_gpencil.cc
index 16e90994791..a877f43561a 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.cc
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.cc
@@ -276,7 +276,7 @@ BLI_INLINE int32_t pack_rotation_aspect_hardness(float rot, float asp, float har
int32_t packed = 0;
/* Aspect uses 9 bits */
float asp_normalized = (asp > 1.0f) ? (1.0f / asp) : asp;
- packed |= (int32_t)unit_float_to_uchar_clamp(asp_normalized);
+ packed |= int32_t(unit_float_to_uchar_clamp(asp_normalized));
/* Store if inversed in the 9th bit. */
if (asp > 1.0f) {
packed |= 1 << 8;
@@ -284,13 +284,13 @@ BLI_INLINE int32_t pack_rotation_aspect_hardness(float rot, float asp, float har
/* Rotation uses 9 bits */
/* Rotation are in [-90°..90°] range, so we can encode the sign of the angle + the cosine
* because the cosine will always be positive. */
- packed |= (int32_t)unit_float_to_uchar_clamp(cosf(rot)) << 9;
+ packed |= int32_t(unit_float_to_uchar_clamp(cosf(rot))) << 9;
/* Store sine sign in 9th bit. */
if (rot < 0.0f) {
packed |= 1 << 17;
}
/* Hardness uses 8 bits */
- packed |= (int32_t)unit_float_to_uchar_clamp(hard) << 18;
+ packed |= int32_t(unit_float_to_uchar_clamp(hard)) << 18;
return packed;
}
@@ -315,7 +315,7 @@ static void gpencil_buffer_add_point(GPUIndexBufBuilder *ibo,
/* Encode fill opacity defined by opacity modifier in vertex color alpha. If
* no opacity modifier, the value will be always 1.0f. The opacity factor can be any
* value between 0.0f and 2.0f */
- col->fcol[3] = ((int)(col->fcol[3] * 10000.0f) * 10.0f) + gps->fill_opacity_fac;
+ col->fcol[3] = (int(col->fcol[3] * 10000.0f) * 10.0f) + gps->fill_opacity_fac;
vert->strength = (round_cap0) ? pt->strength : -pt->strength;
vert->u_stroke = pt->uv_fac;
@@ -579,7 +579,7 @@ bGPDstroke *DRW_cache_gpencil_sbuffer_stroke_data_get(Object *ob)
gps->runtime.stroke_start = 0;
copy_v4_v4(gps->vert_color_fill, gpd->runtime.vert_color_fill);
/* Caps. */
- gps->caps[0] = gps->caps[1] = (short)brush->gpencil_settings->caps_type;
+ gps->caps[0] = gps->caps[1] = short(brush->gpencil_settings->caps_type);
gpd->runtime.sbuffer_gps = gps;
}
diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list