yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverse allocation routines parameter order so that the context is at the back.

Browse Source
This commit is contained in:
Jorge Rodriguez 2014-09-09 22:57:15 -07:00
parent 17b931047c
commit c9d67446d2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stb_image_resize.h
View File

@ -7,9 +7,9 @@
#define STBIR_ASSERT(x) to avoid using assert.h. #define STBIR_ASSERT(x) to avoid using assert.h.
#define STBIR_MALLOC(context,size) and STBIR_FREE(context,ptr) to avoid using stdlib.h malloc. #define STBIR_MALLOC(size,context) and STBIR_FREE(ptr,context) to avoid using stdlib.h malloc.
Each function makes exactly one call to malloc/free, so to avoid allocations, Each function makes exactly one call to malloc/free, so to avoid allocations,
pass in a temp memory block as context and return that from MALLOC. pass in a temp memory block as context and return that from MALLOC.
QUICK NOTES: QUICK NOTES:
Written with emphasis on usage and speed. Only the resize operation is Written with emphasis on usage and speed. Only the resize operation is
@ -274,8 +274,8 @@ STBIRDEF int stbir_resize_region( const void *input_pixels , int input_w , int
#ifndef STBIR_MALLOC #ifndef STBIR_MALLOC
#include <stdlib.h> #include <stdlib.h>
#define STBIR_MALLOC(c,x) malloc(x) #define STBIR_MALLOC(x,c) malloc(x)
#define STBIR_FREE(c,x) free(x) #define STBIR_FREE(x,c) free(x)
#endif #endif
#ifndef _MSC_VER #ifndef _MSC_VER
@ -1831,7 +1831,7 @@ static int stbir__resize_arbitrary(
stbir__calculate_transform(&info, s0,t0,s1,t1,transform); stbir__calculate_transform(&info, s0,t0,s1,t1,transform);
stbir__choose_filter(&info, h_filter, v_filter); stbir__choose_filter(&info, h_filter, v_filter);
memory_required = stbir__calculate_memory(&info); memory_required = stbir__calculate_memory(&info);
extra_memory = STBIR_MALLOC(alloc_context, memory_required); extra_memory = STBIR_MALLOC(memory_required, alloc_context);
if (!extra_memory) if (!extra_memory)
return 0; return 0;
@ -1842,7 +1842,7 @@ static int stbir__resize_arbitrary(
edge_horizontal, edge_vertical, edge_horizontal, edge_vertical,
colorspace, extra_memory, memory_required); colorspace, extra_memory, memory_required);
STBIR_FREE(alloc_context, extra_memory); STBIR_FREE(extra_memory, alloc_context);
return result; return result;
} }

4
tests/resample_test.cpp
View File

@ -30,7 +30,7 @@ public:
void* memory; void* memory;
} g_context; } g_context;
void* stbir_malloc(void* context, size_t size) void* stbir_malloc(size_t size, void* context)
{ {
if (!context) if (!context)
return malloc(size); return malloc(size);
@ -42,7 +42,7 @@ void* stbir_malloc(void* context, size_t size)
return real_context->memory; return real_context->memory;
} }
void stbir_free(void* context, void* memory) void stbir_free(void* memory, void* context)
{ {
if (!context) if (!context)
return free(memory); return free(memory);