diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-23 14:51:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-23 14:52:33 +0300 |
| commit | b8a6cd0140cae6d4da1d17577f60dc7b854fdff1 (patch) | |
| tree | 0791fbe37027c9545870d624540dc422c9c05ca5 /source/blender/blenlib | |
| parent | c48ebb44ae15b1238a6d86e98fee6cd1ff0cba73 (diff) | |
Cleanup: comments, style
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 6 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/BLI_linklist.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/math_color_inline.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index cd86bb831f4..f2705c79574 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -298,14 +298,14 @@ static void ghash_buckets_contract( #ifdef GHASH_USE_MODULO_BUCKETS while ((nentries < gh->limit_shrink) && - (gh->cursize > gh->size_min)) + (gh->cursize > gh->size_min)) { new_nbuckets = hashsizes[--gh->cursize]; gh->limit_shrink = GHASH_LIMIT_SHRINK(new_nbuckets); } #else while ((nentries < gh->limit_shrink) && - (gh->bucket_bit > gh->bucket_bit_min)) + (gh->bucket_bit > gh->bucket_bit_min)) { new_nbuckets = 1u << --gh->bucket_bit; gh->limit_shrink = GHASH_LIMIT_SHRINK(new_nbuckets); @@ -525,7 +525,7 @@ static Entry *ghash_remove_ex( Entry *e_prev; Entry *e = ghash_lookup_entry_prev_ex(gh, key, &e_prev, bucket_index); - BLI_assert(!valfreefp|| !(gh->flag & GHASH_FLAG_IS_GSET)); + BLI_assert(!valfreefp || !(gh->flag & GHASH_FLAG_IS_GSET)); if (e) { if (keyfreefp) keyfreefp(e->key); diff --git a/source/blender/blenlib/intern/BLI_linklist.c b/source/blender/blenlib/intern/BLI_linklist.c index 391f3ef7702..f0efe49cfdb 100644 --- a/source/blender/blenlib/intern/BLI_linklist.c +++ b/source/blender/blenlib/intern/BLI_linklist.c @@ -230,7 +230,7 @@ void *BLI_linklist_pop(struct LinkNode **listp) void *link = (*listp)->link; void *next = (*listp)->next; - MEM_freeN((*listp)); + MEM_freeN(*listp); *listp = next; return link; diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c index 93977a796f5..45466226e72 100644 --- a/source/blender/blenlib/intern/math_color_inline.c +++ b/source/blender/blenlib/intern/math_color_inline.c @@ -219,7 +219,7 @@ MINLINE void cpack_cpy_3ub(unsigned char r_col[3], const unsigned int pack) * ``Y = 0.2126390059(R) + 0.7151686788(G) + 0.0721923154(B)`` * according to: "Derivation of Basic Television Color Equations", RP 177-1993 * - * But this is sums slightly above 1.0, the document recommends to use: + * As this sums slightly above 1.0, the document recommends to use: * ``0.2126(R) + 0.7152(G) + 0.0722(B)``, as used here. * * The high precision values are used to calculate the rounded byte weights so they add up to 255: |