watermark was using a hardcoded size for watermarks (how embarrasing!).

diff --git a/filters.c b/filters.c
index 05caae8f23dc550a4e09bf1ee78b504aef7972a9..e7d58e3aab240eb4508ae610392e856d8ae9e19e 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -649,7 +649,10 @@ i_watermark(i_img *im, i_img *wmark, int tx, int ty, int pixdiff) {
   int vx, vy, ch;
   i_color val, wval;
 
   int vx, vy, ch;
   i_color val, wval;
 

-  for(vx=0;vx<128;vx++) for(vy=0;vy<110;vy++) {
+       int mx = wmark->xsize;
+       int my = wmark->ysize;
+
+  for(vx=0;vx<mx;vx++) for(vy=0;vy<my;vy++) {

     
     i_gpix(im,    tx+vx, ty+vy,&val );
     i_gpix(wmark, vx,    vy,   &wval);
     
     i_gpix(im,    tx+vx, ty+vy,&val );
     i_gpix(wmark, vx,    vy,   &wval);