[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtimg.C

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.41 by root, Thu Jun 7 11:34:09 2012 UTC vs.
Revision 1.42 by root, Thu Jun 7 11:52:26 2012 UTC

   img->alloc ();
   Picture src = src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
+  if (alpha)
+    {
+      XRenderColor rc = { 0, 0, 0, 0 };
+      XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, 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);
   return img;
 }
     w  / (double)new_width, 0, 0,
     0, h / (double)new_height, 0,
     0,                      0, 1
   };
+  int old_repeat_mode = repeat;
+  repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
-  return transform (new_width, new_height, matrix);
+  rxvt_img *img = transform (new_width, new_height, matrix);
+  repeat = old_repeat_mode;
+  img->repeat = repeat;
+  return img;
 }
 rxvt_img *
 rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
 {
     return clone ();
   rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);
   img->alloc ();
+  printf ("convert %d to %d\n", format->direct.alphaMask, new_format->direct.alphaMask);//D
   Display *dpy = s->display->dpy;
   Picture src = src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
   int op = PictOpSrc;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines