diff options
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/BLI_heap.c | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/scanfill_utils.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index 0a8dafc2dc1..d7fd1caa8da 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -55,9 +55,10 @@ struct HeapNode_Chunk { * or we allocate past the reserved number. * * \note Optimize number for 64kb allocs. + * \note keep type in sync with tot_nodes in heap_node_alloc_chunk. */ #define HEAP_CHUNK_DEFAULT_NUM \ - ((MEM_SIZE_OPTIMAL((1 << 16) - sizeof(struct HeapNode_Chunk))) / sizeof(HeapNode)) + ((unsigned int)((MEM_SIZE_OPTIMAL((1 << 16) - sizeof(struct HeapNode_Chunk))) / sizeof(HeapNode))) struct Heap { unsigned int size; diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 059d5cb05a4..3b6ab99ae86 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -257,7 +257,7 @@ static bool scanfill_preprocess_self_isect( if (UNLIKELY(e_ls == NULL)) { /* only happens in very rare cases (entirely overlapping splines). - * in this case se can't do much useful. but at least don't crash */ + * in this case we can't do much useful. but at least don't crash */ continue; } |