--- rxvt-unicode/src/rxvtimg.C	2012/06/14 18:59:39	1.85
+++ rxvt-unicode/src/rxvtimg.C	2012/06/14 19:36:35	1.87
@@ -532,7 +532,7 @@
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
 
-  if (mask)
+  if (mask_p)
     XRenderFreePicture (dpy, mask_p);
 }
 
@@ -565,10 +565,10 @@
     {
       XRenderColor rc = { 0, 0, 0, 0 };
       XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
-      XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
+      XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
     }
   else
-    XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
+    XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
 
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
@@ -581,8 +581,8 @@
 {
   rxvt_img *img = clone ();
 
-  img->x += x;
-  img->y += y;
+  img->x -= x;
+  img->y -= y;
 
   if (w != width || h != height)
     {
@@ -656,7 +656,7 @@
   nv inv[3][3];
   mat_invert (matrix, inv);
 
-  rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
+  rxvt_img *img = new rxvt_img (s, format, dx + d [0] - ox, dy + d [1] - oy, new_width, new_height, repeat);
   img->alloc ();
 
   Display *dpy = s->display->dpy;