From bd25142364ad49f530cb7125b8e17afefa39091b Mon Sep 17 00:00:00 2001 From: Tony Cook Date: Mon, 6 Aug 2012 11:48:23 +1000 Subject: [PATCH] re-work the context macros --- immacros.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/immacros.h b/immacros.h index 6d7cc75b..7b9d866a 100644 --- a/immacros.h +++ b/immacros.h @@ -128,17 +128,17 @@ returns -1 and pushes an error. #define i_img_type(im) ((im)->type) #define i_img_bits(im) ((im)->bits) +#define pIMCTX im_context_t my_im_ctx + #ifdef IMAGER_NO_CONTEXT -#define dIMCTX im_context_t my_im_ctx = im_get_context() -#define dIMCTXa(a) im_context_t my_im_ctx = im_get_context() -#define dIMCTXim(im) im_context_t my_im_ctx = (im)->context +#define dIMCTXctx(ctx) pIMCTX = (ctx) +#define dIMCTX dIMCTXctx(im_get_context()) +#define dIMCTXim(im) dIMCTXctx((im)->context) #define aIMCTX my_im_ctx #else #define aIMCTX im_get_context() #endif -#define pIMCTX im_context_t my_im_ctx - #define i_img_8_new(xsize, ysize, channels) im_img_8_new(aIMCTX, (xsize), (ysize), (channels)) #define i_img_16_new(xsize, ysize, channels) im_img_16_new(aIMCTX, (xsize), (ysize), (channels)) #define i_img_double_new(xsize, ysize, channels) im_img_double_new(aIMCTX, (xsize), (ysize), (channels)) -- 2.39.5