update Changes

[imager.git] / rubthru.im

diff --git a/rubthru.im b/rubthru.im
index a9577f92ec58ad0e83db9bcfff0431e77aa34866..514ec09c3ec4f9985ed9b6c148d557889e6c02ef 100644 (file)
--- a/rubthru.im
+++ b/rubthru.im
@@ -2,13 +2,13 @@
 
 static int
 rubthru_targ_noalpha(i_img *im, i_img *src,
 
 static int
 rubthru_targ_noalpha(i_img *im, i_img *src,

-                     int tx, int ty, 
-                     int src_minx, int src_miny,
-                     int src_maxx, int src_maxy) {
-  int x, y, ttx, tty;
+                     i_img_dim tx, i_img_dim ty, 
+                     i_img_dim src_minx, i_img_dim src_miny,
+                     i_img_dim src_maxx, i_img_dim src_maxy) {
+  i_img_dim x, y, tty;

   int alphachan;
   int ch;
   int alphachan;
   int ch;

-  int width = src_maxx - src_minx;
+  i_img_dim width = src_maxx - src_minx;

   int want_channels;
 
   i_clear_error();
   int want_channels;
 
   i_clear_error();


@@ -37,7 +37,6 @@ rubthru_targ_noalpha(i_img *im, i_img *src,
   for(y = src_miny; y < src_maxy; y++) {
     IM_COLOR *srcp = src_line;
     IM_COLOR *destp = dest_line;
   for(y = src_miny; y < src_maxy; y++) {
     IM_COLOR *srcp = src_line;
     IM_COLOR *destp = dest_line;

-    ttx = tx;

     IM_GLIN(src, src_minx, src_maxx, y, src_line);
     IM_GLIN(im, tx, tx + width, tty, dest_line);
     if (src->channels != want_channels)
     IM_GLIN(src, src_minx, src_maxx, y, src_line);
     IM_GLIN(im, tx, tx + width, tty, dest_line);
     if (src->channels != want_channels)


@@ -64,15 +63,15 @@ rubthru_targ_noalpha(i_img *im, i_img *src,
 }
 
 static int
 }
 
 static int

-rubthru_targ_alpha(i_img *im, i_img *src, int tx, int ty, 
-                   int src_minx, int src_miny,
-                   int src_maxx, int src_maxy) {
-  int x, y, ttx, tty;
+rubthru_targ_alpha(i_img *im, i_img *src, i_img_dim tx, i_img_dim ty, 
+                   i_img_dim src_minx, i_img_dim src_miny,
+                   i_img_dim src_maxx, i_img_dim src_maxy) {
+  i_img_dim x, y, ttx, tty;

   int want_channels;
   int alphachan;
   int ch;
   int targ_alpha_chan;
   int want_channels;
   int alphachan;
   int ch;
   int targ_alpha_chan;

-  int width = src_maxx - src_minx;
+  i_img_dim width = src_maxx - src_minx;

   
   if (im->channels == 4 && (src->channels == 4 || src->channels == 2)) {
     alphachan = 3;
   
   if (im->channels == 4 && (src->channels == 4 || src->channels == 2)) {
     alphachan = 3;


@@ -98,7 +97,7 @@ rubthru_targ_alpha(i_img *im, i_img *src, int tx, int ty,
 
   tty = ty;
   for(y = src_miny; y < src_maxy; y++) {
 
   tty = ty;
   for(y = src_miny; y < src_maxy; y++) {

-    int min_x, max_x;
+    i_img_dim min_x, max_x;

     IM_COLOR *srcp = src_line;
     IM_COLOR *destp = dest_line;
     IM_GLIN(src, src_minx, src_maxx, y, src_line);
     IM_COLOR *srcp = src_line;
     IM_COLOR *destp = dest_line;
     IM_GLIN(src, src_minx, src_maxx, y, src_line);


@@ -111,13 +110,13 @@ rubthru_targ_alpha(i_img *im, i_img *src, int tx, int ty,
       ++min_x;
       ++srcp;
     }
       ++min_x;
       ++srcp;
     }

-    while (max_x > min_x && src_line[max_x-1].channel[alphachan] == 0) {
+    while (max_x > min_x && src_line[max_x-1 - src_minx].channel[alphachan] == 0) {

       --max_x;
     }
 
     if (max_x > min_x) {
       --max_x;
     }
 
     if (max_x > min_x) {

-      int work_left = tx + min_x - src_minx;
-      int work_width = max_x - min_x;
+      i_img_dim work_left = tx + min_x - src_minx;
+      i_img_dim work_width = max_x - min_x;

       ttx = work_left;
       IM_GLIN(im, work_left, work_left + work_width, tty, dest_line);
       
       ttx = work_left;
       IM_GLIN(im, work_left, work_left + work_width, tty, dest_line);
       


@@ -169,8 +168,8 @@ unmodified.
 */
 
 int
 */
 
 int

-i_rubthru(i_img *im, i_img *src, int tx, int ty, int src_minx, int src_miny,
-         int src_maxx, int src_maxy) {
+i_rubthru(i_img *im, i_img *src, i_img_dim tx, i_img_dim ty, i_img_dim src_minx, i_img_dim src_miny,
+         i_img_dim src_maxx, i_img_dim src_maxy) {

   if (src_minx < 0) {
     tx -= src_minx;
     src_minx = 0;
   if (src_minx < 0) {
     tx -= src_minx;
     src_minx = 0;