small optimization for BLI_heap(), give some speedup in decimeter.

- use unsigned ints only (where mixing signed/unsigned)
- turn heap_swap into an inline function, add SWAP_TVAL macro to swap values using a temp value as storage.
- added type checking SHIFT3/4 macros

also style cleanup for CTR_Map

1 files changed, 1 insertions, 1 deletions

diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h
index adbbf266b4e..c0941e00c9b 100644
--- a/source/blender/blenlib/BLI_heap.h
+++ b/source/blender/blenlib/BLI_heap.h
@@ -57,7 +57,7 @@ void            BLI_heap_remove(Heap *heap, HeapNode *node);
 int             BLI_heap_is_empty(Heap *heap);
 
 /* Return the size of the heap. */
-int             BLI_heap_size(Heap *heap);
+unsigned int    BLI_heap_size(Heap *heap);
 
 /* Return the top node of the heap. This is the node with the lowest value. */
 HeapNode       *BLI_heap_top(Heap *heap);