blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

BLI: fix some integer conversions

This commit is contained in:
Jacques Lucke 2019-09-13 10:39:20 +02:00
parent 57e55906f0
commit 394318da74
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/BLI_allocator.h
View File

@ -82,13 +82,13 @@ class RawAllocator {
void *allocate_aligned(uint size, uint alignment, const char *UNUSED(name))
{
BLI_assert(is_power_of_2_i(alignment));
BLI_assert(is_power_of_2_i((int)alignment));
void *ptr = malloc(size + alignment + sizeof(MemHead));
void *used_ptr = (void *)((uintptr_t)POINTER_OFFSET(ptr, alignment + sizeof(MemHead)) &
~((uintptr_t)alignment - 1));
uint offset = (uintptr_t)used_ptr - (uintptr_t)ptr;
uint offset = (uint)((uintptr_t)used_ptr - (uintptr_t)ptr);
BLI_assert(offset >= sizeof(MemHead));
((MemHead *)used_ptr - 1)->offset = offset;
((MemHead *)used_ptr - 1)->offset = (int)offset;
return used_ptr;
}