archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

use unsigned ints for edgehash

Browse Source
This commit is contained in:
Campbell Barton
2013-05-10 12:06:40 +00:00
parent 34d7392297
commit 0ac5028f2a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenlib/intern/edgehash.c
View File

@@ -33,6 +33,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits.h>
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@@ -40,6 +41,11 @@
#include "BLI_edgehash.h" #include "BLI_edgehash.h"
#include "BLI_mempool.h" #include "BLI_mempool.h"
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wstrict-overflow"
# pragma GCC diagnostic error "-Wsign-conversion"
#endif
/**************inlined code************/ /**************inlined code************/
static const unsigned int _ehash_hashsizes[] = { static const unsigned int _ehash_hashsizes[] = {
1, 3, 5, 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 1, 3, 5, 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209,
@@ -70,7 +76,7 @@ struct EdgeEntry {
struct EdgeHash { struct EdgeHash {
EdgeEntry **buckets; EdgeEntry **buckets;
BLI_mempool *epool; BLI_mempool *epool;
int nbuckets, nentries, cursize; unsigned int nbuckets, nentries, cursize;
}; };
/***/ /***/
@@ -109,7 +115,7 @@ void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *v
if (++eh->nentries > eh->nbuckets * 3) { if (++eh->nentries > eh->nbuckets * 3) {
EdgeEntry **old = eh->buckets; EdgeEntry **old = eh->buckets;
int i, nold = eh->nbuckets; unsigned int i, nold = eh->nbuckets;
eh->nbuckets = _ehash_hashsizes[++eh->cursize]; eh->nbuckets = _ehash_hashsizes[++eh->cursize];
eh->buckets = MEM_mallocN(eh->nbuckets * sizeof(*eh->buckets), "eh buckets"); eh->buckets = MEM_mallocN(eh->nbuckets * sizeof(*eh->buckets), "eh buckets");
@@ -160,12 +166,12 @@ bool BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1)
int BLI_edgehash_size(EdgeHash *eh) int BLI_edgehash_size(EdgeHash *eh)
{ {
return eh->nentries; return (int)eh->nentries;
} }
void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp) void BLI_edgehash_clear(EdgeHash *eh, EdgeHashFreeFP valfreefp)
{ {
int i; unsigned int i;
for (i = 0; i < eh->nbuckets; i++) { for (i = 0; i < eh->nbuckets; i++) {
EdgeEntry *e; EdgeEntry *e;
@@ -199,7 +205,7 @@ void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp)
struct EdgeHashIterator { struct EdgeHashIterator {
EdgeHash *eh; EdgeHash *eh;
int curBucket; unsigned int curBucket;
EdgeEntry *curEntry; EdgeEntry *curEntry;
}; };
@@ -208,7 +214,7 @@ EdgeHashIterator *BLI_edgehashIterator_new(EdgeHash *eh)
EdgeHashIterator *ehi = MEM_mallocN(sizeof(*ehi), "eh iter"); EdgeHashIterator *ehi = MEM_mallocN(sizeof(*ehi), "eh iter");
ehi->eh = eh; ehi->eh = eh;
ehi->curEntry = NULL; ehi->curEntry = NULL;
ehi->curBucket = -1; ehi->curBucket = UINT_MAX; /* wraps to zero */
while (!ehi->curEntry) { while (!ehi->curEntry) {
ehi->curBucket++; ehi->curBucket++;
if (ehi->curBucket == ehi->eh->nbuckets) if (ehi->curBucket == ehi->eh->nbuckets)