skip t/x30podlinkcheck.t if Pod::Parser 1.50 not available

[imager.git] / plug.h

diff --git a/plug.h b/plug.h
index 6eaffd6280eab736aba6fd35d40bb40880ac207e..0be22bfc59325e9f3a150aaa00486b2f6b521980 100644 (file)
--- a/plug.h
+++ b/plug.h
@@ -1,4 +1,5 @@
-#include "image.h"
+#include "imdatatypes.h"
+#include "immacros.h"
 
 /* structures for passing data between Imager-plugin and the Imager-module */
 
@@ -14,17 +15,20 @@
 #define i_color_set(cl,r,g,b,a) (symbol_table->i_color_set(cl,r,g,b,a))
 #define i_color_info(cl) (symbol_table->i_color_info(cl))
 
-#define i_img_new() (symbol_table->i_img_new())
-#define i_img_empty(im,x,y) ((symbol_table->i_img_empty(im,x,y))
-#define i_img_empty_ch(im,x,y,ch) ((symbol_table->i_img_empty_ch(im,x,y,ch))
-#define i_img_exorcise(im) (symbol_table->i_img_exorcise(im))
-#define i_img_info(im,info) (symbol_table->i_img_info(im,info))
+#define im_get_context() (symbol_table->im_get_context_f())
+#define i_img_empty_ch(im,x,y,ch) ((symbol_table->i_img_empty_ch_f(im_get_context(), im,x,y,ch))
+#define i_img_exorcise(im) (symbol_table->i_img_exorcise_f(im))
+#define i_img_info(im,info) (symbol_table->i_img_info_f(im,info))
 
-#define i_img_setmask(im,ch_mask) (symbol_table->i_img_setmask(im,ch_mask))
-#define i_img_getmask(im) (symbol_table->i_img_getmask(im))
+#define i_img_setmask(im,ch_mask) (symbol_table->i_img_setmask_f(im,ch_mask))
+#define i_img_getmask(im) (symbol_table->i_img_getmask_f(im))
 
+/*
+Not needed?  The i_gpix() macro in image.h will call the right function
+directly.
 #define i_ppix(im,x,y,val) (symbol_table->i_ppix(im,x,y,val))
 #define i_gpix(im,x,y,val) (symbol_table->i_gpix(im,x,y,val))
+*/
 
 #define i_box(im, x1, y1, x2, y2,val) (symbol_table->i_box(im, x1, y1, x2, y2,val))
 #define i_draw(im, x1, y1, x2, y2,val) (symbol_table->i_draw(im, x1, y1, x2, y2,val))