Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r--source/blender/blenlib/intern/BLI_ghash.c66
-rw-r--r--source/blender/blenlib/intern/hash_mm2a.c2
2 files changed, 34 insertions, 34 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index b192a5d5eed..83602645192 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -547,8 +547,8 @@ static void ghash_free_cb(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP va
{
unsigned int i;
- BLI_assert(keyfreefp || valfreefp);
- BLI_assert(!valfreefp|| !(gh->flag & GHASH_FLAG_IS_GSET));
+ BLI_assert(keyfreefp || valfreefp);
+ BLI_assert(!valfreefp || !(gh->flag & GHASH_FLAG_IS_GSET));
for (i = 0; i < gh->nbuckets; i++) {
Entry *e;
@@ -1878,37 +1878,37 @@ double BLI_ghash_calc_quality_ex(
}
{
- uint64_t sum = 0;
- uint64_t overloaded_buckets_threshold = (uint64_t)max_ii(GHASH_LIMIT_GROW(1), 1);
- uint64_t sum_overloaded = 0;
- uint64_t sum_empty = 0;
-
- for (i = 0; i < gh->nbuckets; i++) {
- uint64_t count = 0;
- Entry *e;
- for (e = gh->buckets[i]; e; e = e->next) {
- count++;
- }
- if (r_biggest_bucket) {
- *r_biggest_bucket = max_ii(*r_biggest_bucket, (int)count);
- }
- if (r_prop_overloaded_buckets && (count > overloaded_buckets_threshold)) {
- sum_overloaded++;
- }
- if (r_prop_empty_buckets && !count) {
- sum_empty++;
- }
- sum += count * (count + 1);
- }
- if (r_prop_overloaded_buckets) {
- *r_prop_overloaded_buckets = (double)sum_overloaded / (double)gh->nbuckets;
- }
- if (r_prop_empty_buckets) {
- *r_prop_empty_buckets = (double)sum_empty / (double)gh->nbuckets;
- }
- return ((double)sum * (double)gh->nbuckets /
- ((double)gh->nentries * (gh->nentries + 2 * gh->nbuckets - 1)));
- }
+ uint64_t sum = 0;
+ uint64_t overloaded_buckets_threshold = (uint64_t)max_ii(GHASH_LIMIT_GROW(1), 1);
+ uint64_t sum_overloaded = 0;
+ uint64_t sum_empty = 0;
+
+ for (i = 0; i < gh->nbuckets; i++) {
+ uint64_t count = 0;
+ Entry *e;
+ for (e = gh->buckets[i]; e; e = e->next) {
+ count++;
+ }
+ if (r_biggest_bucket) {
+ *r_biggest_bucket = max_ii(*r_biggest_bucket, (int)count);
+ }
+ if (r_prop_overloaded_buckets && (count > overloaded_buckets_threshold)) {
+ sum_overloaded++;
+ }
+ if (r_prop_empty_buckets && !count) {
+ sum_empty++;
+ }
+ sum += count * (count + 1);
+ }
+ if (r_prop_overloaded_buckets) {
+ *r_prop_overloaded_buckets = (double)sum_overloaded / (double)gh->nbuckets;
+ }
+ if (r_prop_empty_buckets) {
+ *r_prop_empty_buckets = (double)sum_empty / (double)gh->nbuckets;
+ }
+ return ((double)sum * (double)gh->nbuckets /
+ ((double)gh->nentries * (gh->nentries + 2 * gh->nbuckets - 1)));
+ }
}
double BLI_gset_calc_quality_ex(
GSet *gs, double *r_load, double *r_variance,
diff --git a/source/blender/blenlib/intern/hash_mm2a.c b/source/blender/blenlib/intern/hash_mm2a.c
index 87ba542e147..af6ef4f355f 100644
--- a/source/blender/blenlib/intern/hash_mm2a.c
+++ b/source/blender/blenlib/intern/hash_mm2a.c
@@ -135,7 +135,7 @@ uint32_t BLI_hash_mm2(const unsigned char *data, size_t len, uint32_t seed)
case 1:
h ^= data[0];
h *= MM2A_M;
- };
+ }
/* Do a few final mixes of the hash to ensure the last few bytes are well-incorporated. */
MM2A_MIX_FINALIZE(h);