pick up im_ prefix functions too

[imager.git] / imext.c

diff --git a/imext.c b/imext.c
index 30c7255000c0801f4cf104fe2fe739c29566403e..3f19123198b5f57cf1383dea2e31ff11f2b74794 100644 (file)
--- a/imext.c
+++ b/imext.c
@@ -1,5 +1,8 @@
 #include "imexttypes.h"
 #include "imager.h"
+#include "imio.h"
+
+static im_context_t get_context(void);
 
 /*
  DON'T ADD CASTS TO THESE
@@ -17,10 +20,10 @@ im_ext_funcs imager_function_table =
     myfree_file_line,
     myrealloc_file_line,
 
-    i_img_8_new,
-    i_img_16_new,
-    i_img_double_new,
-    i_img_pal_new,
+    im_img_8_new,
+    im_img_16_new,
+    im_img_double_new,
+    im_img_pal_new,
     i_img_destroy,
     i_sametype,
     i_sametype_chans,
@@ -57,10 +60,10 @@ im_ext_funcs imager_function_table =
     i_quant_translate,
     i_quant_transparent,
 
-    i_clear_error,
-    i_push_error,
+    im_clear_error,
+    im_push_error,
     i_push_errorf,
-    i_push_errorvf,
+    im_push_errorvf,
 
     i_tags_new,
     i_tags_set,
@@ -98,9 +101,9 @@ im_ext_funcs imager_function_table =
     i_rubthru,
 
     /* IMAGER_API_LEVEL 2 functions */
-    i_set_image_file_limits,
-    i_get_image_file_limits,
-    i_int_check_image_file_limits,
+    im_set_image_file_limits,
+    im_get_image_file_limits,
+    im_int_check_image_file_limits,
 
     i_flood_fill_border,
     i_flood_cfill_border,
@@ -115,15 +118,50 @@ im_ext_funcs imager_function_table =
     i_loog,
 
     /* IMAGER_API_LEVEL 4 functions */
-    i_img_alloc,
-    i_img_init,
+    im_img_alloc,
+    im_img_init,
 
     /* IMAGER_API_LEVEL 5 functions */
     i_img_is_monochrome,
     i_gsamp_bg,
     i_gsampf_bg,
     i_get_file_background,
-    i_get_file_backgroundf
+    i_get_file_backgroundf,
+    i_utf8_advance,
+    i_render_new,
+    i_render_delete,
+    i_render_color,
+    i_render_fill,
+    i_render_line,
+    i_render_linef,
+
+    /* level 6 */
+    i_io_getc_imp,
+    i_io_peekc_imp,
+    i_io_peekn,
+    i_io_putc_imp,
+    i_io_read,
+    i_io_write,
+    i_io_seek,
+    i_io_flush,
+    i_io_close,
+    i_io_set_buffered,
+    i_io_gets,
+    im_io_new_fd,
+    im_io_new_bufchain,
+    im_io_new_buffer,
+    im_io_new_cb,
+    io_slurp,
+    io_glue_destroy,
+
+    /* level 8 */
+    get_context,
+    im_push_errorf,
+    im_lhead,
+    im_loog,
+    im_context_refinc,
+    im_context_refdec,
+    im_errors
   };
 
 /* in general these functions aren't called by Imager internally, but
@@ -150,7 +188,7 @@ color to the image.
 */
 
 int 
