From 385d7a417c70c1e17e0a37dbb6d72f4c05c34116 Mon Sep 17 00:00:00 2001 From: Sean Barrett Date: Sat, 13 Sep 2014 08:50:10 -0700 Subject: [PATCH] delete some unused functions; get rid of stbir__inline for some functions that don't need it --- stb_image_resize.h | 16 ++-------------- tests/resize.dsp | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/stb_image_resize.h b/stb_image_resize.h index 288f799..a6e453d 100644 --- a/stb_image_resize.h +++ b/stb_image_resize.h @@ -809,26 +809,14 @@ static int stbir__get_total_vertical_coefficients(stbir__info* info) * stbir__get_coefficient_width (info->vertical_filter, info->vertical_scale); } -stbir__inline static stbir__contributors* stbir__get_contributor(stbir__contributors* contributors, int n) +static stbir__contributors* stbir__get_contributor(stbir__contributors* contributors, int n) { return &contributors[n]; } -stbir__inline static stbir__contributors* stbir__get_horizontal_contributor(stbir__info* stbir_info, int n) -{ - STBIR__DEBUG_ASSERT(n >= 0 && n < stbir_info->horizontal_num_contributors); - return stbir__get_contributor(stbir_info->horizontal_contributors, n); -} - -stbir__inline static stbir__contributors* stbir__get_vertical_contributor(stbir__info* stbir_info, int n) -{ - STBIR__DEBUG_ASSERT(n >= 0 && n < stbir_info->vertical_num_contributors); - return stbir__get_contributor(stbir_info->vertical_contributors, n); -} - // For perf reasons this code is duplicated in stbir__resample_horizontal_upsample/downsample, // if you change it here change it there too. -stbir__inline static float* stbir__get_coefficient(float* coefficients, stbir_filter filter, float scale, int n, int c) +static float* stbir__get_coefficient(float* coefficients, stbir_filter filter, float scale, int n, int c) { int width = stbir__get_coefficient_width(filter, scale); return &coefficients[width*n + c]; diff --git a/tests/resize.dsp b/tests/resize.dsp index 2c170f2..e670af2 100644 --- a/tests/resize.dsp +++ b/tests/resize.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /Z7 /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe