[Bf-blender-cvs] [a0dc0628168] master: Cleanup: use function style casts for integer types in C++
Campbell Barton
noreply at git.blender.org
Thu Dec 8 04:01:16 CET 2022
Commit: a0dc06281682df77cf41844abe9050197382f5c8
Author: Campbell Barton
Date: Thu Dec 8 13:04:50 2022 +1100
Branches: master
https://developer.blender.org/rBa0dc06281682df77cf41844abe9050197382f5c8
Cleanup: use function style casts for integer types in C++
===================================================================
M source/blender/blenkernel/intern/cloth.cc
M source/blender/blenkernel/intern/data_transfer.cc
M source/blender/blenkernel/intern/key.cc
M source/blender/blenkernel/intern/material.cc
M source/blender/blenkernel/intern/mesh_mirror.cc
M source/blender/blenkernel/intern/mesh_remap.cc
M source/blender/blenkernel/intern/texture.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_outline.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/eyedroppers/eyedropper_depth.cc
M source/blender/editors/interface/interface_align.cc
M source/blender/editors/interface/interface_draw.cc
M source/blender/editors/interface/interface_handlers.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/sculpt_paint/paint_cursor.cc
M source/blender/editors/sculpt_paint/paint_image_proj.cc
M source/blender/editors/sculpt_paint/sculpt.cc
M source/blender/editors/transform/transform_snap.cc
M source/blender/editors/transform/transform_snap_object.cc
M source/blender/editors/uvedit/uvedit_clipboard_graph_iso.cc
M source/blender/editors/uvedit/uvedit_islands.cc
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
M source/blender/modifiers/intern/MOD_displace.cc
M source/blender/nodes/intern/node_util.cc
M source/blender/nodes/texture/nodes/node_texture_bricks.cc
M source/blender/nodes/texture/nodes/node_texture_rotate.cc
M source/blender/render/intern/bake.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 120e69b4e64..ecd21dcb570 100644
--- a/source/blender/blenkernel/intern/cloth.cc
+++ b/source/blender/blenkernel/intern/cloth.cc
@@ -1186,7 +1186,7 @@ static void cloth_update_spring_lengths(ClothModifierData *clmd, Mesh *mesh)
LinkNode *search = cloth->springs;
uint struct_springs = 0;
uint i = 0;
- uint mvert_num = (uint)mesh->totvert;
+ uint mvert_num = uint(mesh->totvert);
float shrink_factor;
clmd->sim_parms->avg_spring_len = 0.0f;
@@ -1461,7 +1461,7 @@ static bool cloth_build_springs(ClothModifierData *clmd, Mesh *mesh)
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 numedges = (uint)mesh->totedge;
+ uint numedges = uint(mesh->totedge);
uint numpolys = (uint)mesh->totpoly;
float shrink_factor;
const MEdge *medge = BKE_mesh_edges(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/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc
index 0e2fa029a77..382736ae502 100644
--- a/source/blender/blenkernel/intern/data_transfer.cc
+++ b/source/blender/blenkernel/intern/data_transfer.cc
@@ -585,8 +585,8 @@ static bool data_transfer_layersmapping_cdlayers_multisrc_to_dst(ListBase *r_map
if (use_delete) {
if (tot_dst) {
data_dst_to_delete = static_cast<bool *>(
- MEM_mallocN(sizeof(*data_dst_to_delete) * (size_t)tot_dst, __func__));
- memset(data_dst_to_delete, true, sizeof(*data_dst_to_delete) * (size_t)tot_dst);
+ MEM_mallocN(sizeof(*data_dst_to_delete) * size_t(tot_dst), __func__));
+ memset(data_dst_to_delete, true, sizeof(*data_dst_to_delete) * size_t(tot_dst));
}
}
@@ -824,7 +824,7 @@ static bool data_transfer_layersmapping_cdlayers(ListBase *r_map,
else if (fromlayers == DT_LAYERS_ALL_SRC) {
int num_src = CustomData_number_of_layers(cd_src, cddata_type);
bool *use_layers_src = num_src ? static_cast<bool *>(MEM_mallocN(
- sizeof(*use_layers_src) * (size_t)num_src, __func__)) :
+ sizeof(*use_layers_src) * size_t(num_src), __func__)) :
nullptr;
bool ret;
@@ -1392,7 +1392,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
if (mdef && vg_idx != -1 && !weights[VDATA]) {
weights[VDATA] = static_cast<float *>(
- MEM_mallocN(sizeof(*(weights[VDATA])) * (size_t)num_verts_dst, __func__));
+ MEM_mallocN(sizeof(*(weights[VDATA])) * size_t(num_verts_dst), __func__));
BKE_defvert_extract_vgroup_to_vertweights(
mdef, vg_idx, num_verts_dst, invert_vgroup, weights[VDATA]);
}
@@ -1473,7 +1473,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
if (mdef && vg_idx != -1 && !weights[EDATA]) {
weights[EDATA] = static_cast<float *>(
- MEM_mallocN(sizeof(*weights[EDATA]) * (size_t)num_edges_dst, __func__));
+ MEM_mallocN(sizeof(*weights[EDATA]) * size_t(num_edges_dst), __func__));
BKE_defvert_extract_vgroup_to_edgeweights(
mdef, vg_idx, num_verts_dst, edges_dst, num_edges_dst, invert_vgroup, weights[EDATA]);
}
@@ -1570,7 +1570,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
if (mdef && vg_idx != -1 && !weights[LDATA]) {
weights[LDATA] = static_cast<float *>(
- MEM_mallocN(sizeof(*weights[LDATA]) * (size_t)num_loops_dst, __func__));
+ MEM_mallocN(sizeof(*weights[LDATA]) * size_t(num_loops_dst), __func__));
BKE_defvert_extract_vgroup_to_loopweights(
mdef, vg_idx, num_verts_dst, loops_dst, num_loops_dst, invert_vgroup, weights[LDATA]);
}
@@ -1652,7 +1652,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
if (mdef && vg_idx != -1 && !weights[PDATA]) {
weights[PDATA] = static_cast<float *>(
- MEM_mallocN(sizeof(*weights[PDATA]) * (size_t)num_polys_dst, __func__));
+ MEM_mallocN(sizeof(*weights[PDATA]) * size_t(num_polys_dst), __func__));
BKE_defvert_extract_vgroup_to_polyweights(mdef,
vg_idx,
num_verts_dst,
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index 37b2d14133c..d3eb56d1563 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -718,7 +718,7 @@ static void cp_key(const int start,
ktot = 0.0;
flagflo = 1;
if (kb->totelem) {
- kd = kb->totelem / (float)tot;
+ kd = kb->totelem / float(tot);
}
else {
return;
@@ -1036,7 +1036,7 @@ static void do_key(const int start,
k1tot = 0.0;
flagflo |= 1;
if (k[0]->totelem) {
- k1d = k[0]->totelem / (float)tot;
+ k1d = k[0]->totelem / float(tot);
}
else {
flagdo -= 1;
@@ -1046,7 +1046,7 @@ static void do_key(const int start,
k2tot = 0.0;
flagflo |= 2;
if (k[0]->totelem) {
- k2d = k[1]->totelem / (float)tot;
+ k2d = k[1]->totelem / float(tot);
}
else {
flagdo -= 2;
@@ -1056,7 +1056,7 @@ static void do_key(const int start,
k3tot = 0.0;
flagflo |= 4;
if (k[0]->totelem) {
- k3d = k[2]->totelem / (float)tot;
+ k3d = k[2]->totelem / float(tot);
}
else {
flagdo -= 4;
@@ -1066,7 +1066,7 @@ static void do_key(const int start,
k4tot = 0.0;
flagflo |= 8;
if (k[0]->totelem) {
- k4d = k[3]->totelem / (float)tot;
+ k4d = k[3]->totelem / float(tot);
}
else {
flagdo -= 8;
@@ -2217,7 +2217,7 @@ void BKE_keyblock_convert_from_mesh(const Mesh *me, const Key *key, KeyBlock *kb
MEM_SAFE_FREE(kb->data);
- kb->data = MEM_malloc_arrayN((size_t)len, (size_t)key->elemsize, __func__);
+ kb->data = MEM_malloc_arrayN(size_t(len), size_t(key->elemsize), __func__);
kb->totelem = len;
BKE_keyblock_update_from_mesh(me, kb);
diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc
index bcce1e61eb5..51e61dbebad 100644
--- a/source/blender/blenkernel/intern/material.cc
+++ b/source/blender/blenkernel/intern/material.cc
@@ -588,7 +588,7 @@ void BKE_id_material_append(Main *bmain, ID *id, Material *ma)
Material *BKE_id_material_pop(Main *bmain, ID *id, int index_i)
{
- short index = (short)index_i;
+ short index = short(index_i);
Material *ret = nullptr;
Material ***matar;
if ((matar = BKE_id_material_array_p(id))) {
@@ -878,7 +878,7 @@ void BKE_object_materials_test(Main *bmain, Object *ob, ID *id)
* use object's material slots amount as reference.
* This avoids losing materials in a local object when its linked obdata goes missing.
* See T92780. */
- BKE_id_material_resize(bmain, id, (short)ob->totcol, false);
+ BKE_id_material_resize(bmain, id, short(ob->totcol), false);
}
else {
/* Normal case: the use the obdata amount of materials slots to update the object's one. */
diff --git a/source/blender/blenkernel/intern/mesh_mirror.cc b/source/blender/blenkernel/intern/mesh_mirror.cc
index bbbbda738be..8830139a697 100644
--- a/source/blender/blenkernel/intern/mesh_mirror.cc
+++ b/source/blender/blenkernel/intern/mesh_mirror.cc
@@ -391,7 +391,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd,
const int totloop = result->totloop;
const int totpoly = result->totpoly;
float(*loop_normals)[3] = static_cast<float(*)[3]>(
- MEM_calloc_arrayN((size_t)totloop, sizeof(*loop_normals), __func__));
+ MEM_calloc_arrayN(size_t(totloop), sizeof(*loop_normals), __func__));
CustomData *ldata = &result->ldata;
short(*clnors)[2] = static_cast<short(*)[2]>(CustomData_get_layer(ldata, CD_CUSTOMLOOPNORMAL));
MLoopNorSpaceArray lnors_spacearr = {nullptr};
diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc
index 078d2e87aff..142968de666 100644
--- a/source/blender/blenkernel/intern/mesh_remap.cc
+++ b/source/blender/blenkernel/intern/mesh_remap.cc
@@ -180,7 +180,7 @@ static void mesh_calc_eigen_matrix(const MVert *verts,
const MVert *mv;
float(*co)[3];
- cos = static_cast<float(*)[3]>(MEM_mallocN(sizeof(*cos) * (size_t)numverts, __func__));
+ cos = static_cast<float(*)[3]>(MEM_mallocN(sizeof(*cos) * size_t(numverts), __func__));
for (i = 0, co = cos, mv = verts; i < numverts; i++, co++, mv++) {
copy_v3_v3(*co, mv->co);
}
@@ -325,7 +325,7 @@ void BKE_mesh_remap_init(MeshPairRemap *map, const int items_num)
BKE_mesh_remap_free(map);
map->items = static_cast<MeshPairRemapItem *>(
- BLI_memarena_alloc(mem, sizeof(*map->items) * (size_t)items_num));
+ BLI_memarena_alloc(mem, sizeof(*map->items) * size_t(items_num)));
map->items_num = items_num;
map->mem = mem;
@@ -356,11 +356,11 @@ static void mesh_remap_item_define(MeshPairRemap *map,
if (sources_num) {
mapit->sources_num = sources_num;
mapit->indices_src = static_cast<int *>(
- BLI_memarena_alloc(mem, sizeof(*mapit->indices_src) * (size_t)sources_num));
- memcpy(mapit->indices_src, indices_src, sizeof(*mapit->indices_src) * (size_t)sources_num);
+ BLI_memarena_alloc(mem, sizeof(*mapit->indices_src) * size_t(sources_num)));
+ memcpy(mapit->indices_src, indices_src, sizeof(*mapit->indices_src) * size_t(sources_num));
mapit->weights_s
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list