-(i_ppix)(i_img *im, int x, int y, const i_color *val) {
+(i_ppix)(i_img *im, i_img_dim x, i_img_dim y, const i_color *val) {
   return i_ppix(im, x, y, val);
 }
 
@@ -167,7 +205,7 @@ Returns 0 if the pixel was retrieved, or -1 if not.
 */
 
 int
-(i_gpix)(i_img *im,int x,int y,i_color *val) {
+(i_gpix)(i_img *im,i_img_dim x,i_img_dim y,i_color *val) {
   return i_gpix(im, x, y, val);
 }
 
@@ -186,7 +224,7 @@ color to the image.
 =cut
 */
 int
-(i_ppixf)(i_img *im, int x, int y, const i_fcolor *val) {
+(i_ppixf)(i_img *im, i_img_dim x, i_img_dim y, const i_fcolor *val) {
   return i_ppixf(im, x, y, val);
 }
 
@@ -204,7 +242,7 @@ Returns 0 if the pixel was retrieved, or -1 if not.
 */
 
 int
-(i_gpixf)(i_img *im,int x,int y,i_fcolor *val) {
+(i_gpixf)(i_img *im,i_img_dim x,i_img_dim y,i_fcolor *val) {
   return i_gpixf(im, x, y, val);
 }
 
@@ -221,8 +259,8 @@ Returns the number of pixels set.
 =cut
 */
 
-int
-(i_plin)(i_img *im, int l, int r, int y, const i_color *vals) {
+i_img_dim
+(i_plin)(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_color *vals) {
   return i_plin(im, l, r, y, vals);
 }
 
@@ -238,8 +276,8 @@ Returns the number of pixels retrieved.
 =cut
 */
 
-int
-(i_glin)(i_img *im, int l, int r, int y, i_color *vals) {
+i_img_dim
+(i_glin)(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_color *vals) {
   return i_glin(im, l, r, y, vals);
 }
 
@@ -256,8 +294,8 @@ Returns the number of pixels set.
 =cut
 */
 
-int
-(i_plinf)(i_img *im, int l, int r, int y, const i_fcolor *vals) {
+i_img_dim
+(i_plinf)(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fcolor *vals) {
   return i_plinf(im, l, r, y, vals);
 }
 
@@ -274,8 +312,8 @@ Returns the number of pixels retrieved.
 =cut
 */
 
-int
-(i_glinf)(i_img *im, int l, int r, int y, i_fcolor *vals) {
+i_img_dim
+(i_glinf)(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fcolor *vals) {
   return i_glinf(im, l, r, y, vals);
 }
 
@@ -296,8 +334,8 @@ channel_count)
 
 =cut
 */
-int
-(i_gsamp)(i_img *im, int l, int r, int y, i_sample_t *samp, 
+i_img_dim
+(i_gsamp)(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_sample_t *samp, 
                    const int *chans, int chan_count) {
   return i_gsamp(im, l, r, y, samp, chans, chan_count);
 }
@@ -319,12 +357,48 @@ Returns the number of samples read (which should be (C<right>-C<left>)
 
 =cut
 */
-int
-(i_gsampf)(i_img *im, int l, int r, int y, i_fsample_t *samp, 
+i_img_dim
+(i_gsampf)(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fsample_t *samp, 
            const int *chans, int chan_count) {
   return i_gsampf(im, l, r, y, samp, chans, chan_count);
 }
 
+/*
+=item i_gsamp_bits(im, left, right, y, samples, channels, channel_count, bits)
+=category Drawing
+
+Reads integer samples scaled to C<bits> bits of precision into the
+C<unsigned int> array C<samples>.
+
+Expect this to be slow unless C<< bits == im->bits >>.
+
+Returns the number of samples copied, or -1 on error.
+
+Not all image types implement this method.
+
+Pushes errors, but does not call C<i_clear_error()>.
+
+=cut
+*/
+
+/*
+=item i_psamp_bits(im, left, right, y, samples, channels, channel_count, bits)
+=category Drawing
+
+Writes integer samples scaled to C<bits> bits of precision from the
+C<unsigned int> array C<samples>.
+
+Expect this to be slow unless C<< bits == im->bits >>.
+
+Returns the number of samples copied, or -1 on error.
+
+Not all image types implement this method.
+
+Pushes errors, but does not call C<i_clear_error()>.
+
+=cut
+*/
+
 /*
 =item i_gpal(im, left, right, y, indexes)
 
@@ -339,8 +413,8 @@ Always returns 0 for direct color images.
 
 =cut
 */
-int
-(i_gpal)(i_img *im, int x, int r, int y, i_palidx *vals) {
+i_img_dim
+(i_gpal)(i_img *im, i_img_dim x, i_img_dim r, i_img_dim y, i_palidx *vals) {
   return i_gpal(im, x, r, y, vals);
 }
 
@@ -358,8 +432,8 @@ Always returns 0 for direct color images.
 
 =cut
 */
-int
-(i_ppal)(i_img *im, int x, int r, int y, const i_palidx *vals) {
+i_img_dim
+(i_ppal)(i_img *im, i_img_dim x, i_img_dim r, i_img_dim y, const i_palidx *vals) {
   return i_ppal(im, x, r, y, vals);
 }
 
@@ -487,3 +561,20 @@ int
   return i_setcolors(im, index, colors, count);
 }
 
+/*
+=item im_get_context()
+
+Retrieve the context object for the current thread.
+
+Inside Imager itself this is just a function pointer, which the
+Imager.xs BOOT handler initializes for use within perl.  If you're
+taking the Imager code and embedding it elsewhere you need to
+initialize the C<im_get_context> pointer at some point.
+
+=cut
+*/
+
+static im_context_t
+get_context(void) {
+  return im_get_context();
+}