Showing the changes to codec/processing/src/common/memory.cpp (1 of 34 files). Show all
Unified · Split
| @@ -35,7 +35,7 @@ · 34 unmodified lines | |||
| 35 | WELSVP_NAMESPACE_BEGIN | 35 | WELSVP_NAMESPACE_BEGIN |
| 36 | ///////////////////////////////////////////////////////////////////////////////// | 36 | ///////////////////////////////////////////////////////////////////////////////// |
| 37 | 37 | ||
| 38 | void* WelsMalloc (const uint32_t kuiSize, str_t* pTag) { | 38 | void* WelsMalloc (const uint32_t kuiSize, char* pTag) { |
| 39 | const int32_t kiSizeVoidPointer = sizeof (void**); | 39 | const int32_t kiSizeVoidPointer = sizeof (void**); |
| 40 | const int32_t kiSizeInt32 = sizeof (int32_t); | 40 | const int32_t kiSizeInt32 = sizeof (int32_t); |
| 41 | const int32_t kiAlignedBytes = ALIGNBYTES - 1; | 41 | const int32_t kiAlignedBytes = ALIGNBYTES - 1; |
| @@ -59,7 +59,7 @@ void* WelsMalloc (const uint32_t kuiSize, str_t* pTag) { · 17 unmodified lines | |||
| 59 | 59 | ||
| 60 | ///////////////////////////////////////////////////////////////////////////// | 60 | ///////////////////////////////////////////////////////////////////////////// |
| 61 | 61 | ||
| 62 | void WelsFree (void* pPointer, str_t* pTag) { | 62 | void WelsFree (void* pPointer, char* pTag) { |
| 63 | if (pPointer) { | 63 | if (pPointer) { |
| 64 | ::free (* (((void**) pPointer) - 1)); | 64 | ::free (* (((void**) pPointer) - 1)); |
| 65 | } | 65 | } |
| @@ -67,7 +67,7 @@ void WelsFree (void* pPointer, str_t* pTag) { · 1 unmodified line | |||
| 67 | 67 | ||
| 68 | ///////////////////////////////////////////////////////////////////////////// | 68 | ///////////////////////////////////////////////////////////////////////////// |
| 69 | 69 | ||
| 70 | void* InternalReallocate (void* pPointer, const uint32_t kuiSize, str_t* pTag) { | 70 | void* InternalReallocate (void* pPointer, const uint32_t kuiSize, char* pTag) { |
| 71 | uint32_t iOldSize = 0; | 71 | uint32_t iOldSize = 0; |
| 72 | uint8_t* pNew = NULL; | 72 | uint8_t* pNew = NULL; |
| 73 | if (pPointer != NULL) | 73 | if (pPointer != NULL) |
| @@ -91,7 +91,7 @@ void* InternalReallocate (void* pPointer, const uint32_t kuiSize, str_t* pTag) { · 17 unmodified lines | |||
| 91 | 91 | ||
| 92 | ///////////////////////////////////////////////////////////////////////////// | 92 | ///////////////////////////////////////////////////////////////////////////// |
| 93 | 93 | ||
| 94 | void* WelsRealloc (void* pPointer, uint32_t* pRealSize, const uint32_t kuiSize, str_t* pTag) { | 94 | void* WelsRealloc (void* pPointer, uint32_t* pRealSize, const uint32_t kuiSize, char* pTag) { |
| 95 | const uint32_t kuiOldSize = *pRealSize; | 95 | const uint32_t kuiOldSize = *pRealSize; |
| 96 | uint32_t kuiNewSize = 0; | 96 | uint32_t kuiNewSize = 0; |
| 97 | void* pLocalPointer = NULL; | 97 | void* pLocalPointer = NULL; |