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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.36 by root, Thu Jun 7 08:45:34 2012 UTC vs.
Revision 1.40 by root, Thu Jun 7 11:27:08 2012 UTC

 rxvt_img::reify ()
 {
   if (x == 0 && y == 0 && w == ref->w && h == ref->h)
     return clone ();
-  rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);
+  Display *dpy = s->display->dpy;
+  bool alpha = !format->direct.alphaMask
+               && (x || y)
+               && repeat == RepeatNone;
+  rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h);
   img->alloc ();
-  Display *dpy = s->display->dpy;
   Picture src = src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
   XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
 }
 rxvt_img *
 rxvt_img::sub_rect (int x, int y, int width, int height)
 {
-  bool need_reify = w < width || h < height;
   rxvt_img *img = clone ();
   img->x += x;
   img->y += y;
+  if (w != width || h != height)
+    {
-  img->w = width;
+      img->w = width;
-  img->h = height;
+      img->h = height;
-  if (need_reify)
+      rxvt_img *img2 = img->reify ();
-    img->reify ();
+      delete img;
+      img = img2;
+    }
   return img;
 }
 rxvt_img *
 rxvt_img *
 rxvt_img::blend (rxvt_img *img, double factor)
 {
   rxvt_img *img2 = clone ();
   Display *dpy = s->display->dpy;
-  Picture src = src_picture ();
+  Picture src = img->src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
   Picture mask = create_xrender_mask (dpy, img->pm, False);
   XRenderColor mask_c;

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