correct the type of the im_decode_exif() data parameter

[imager.git] / trans2.c

diff --git a/trans2.c b/trans2.c
index 810c436b0476927ad13aa8a5caaf36094d982e14..b1656f9410e41e997d4673db0270e59d9b06f50a 100644 (file)
--- a/trans2.c
+++ b/trans2.c
@@ -1,4 +1,4 @@
-#include "image.h"
+#include "imager.h"

 #include "regmach.h"
 
 /*
 #include "regmach.h"
 
 /*


@@ -29,14 +29,14 @@ over the image - most of the work is done in L<regmach.c>
 =cut
 */
 
 =cut
 */
 

-i_img* i_transform2(int width, int height, int channels,
+i_img* i_transform2(i_img_dim width, i_img_dim height, int channels,

                    struct rm_op *ops, int ops_count, 
                    double *n_regs, int n_regs_count, 
                    i_color *c_regs, int c_regs_count, 
                    i_img **in_imgs, int in_imgs_count)
 {
   i_img *new_img;
                    struct rm_op *ops, int ops_count, 
                    double *n_regs, int n_regs_count, 
                    i_color *c_regs, int c_regs_count, 
                    i_img **in_imgs, int in_imgs_count)
 {
   i_img *new_img;

-  int x, y;
+  i_img_dim x, y;

   i_color val;
   int i;
   int need_images;
   i_color val;
   int i;
   int need_images;


@@ -69,7 +69,7 @@ i_img* i_transform2(int width, int height, int channels,
     for (y = 0; y < height; ++y) {
       n_regs[0] = x;
       n_regs[1] = y;
     for (y = 0; y < height; ++y) {
       n_regs[0] = x;
       n_regs[1] = y;

-      val = rm_run(ops, ops_count, n_regs, n_regs_count, c_regs, c_regs_count, 
+      val = i_rm_run(ops, ops_count, n_regs, n_regs_count, c_regs, c_regs_count, 

                   in_imgs, in_imgs_count);
       i_ppix(new_img, x, y, &val);
     }
                   in_imgs, in_imgs_count);
       i_ppix(new_img, x, y, &val);
     }