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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs.
Revision 1.26 by sf-exg, Wed Jun 6 18:13:03 2012 UTC

      gdk_pixbuf_get_height (pb)
   );
   img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
+  g_object_unref (pb);
   return img;
 }
 rxvt_img::~rxvt_img ()
 {
   int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
   int channels = gdk_pixbuf_get_n_channels (pixbuf);
   unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
   char *line = ximage->data;
-  rgba c (0, 0, 0);
-  if (channels == 4 && alpha_mask == 0)
-    {
-      //pix_colors[Color_bg].get (c);
-      //TODO
-      c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D
-      c.r >>= 8;
-      c.g >>= 8;
-      c.b >>= 8;
-    }
   for (int y = 0; y < height; y++)
     {
       for (int x = 0; x < width; x++)
         {
           unsigned char r, g, b, a;
           if (channels == 4)
             {
               a = pixel[3];
-              r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
+              r = pixel[0] * a / 0xff;
-              g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
+              g = pixel[1] * a / 0xff;
-              b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
+              b = pixel[2] * a / 0xff;
             }
           else
             {
               a = 0xff;
               r = pixel[0];

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