shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vpx_mem,align_addr: use ~ to create mask"

--- a/vpx_mem/include/vpx_mem_intrnl.h

+++ b/vpx_mem/include/vpx_mem_intrnl.h

@@ -26,6 +26,6 @@

 /*returns an addr aligned to the byte boundary specified by align*/

 #define align_addr(addr, align) \

-  (void *)(((size_t)(addr) + ((align)-1)) & (size_t) - (align))

+  (void *)(((size_t)(addr) + ((align)-1)) & ~(size_t)((align)-1))

 #endif  // VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

--- a/vpx_mem/vpx_mem.c

+++ b/vpx_mem/vpx_mem.c

@@ -59,7 +59,7 @@

   addr = malloc((size_t)aligned_size);

   if (addr) {

-    x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, (int)align);

+    x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, align);

     set_actual_malloc_address(x, addr);

   }

   return x;