diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-05-06 07:18:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-06 07:19:08 +0300 |
commit | 89120cd2417e2f6f39fa63ae18300bba0aefcfbd (patch) | |
tree | 27b5334e31b337036719a2d965bde2e7e65f11a5 /source/blender/bmesh/tools/bmesh_region_match.c | |
parent | b85f7e288e74a701844ef10b2c3090e013ef46a1 (diff) |
bmesh: use 'uint' instead of 'unsigned int'
no functional changes.
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_region_match.c')
-rw-r--r-- | source/blender/bmesh/tools/bmesh_region_match.c | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c index a6860a6614a..2abf8f2c46e 100644 --- a/source/blender/bmesh/tools/bmesh_region_match.c +++ b/source/blender/bmesh/tools/bmesh_region_match.c @@ -114,7 +114,7 @@ typedef struct UUIDWalk { GHash *faces_from_uuid; /* UUID -> UUIDFaceStepItem */ UUID_Int *rehash_store; - unsigned int rehash_store_len; + uint rehash_store_len; } cache; } UUIDWalk; @@ -136,7 +136,7 @@ typedef struct UUIDFaceStepItem { uintptr_t uuid; LinkNode *list; - unsigned int list_len; + uint list_len; } UUIDFaceStepItem; BLI_INLINE bool bm_uuidwalk_face_test( @@ -178,10 +178,10 @@ BLI_INLINE bool bm_uuidwalk_face_lookup( } } -static unsigned int ghashutil_bmelem_indexhash(const void *key) +static uint ghashutil_bmelem_indexhash(const void *key) { const BMElem *ele = key; - return (unsigned int)BM_elem_index_get(ele); + return (uint)BM_elem_index_get(ele); } static bool ghashutil_bmelem_indexcmp(const void *a, const void *b) @@ -192,14 +192,14 @@ static bool ghashutil_bmelem_indexcmp(const void *a, const void *b) static GHash *ghash_bmelem_new_ex( const char *info, - const unsigned int nentries_reserve) + const uint nentries_reserve) { return BLI_ghash_new_ex(ghashutil_bmelem_indexhash, ghashutil_bmelem_indexcmp, info, nentries_reserve); } static GSet *gset_bmelem_new_ex( const char *info, - const unsigned int nentries_reserve) + const uint nentries_reserve) { return BLI_gset_new_ex(ghashutil_bmelem_indexhash, ghashutil_bmelem_indexcmp, info, nentries_reserve); } @@ -218,8 +218,8 @@ static GSet *gset_bmelem_new(const char *info) static void bm_uuidwalk_init( UUIDWalk *uuidwalk, - const unsigned int faces_src_region_len, - const unsigned int verts_src_region_len) + const uint faces_src_region_len, + const uint verts_src_region_len) { BLI_listbase_clear(&uuidwalk->faces_step); @@ -307,7 +307,7 @@ static UUID_Int bm_uuidwalk_calc_vert_uuid( /* vert -> other */ { - unsigned int tot = 0; + uint tot = 0; BMIter eiter; BMEdge *e; BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) { @@ -323,7 +323,7 @@ static UUID_Int bm_uuidwalk_calc_vert_uuid( /* faces */ { - unsigned int tot = 0; + uint tot = 0; BMIter iter; BMFace *f; @@ -357,7 +357,7 @@ static UUID_Int bm_uuidwalk_calc_face_uuid( UUID_Int uuid; - uuid = uuidwalk->pass * (unsigned int)f->len * PRIME_FACE_LARGE; + uuid = uuidwalk->pass * (uint)f->len * PRIME_FACE_LARGE; /* face-verts */ { @@ -399,7 +399,7 @@ static UUID_Int bm_uuidwalk_calc_face_uuid( } static void bm_uuidwalk_rehash_reserve( - UUIDWalk *uuidwalk, unsigned int rehash_store_len_new) + UUIDWalk *uuidwalk, uint rehash_store_len_new) { if (UNLIKELY(rehash_store_len_new > uuidwalk->cache.rehash_store_len)) { /* avoid re-allocs */ @@ -419,9 +419,9 @@ static void bm_uuidwalk_rehash( { GHashIterator gh_iter; UUID_Int *uuid_store; - unsigned int i; + uint i; - unsigned int rehash_store_len_new = MAX2(BLI_ghash_size(uuidwalk->verts_uuid), + uint rehash_store_len_new = MAX2(BLI_ghash_size(uuidwalk->verts_uuid), BLI_ghash_size(uuidwalk->faces_uuid)); bm_uuidwalk_rehash_reserve(uuidwalk, rehash_store_len_new); @@ -454,12 +454,12 @@ static void bm_uuidwalk_rehash( static void bm_uuidwalk_rehash_facelinks( UUIDWalk *uuidwalk, - LinkNode *faces, const unsigned int faces_len, + LinkNode *faces, const uint faces_len, const bool is_init) { UUID_Int *uuid_store; LinkNode *f_link; - unsigned int i; + uint i; bm_uuidwalk_rehash_reserve(uuidwalk, faces_len); uuid_store = uuidwalk->cache.rehash_store; @@ -502,7 +502,7 @@ static bool bm_vert_is_uuid_connect( } static void bm_uuidwalk_pass_add( - UUIDWalk *uuidwalk, LinkNode *faces_pass, const unsigned int faces_pass_len) + UUIDWalk *uuidwalk, LinkNode *faces_pass, const uint faces_pass_len) { GHashIterator gh_iter; GHash *verts_uuid_pass; @@ -511,7 +511,7 @@ static void bm_uuidwalk_pass_add( UUIDFaceStep *fstep; - BLI_assert(faces_pass_len == (unsigned int)BLI_linklist_count(faces_pass)); + BLI_assert(faces_pass_len == (uint)BLI_linklist_count(faces_pass)); /* rehash faces now all their verts have been added */ bm_uuidwalk_rehash_facelinks(uuidwalk, faces_pass, faces_pass_len, true); @@ -588,13 +588,13 @@ static int bm_face_len_cmp(const void *v1, const void *v2) else return 0; } -static unsigned int bm_uuidwalk_init_from_edge( +static uint bm_uuidwalk_init_from_edge( UUIDWalk *uuidwalk, BMEdge *e) { BMLoop *l_iter = e->l; - unsigned int f_arr_len = (unsigned int)BM_edge_face_count(e); + uint f_arr_len = (uint)BM_edge_face_count(e); BMFace **f_arr = BLI_array_alloca(f_arr, f_arr_len); - unsigned int fstep_num = 0, i = 0; + uint fstep_num = 0, i = 0; do { BMFace *f = l_iter->f; @@ -619,7 +619,7 @@ static unsigned int bm_uuidwalk_init_from_edge( * elsewhere using LinkNode's makes more sense */ for (i = 0; i < f_arr_len; ) { LinkNode *faces_pass = NULL; - const unsigned int i_init = i; + const uint i_init = i; const int f_len = f_arr[i]->len; do { @@ -750,9 +750,9 @@ static BMFace **bm_mesh_region_match_pair( UUIDWalk *w_src, UUIDWalk *w_dst, #endif BMEdge *e_src, BMEdge *e_dst, - const unsigned int faces_src_region_len, - const unsigned int verts_src_region_len, - unsigned int *r_faces_result_len) + const uint faces_src_region_len, + const uint verts_src_region_len, + uint *r_faces_result_len) { #ifndef USE_WALKER_REUSE UUIDWalk w_src_, w_dst_; @@ -877,8 +877,8 @@ static BMFace **bm_mesh_region_match_pair( if (found) { GHashIterator gh_iter; - const unsigned int faces_result_len = BLI_ghash_size(w_dst->faces_uuid); - unsigned int i; + const uint faces_result_len = BLI_ghash_size(w_dst->faces_uuid); + uint i; faces_result = MEM_mallocN(sizeof(*faces_result) * (faces_result_len + 1), __func__); GHASH_ITER_INDEX (gh_iter, w_dst->faces_uuid, i) { @@ -909,12 +909,12 @@ finally: * Tag as visited, avoid re-use. */ static void bm_face_array_visit( - BMFace **faces, const unsigned int faces_len, - unsigned int *r_verts_len, + BMFace **faces, const uint faces_len, + uint *r_verts_len, bool visit_faces) { - unsigned int verts_len = 0; - unsigned int i; + uint verts_len = 0; + uint i; for (i = 0; i < faces_len; i++) { BMFace *f = faces[i]; BMLoop *l_iter, *l_first; @@ -1081,9 +1081,9 @@ static SUID_Int bm_face_region_vert_pass_id(GHash *gh, BMVert *v) * This is only called once on the source region (no need to be highly optimized). */ static BMEdge *bm_face_region_pivot_edge_find( - BMFace **faces_region, unsigned int faces_region_len, - unsigned int verts_region_len, - unsigned int *r_depth) + BMFace **faces_region, uint faces_region_len, + uint verts_region_len, + uint *r_depth) { /* note, keep deterministic where possible (geometry order independent) * this function assumed all visit faces & edges are tagged */ @@ -1092,7 +1092,7 @@ static BMEdge *bm_face_region_pivot_edge_find( BLI_LINKSTACK_DECLARE(vert_queue_next, BMVert *); GHash *gh = BLI_ghash_ptr_new(__func__); - unsigned int i; + uint i; BMEdge *e_pivot = NULL; /* pick any non-boundary edge (not ideal) */ @@ -1101,7 +1101,7 @@ static BMEdge *bm_face_region_pivot_edge_find( SUID_Int pass = 0; /* total verts in 'gs' we have visited - aka - not v_init_none */ - unsigned int vert_queue_used = 0; + uint vert_queue_used = 0; BLI_LINKSTACK_INIT(vert_queue_prev); BLI_LINKSTACK_INIT(vert_queue_next); @@ -1115,7 +1115,7 @@ static BMEdge *bm_face_region_pivot_edge_find( do { BMEdge *e = l_iter->e; if (bm_edge_is_region_boundary(e)) { - unsigned int j; + uint j; for (j = 0; j < 2; j++) { void **val_p; if (!BLI_ghash_ensure_p(gh, (&e->v1)[j], &val_p)) { @@ -1251,7 +1251,7 @@ static BMEdge *bm_face_region_pivot_edge_find( pass = 0; } - *r_depth = (unsigned int)pass; + *r_depth = (uint)pass; return e_pivot; } @@ -1286,7 +1286,7 @@ static UUIDFashMatch bm_vert_fasthash_single(BMVert *v) e_num += 1; do { f_num += 1; - l_num += (unsigned int)l_iter->f->len; + l_num += (uint)l_iter->f->len; } while ((l_iter = l_iter->radial_next) != e->l); } } @@ -1301,16 +1301,16 @@ static UUIDFashMatch bm_vert_fasthash_single(BMVert *v) } static UUIDFashMatch *bm_vert_fasthash_create( - BMesh *bm, const unsigned int depth) + BMesh *bm, const uint depth) { UUIDFashMatch *id_prev; UUIDFashMatch *id_curr; - unsigned int pass, i; + uint pass, i; BMVert *v; BMIter iter; - id_prev = MEM_mallocN(sizeof(*id_prev) * (unsigned int)bm->totvert, __func__); - id_curr = MEM_mallocN(sizeof(*id_curr) * (unsigned int)bm->totvert, __func__); + id_prev = MEM_mallocN(sizeof(*id_prev) * (uint)bm->totvert, __func__); + id_curr = MEM_mallocN(sizeof(*id_curr) * (uint)bm->totvert, __func__); BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) { id_prev[i] = bm_vert_fasthash_single(v); @@ -1319,7 +1319,7 @@ static UUIDFashMatch *bm_vert_fasthash_create( for (pass = 0; pass < depth; pass++) { BMEdge *e; - memcpy(id_curr, id_prev, sizeof(*id_prev) * (unsigned int)bm->totvert); + memcpy(id_curr, id_prev, sizeof(*id_prev) * (uint)bm->totvert); BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { if (BM_edge_is_wire(e) == false) { @@ -1379,16 +1379,16 @@ static void bm_vert_fasthash_destroy( */ int BM_mesh_region_match( BMesh *bm, - BMFace **faces_region, unsigned int faces_region_len, + BMFace **faces_region, uint faces_region_len, ListBase *r_face_regions) { BMEdge *e_src; BMEdge *e_dst; BMIter iter; - unsigned int verts_region_len = 0; - unsigned int faces_result_len = 0; + uint verts_region_len = 0; + uint faces_result_len = 0; /* number of steps from e_src to a boundary vert */ - unsigned int depth; + uint depth; #ifdef USE_WALKER_REUSE @@ -1457,7 +1457,7 @@ int BM_mesh_region_match( BM_ITER_MESH (e_dst, &iter, bm, BM_EDGES_OF_MESH) { BMFace **faces_result; - unsigned int faces_result_len_out; + uint faces_result_len_out; if (BM_elem_flag_test(e_dst, BM_ELEM_TAG) || BM_edge_is_wire(e_dst)) { continue; |