diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenlib/BLI_edgehash.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenlib/BLI_edgehash.h')
-rw-r--r-- | source/blender/blenlib/BLI_edgehash.h | 151 |
1 files changed, 91 insertions, 60 deletions
diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h index 7016f147616..66797ee113f 100644 --- a/source/blender/blenlib/BLI_edgehash.h +++ b/source/blender/blenlib/BLI_edgehash.h @@ -27,66 +27,87 @@ struct EdgeHash; typedef struct EdgeHash EdgeHash; struct _EdgeHash_Edge { - uint v_low, v_high; + uint v_low, v_high; }; struct _EdgeHash_Entry { - struct _EdgeHash_Edge edge; - void *value; + struct _EdgeHash_Edge edge; + void *value; }; typedef struct EdgeHashIterator { - struct _EdgeHash_Entry *entries; - uint length; - uint index; + struct _EdgeHash_Entry *entries; + uint length; + uint index; } EdgeHashIterator; typedef void (*EdgeHashFreeFP)(void *key); enum { - EDGEHASH_FLAG_ALLOW_DUPES = (1 << 0), /* only checked for in debug mode */ + EDGEHASH_FLAG_ALLOW_DUPES = (1 << 0), /* only checked for in debug mode */ }; -EdgeHash *BLI_edgehash_new_ex(const char *info, - const unsigned int nentries_reserve); -EdgeHash *BLI_edgehash_new(const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp); -void BLI_edgehash_print(EdgeHash *eh); -void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val); -bool BLI_edgehash_reinsert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val); -void *BLI_edgehash_lookup(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -void *BLI_edgehash_lookup_default(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val_default) ATTR_WARN_UNUSED_RESULT; -void **BLI_edgehash_lookup_p(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -bool BLI_edgehash_ensure_p(EdgeHash *eh, unsigned int v0, unsigned int v1, void ***r_val) ATTR_WARN_UNUSED_RESULT; -bool BLI_edgehash_remove(EdgeHash *eh, unsigned int v0, unsigned int v1, EdgeHashFreeFP valfreefp); - -void *BLI_edgehash_popkey(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -bool BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -int BLI_edgehash_len(EdgeHash *eh) ATTR_WARN_UNUSED_RESULT; -void BLI_edgehash_clear_ex(EdgeHash *eh, EdgeHashFreeFP valfreefp, - const unsigned int nentries_reserve); -void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp); - -EdgeHashIterator *BLI_edgehashIterator_new(EdgeHash *eh) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -void BLI_edgehashIterator_init(EdgeHashIterator *ehi, EdgeHash *eh); -void BLI_edgehashIterator_free(EdgeHashIterator *ehi); - -BLI_INLINE void BLI_edgehashIterator_step(EdgeHashIterator *ehi) -{ ehi->index++; } -BLI_INLINE bool BLI_edgehashIterator_isDone(EdgeHashIterator *ehi) -{ return ehi->index >= ehi->length; } -BLI_INLINE void BLI_edgehashIterator_getKey(EdgeHashIterator *ehi, unsigned int *r_v0, unsigned int *r_v1) -{ struct _EdgeHash_Edge edge = ehi->entries[ehi->index].edge; *r_v0 = edge.v_low; *r_v1 = edge.v_high; } -BLI_INLINE void *BLI_edgehashIterator_getValue(EdgeHashIterator *ehi) -{ return ehi->entries[ehi->index].value; } +EdgeHash *BLI_edgehash_new_ex(const char *info, const unsigned int nentries_reserve); +EdgeHash *BLI_edgehash_new(const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp); +void BLI_edgehash_print(EdgeHash *eh); +void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val); +bool BLI_edgehash_reinsert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val); +void *BLI_edgehash_lookup(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; +void *BLI_edgehash_lookup_default(EdgeHash *eh, + unsigned int v0, + unsigned int v1, + void *val_default) ATTR_WARN_UNUSED_RESULT; +void **BLI_edgehash_lookup_p(EdgeHash *eh, + unsigned int v0, + unsigned int v1) ATTR_WARN_UNUSED_RESULT; +bool BLI_edgehash_ensure_p(EdgeHash *eh, unsigned int v0, unsigned int v1, void ***r_val) + ATTR_WARN_UNUSED_RESULT; +bool BLI_edgehash_remove(EdgeHash *eh, unsigned int v0, unsigned int v1, EdgeHashFreeFP valfreefp); + +void *BLI_edgehash_popkey(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; +bool BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; +int BLI_edgehash_len(EdgeHash *eh) ATTR_WARN_UNUSED_RESULT; +void BLI_edgehash_clear_ex(EdgeHash *eh, + EdgeHashFreeFP valfreefp, + const unsigned int nentries_reserve); +void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp); + +EdgeHashIterator *BLI_edgehashIterator_new(EdgeHash *eh) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +void BLI_edgehashIterator_init(EdgeHashIterator *ehi, EdgeHash *eh); +void BLI_edgehashIterator_free(EdgeHashIterator *ehi); + +BLI_INLINE void BLI_edgehashIterator_step(EdgeHashIterator *ehi) +{ + ehi->index++; +} +BLI_INLINE bool BLI_edgehashIterator_isDone(EdgeHashIterator *ehi) +{ + return ehi->index >= ehi->length; +} +BLI_INLINE void BLI_edgehashIterator_getKey(EdgeHashIterator *ehi, + unsigned int *r_v0, + unsigned int *r_v1) +{ + struct _EdgeHash_Edge edge = ehi->entries[ehi->index].edge; + *r_v0 = edge.v_low; + *r_v1 = edge.v_high; +} +BLI_INLINE void *BLI_edgehashIterator_getValue(EdgeHashIterator *ehi) +{ + return ehi->entries[ehi->index].value; +} BLI_INLINE void **BLI_edgehashIterator_getValue_p(EdgeHashIterator *ehi) -{ return &ehi->entries[ehi->index].value; } -BLI_INLINE void BLI_edgehashIterator_setValue(EdgeHashIterator *ehi, void *val) -{ ehi->entries[ehi->index].value = val; } +{ + return &ehi->entries[ehi->index].value; +} +BLI_INLINE void BLI_edgehashIterator_setValue(EdgeHashIterator *ehi, void *val) +{ + ehi->entries[ehi->index].value = val; +} - -#define BLI_EDGEHASH_SIZE_GUESS_FROM_LOOPS(totloop) ((totloop) / 2) -#define BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(totpoly) ((totpoly) * 2) +#define BLI_EDGEHASH_SIZE_GUESS_FROM_LOOPS(totloop) ((totloop) / 2) +#define BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(totpoly) ((totpoly)*2) /* *** EdgeSet *** */ @@ -94,29 +115,39 @@ struct EdgeSet; typedef struct EdgeSet EdgeSet; typedef struct EdgeSetIterator { - struct _EdgeHash_Edge *edges; - uint length; - uint index; + struct _EdgeHash_Edge *edges; + uint length; + uint index; } EdgeSetIterator; -EdgeSet *BLI_edgeset_new_ex(const char *info, - const unsigned int nentries_reserve) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +EdgeSet *BLI_edgeset_new_ex(const char *info, const unsigned int nentries_reserve) + ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; EdgeSet *BLI_edgeset_new(const char *info) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -int BLI_edgeset_len(EdgeSet *es) ATTR_WARN_UNUSED_RESULT; -bool BLI_edgeset_add(EdgeSet *es, unsigned int v0, unsigned int v1); -void BLI_edgeset_insert(EdgeSet *es, unsigned int v0, unsigned int v1); -bool BLI_edgeset_haskey(EdgeSet *es, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; -void BLI_edgeset_free(EdgeSet *es); +int BLI_edgeset_len(EdgeSet *es) ATTR_WARN_UNUSED_RESULT; +bool BLI_edgeset_add(EdgeSet *es, unsigned int v0, unsigned int v1); +void BLI_edgeset_insert(EdgeSet *es, unsigned int v0, unsigned int v1); +bool BLI_edgeset_haskey(EdgeSet *es, unsigned int v0, unsigned int v1) ATTR_WARN_UNUSED_RESULT; +void BLI_edgeset_free(EdgeSet *es); /* rely on inline api for now */ EdgeSetIterator *BLI_edgesetIterator_new(EdgeSet *gs); void BLI_edgesetIterator_free(EdgeSetIterator *esi); -BLI_INLINE void BLI_edgesetIterator_getKey(EdgeSetIterator *esi, unsigned int *r_v0, unsigned int *r_v1) -{ struct _EdgeHash_Edge edge = esi->edges[esi->index]; *r_v0 = edge.v_low; *r_v1 = edge.v_high; } +BLI_INLINE void BLI_edgesetIterator_getKey(EdgeSetIterator *esi, + unsigned int *r_v0, + unsigned int *r_v1) +{ + struct _EdgeHash_Edge edge = esi->edges[esi->index]; + *r_v0 = edge.v_low; + *r_v1 = edge.v_high; +} BLI_INLINE void BLI_edgesetIterator_step(EdgeSetIterator *esi) -{ esi->index++; } +{ + esi->index++; +} BLI_INLINE bool BLI_edgesetIterator_isDone(EdgeSetIterator *esi) -{ return esi->index >= esi->length; } +{ + return esi->index >= esi->length; +} -#endif /* __BLI_EDGEHASH_H__ */ +#endif /* __BLI_EDGEHASH_H__ */ |