re-work the context macros

diff --git a/immacros.h b/immacros.h
index 6d7cc75bea30d307feb1031d0f7be3fb1be565b2..7b9d866ab9ee2241ae53d975a9ad23e87bbf3812 100644 (file)
--- 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 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
 #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 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))
 #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))