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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.4 by root, Sun Jun 3 18:14:13 2012 UTC vs.
Revision 1.50 by root, Thu Jun 7 19:42:09 2012 UTC

…		…
		1	#include <math.h>
1	#include "../config.h"	2	#include "../config.h"
2	#include "rxvt.h"	3	#include "rxvt.h"
3		4
4	#if HAVE_IMG	5	#if HAVE_IMG
5		6
6	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height)	7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)
7	: s(screen), w(width), h(height), format(format), shared(false)	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
		9	pm(0), ref(0)
8	{	10	{
9	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
10	}	11	}
11		12
		13	rxvt_img::rxvt_img (const rxvt_img &img)
		14	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
		15	{
		16	++ref->cnt;
		17	}
		18
		19	#if 0
12	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)	20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
13	: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false)	21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
14	{	22	{
15	}	23	}
		24	#endif
16		25
17	rxvt_img *	26	rxvt_img *
18	rxvt_img::new_from_file (rxvt_screen s, const char filename)	27	rxvt_img::new_from_root (rxvt_screen *s)
19	{	28	{
20	GError *err;	29	Display *dpy = s->display->dpy;
21	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	30	unsigned int root_pm_w, root_pm_h;
		31	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
		32	if (root_pixmap == None)
		33	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
22		34
23	if (!pb)	35	if (root_pixmap == None)
24	return 0;	36	return 0;
25		37
26	int w = gdk_pixbuf_get_width (pb);	38	Window wdummy;
27	int h = gdk_pixbuf_get_height (pb);	39	int idummy;
		40	unsigned int udummy;
		41
		42	if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
		43	return 0;
28		44
29	rxvt_img *img = new rxvt_img (	45	rxvt_img *img = new rxvt_img (
30	s,	46	s,
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	47	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
32	gdk_pixbuf_get_width (pb),	48	0,
33	gdk_pixbuf_get_height (pb)	49	0,
		50	root_pm_w,
		51	root_pm_h
34	);	52	);
35		53
36	img->render (pb, 0, 0, w, h, 0, 0);	54	img->pm = root_pixmap;
		55	img->ref = new pixref (root_pm_w, root_pm_h);
		56	img->ref->ours = false;
37		57
		58	return img;
		59	}
		60
		61	rxvt_img *
		62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		63	{
		64	Display *dpy = s->display->dpy;
		65
		66	int width = gdk_pixbuf_get_width (pb);
		67	int height = gdk_pixbuf_get_height (pb);
		68
		69	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		70	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		71
		72	// since we require rgb24/argb32 formats from xrender we assume
		73	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
		75
		76	XImage xi;
		77
		78	xi.width = width;
		79	xi.height = height;
		80	xi.xoffset = 0;
		81	xi.format = ZPixmap;
		82	xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local?
		83	xi.bitmap_unit = 32;
		84	xi.bitmap_bit_order = LSBFirst;
		85	xi.bitmap_pad = BitmapPad (dpy);
		86	xi.depth = depth;
		87	xi.bytes_per_line = 0;
		88	xi.bits_per_pixel = 32;
		89	xi.red_mask = 0x000000ff;
		90	xi.green_mask = 0x0000ff00;
		91	xi.blue_mask = 0x00ff0000;
		92
		93	if (!XInitImage (&xi))
		94	rxvt_fatal ("unable to initialise ximage, please report.\n");
		95
		96	if (height > INT_MAX / xi.bytes_per_line)
		97	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		98
		99	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		100
		101	int rowstride = gdk_pixbuf_get_rowstride (pb);
		102
		103	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
		104	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		105	char *line = xi.data;
		106
		107	for (int y = 0; y < height; y++)
		108	{
		109	unsigned char *src = row;
		110	uint32_t dst = (uint32_t )line;
		111
		112	if (depth == 24)
		113	for (int x = 0; x < width; x++)
		114	{
		115	uint8_t r = *src++;
		116	uint8_t g = *src++;
		117	uint8_t b = *src++;
		118
		119	uint32_t v = r \| (g << 8) \| (b << 16);
		120
		121	if (ecb_big_endian ())
		122	v = ecb_bswap32 (v);
		123
		124	*dst++ = x;
		125	}
		126	else
		127	for (int x = 0; x < width; x++)
		128	{
		129	uint32_t v = (uint32_t )src; src += 4;
		130	v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);
		131	*dst++ = ecb_bswap32 (v);
		132	}
		133
		134	row += rowstride;
		135	line += xi.bytes_per_line;
		136	}
		137
		138	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
		139	img->alloc ();
		140
		141	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		142	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		143	XFreeGC (dpy, gc);
		144
		145	free (xi.data);
		146
		147	return img;
		148	}
		149
		150	rxvt_img *
		151	rxvt_img::new_from_file (rxvt_screen s, const char filename)
		152	{
		153	GError *err = 0;
		154	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
		155
		156	if (!pb)
		157	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
		158
		159	rxvt_img *img = new_from_pixbuf (s, pb);
		160
		161	g_object_unref (pb);
		162
		163	return img;
		164	}
		165
		166	void
		167	rxvt_img::destroy ()
		168	{
		169	if (--ref->cnt)
38	return img;	170	return;
		171
		172	if (pm && ref->ours)
		173	XFreePixmap (s->display->dpy, pm);
		174
		175	delete ref;
39	}	176	}
40		177
41	rxvt_img::~rxvt_img ()	178	rxvt_img::~rxvt_img ()
42	{	179	{
43	if (!shared)	180	destroy ();
		181	}
		182
		183	void
		184	rxvt_img::alloc ()
		185	{
		186	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		187	ref = new pixref (w, h);
		188	}
		189
		190	Picture
		191	rxvt_img::src_picture ()
		192	{
		193	Display *dpy = s->display->dpy;
		194
		195	XRenderPictureAttributes pa;
		196	pa.repeat = repeat;
		197	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		198
		199	return pic;
		200	}
		201
		202	void
		203	rxvt_img::unshare ()
		204	{
		205	if (ref->cnt == 1 && ref->ours)
		206	return;
		207
		208	//TODO: maybe should reify instead
		209	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		210	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		211	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
44	XFreePixmap (s->display->dpy, pm);	212	XFreeGC (s->display->dpy, gc);
		213
		214	destroy ();
		215
		216	pm = pm2;
		217	ref = new pixref (ref->w, ref->h);
45	}	218	}
46		219
47	void	220	void
48	rxvt_img::fill (const rxvt_color &c)	221	rxvt_img::fill (const rxvt_color &c)
49	{	222	{
52	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	225	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);
53	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	226	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);
54	XFreeGC (s->display->dpy, gc);	227	XFreeGC (s->display->dpy, gc);
55	}	228	}
56		229
		230	static void
		231	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
		232	{
		233	double sigma = radius / 2.0;
		234	double scale = sqrt (2.0 * M_PI) * sigma;
		235	double sum = 0.0;
		236
		237	for (int i = 0; i < width; i++)
		238	{
		239	double x = i - width / 2;
		240	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
		241	sum += kernel[i];
		242	}
		243
		244	params[0] = XDoubleToFixed (width);
		245	params[1] = XDoubleToFixed (1);
		246
		247	for (int i = 0; i < width; i++)
		248	params[i+2] = XDoubleToFixed (kernel[i] / sum);
		249	}
		250
		251	rxvt_img *
		252	rxvt_img::blur (int rh, int rv)
		253	{
		254	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
		255	return clone ();
		256
		257	Display *dpy = s->display->dpy;
		258	int size = max (rh, rv) * 2 + 1;
		259	double kernel = (double )malloc (size * sizeof (double));
		260	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		261	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		262	img->alloc ();
		263
		264	Picture src = src_picture ();
		265
		266	XRenderPictureAttributes pa;
		267	pa.repeat = RepeatPad;
		268	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
		269
		270	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
		271	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
		272	XFreePixmap (dpy, tmp_pm);
		273
		274	if (kernel && params)
		275	{
		276	size = rh * 2 + 1;
		277	get_gaussian_kernel (rh, size, kernel, params);
		278
		279	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		280	XRenderComposite (dpy,
		281	PictOpSrc,
		282	src,
		283	None,
		284	tmp,
		285	0, 0,
		286	0, 0,
		287	0, 0,
		288	w, h);
		289
		290	size = rv * 2 + 1;
		291	get_gaussian_kernel (rv, size, kernel, params);
		292	::swap (params[0], params[1]);
		293
		294	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		295	XRenderComposite (dpy,
		296	PictOpSrc,
		297	tmp,
		298	None,
		299	dst,
		300	0, 0,
		301	0, 0,
		302	0, 0,
		303	w, h);
		304	}
		305
		306	free (kernel);
		307	free (params);
		308	XRenderFreePicture (dpy, src);
		309	XRenderFreePicture (dpy, dst);
		310	XRenderFreePicture (dpy, tmp);
		311
		312	return img;
		313	}
		314
		315	static Picture
		316	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
		317	{
		318	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		319
		320	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		321	XRenderPictureAttributes pa;
		322	pa.repeat = True;
		323	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		324
		325	XFreePixmap (dpy, pixmap);
		326
		327	return mask;
		328	}
		329
57	void	330	void
58	rxvt_img::blur (int rh, int rv)	331	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
59	{	332	{
60	//TODO	333	Display *dpy = s->display->dpy;
		334	Picture src = create_xrender_mask (dpy, pm, True);
		335	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		336
		337	XRenderColor mask_c;
		338	mask_c.red = r;
		339	mask_c.green = g;
		340	mask_c.blue = b;
		341	mask_c.alpha = a;
		342	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
		343
		344	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		345
		346	XRenderFreePicture (dpy, src);
		347	XRenderFreePicture (dpy, dst);
61	}	348	}
62		349
63	void	350	void
64	rxvt_img::brightness (double r, double g, double b, double a)	351	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
65	{	352	{
66	//TODO	353	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
67	}	354	return;
68		355
69	void	356	Display *dpy = s->display->dpy;
70	rxvt_img::contrast (double r, double g, double b, double a)	357	Picture src = create_xrender_mask (dpy, pm, True);
71	{	358	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
72	//TODO
73	}
74		359
75	void	360	XRenderColor mask_c;
76	rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	361	mask_c.red = r;
77	{	362	mask_c.green = g;
78	//TODO	363	mask_c.blue = b;
79	}	364	mask_c.alpha = a;
		365	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
80		366
		367	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		368
		369	XRenderFreePicture (dpy, src);
		370	XRenderFreePicture (dpy, dst);
		371	}
		372
81	rxvt_img *	373	rxvt_img *
82	rxvt_img::copy ()	374	rxvt_img::clone ()
83	{	375	{
84	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	376	return new rxvt_img (*this);
85	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
86	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
87	XFreeGC (s->display->dpy, gc);
88	return new rxvt_img (s, format, w, h, pm2);
89	}	377	}
90		378
		379	static XRenderPictFormat *
		380	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		381	{
		382	if (format->direct.alphaMask)
		383	return format; // already has alpha
		384
		385	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		386	if (format->type == PictTypeDirect)
		387	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		388	if (f->direct.alphaMask
		389	&& f->type == PictTypeDirect
		390	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		391	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		392	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		393	return f;
		394
		395	// should be a very good fallback
		396	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		397	}
		398
91	rxvt_img *	399	rxvt_img *
		400	rxvt_img::reify ()
		401	{
		402	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		403	return clone ();
		404
		405	Display *dpy = s->display->dpy;
		406
		407	bool alpha = !format->direct.alphaMask
		408	&& (x \|\| y)
		409	&& repeat == RepeatNone;
		410
		411	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		412	img->alloc ();
		413
		414	Picture src = src_picture ();
		415	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		416
		417	if (alpha)
		418	{
		419	XRenderColor rc = { 0, 0, 0, 0 };
		420	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		421	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		422	}
		423	else
		424	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
		425
		426	XRenderFreePicture (dpy, src);
		427	XRenderFreePicture (dpy, dst);
		428
		429	return img;
		430	}
		431
		432	rxvt_img *
		433	rxvt_img::sub_rect (int x, int y, int width, int height)
		434	{
		435	rxvt_img *img = clone ();
		436
		437	img->x += x;
		438	img->y += y;
		439
		440	if (w != width \|\| h != height)
		441	{
		442	img->w = width;
		443	img->h = height;
		444
		445	rxvt_img *img2 = img->reify ();
		446	delete img;
		447	img = img2;
		448	}
		449
		450	return img;
		451	}
		452
		453	rxvt_img *
92	rxvt_img::transform (int new_width, int new_height, double matrix[16])	454	rxvt_img::transform (int new_width, int new_height, double matrix[9])
93	{	455	{
94	//TODO	456	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		457	img->alloc ();
		458
		459	Display *dpy = s->display->dpy;
		460	Picture src = src_picture ();
		461	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		462
		463	XTransform xfrm;
		464
		465	for (int i = 0; i < 3; ++i)
		466	for (int j = 0; j < 3; ++j)
		467	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		468
		469	#if 0
		470	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		471	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		472	#endif
		473
		474	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		475	XRenderSetPictureTransform (dpy, src, &xfrm);
		476	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
		477
		478	XRenderFreePicture (dpy, src);
		479	XRenderFreePicture (dpy, dst);
		480
		481	return img;
95	}	482	}
96		483
97	rxvt_img *	484	rxvt_img *
98	rxvt_img::scale (int new_width, int new_height)	485	rxvt_img::scale (int new_width, int new_height)
99	{	486	{
100	// use transform	487	if (w == new_width && h == new_height)
101	//TODO	488	return clone ();
102	}
103		489
		490	double matrix[9] = {
		491	w / (double)new_width, 0, 0,
		492	0, h / (double)new_height, 0,
		493	0, 0, 1
		494	};
		495
		496	int old_repeat_mode = repeat;
		497	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		498
		499	rxvt_img *img = transform (new_width, new_height, matrix);
		500
		501	repeat = old_repeat_mode;
		502	img->repeat = repeat;
		503
		504	return img;
		505	}
		506
		507	rxvt_img *
		508	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		509	{
		510	double s = sin (phi);
		511	double c = cos (phi);
		512
		513	double matrix[9] = {
		514	c, -s, -c * x + s * y + x,
		515	s, c, -s * x - c * y + y,
		516	0, 0, 1
		517	};
		518
		519	return transform (new_width, new_height, matrix);
		520	}
		521
		522	rxvt_img *
		523	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
		524	{
		525	if (new_format == format)
		526	return clone ();
		527
		528	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		529	img->alloc ();
		530
		531	Display *dpy = s->display->dpy;
		532	Picture src = src_picture ();
		533	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		534	int op = PictOpSrc;
		535
		536	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		537	{
		538	// does it have to be that complicated
		539	rgba c;
		540	bg.get (c);
		541
		542	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		543	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		544
		545	op = PictOpOver;
		546	}
		547
		548	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		549
		550	XRenderFreePicture (dpy, src);
		551	XRenderFreePicture (dpy, dst);
		552
		553	return img;
		554	}
		555
		556	rxvt_img *
		557	rxvt_img::blend (rxvt_img *img, double factor)
		558	{
		559	rxvt_img *img2 = clone ();
		560	Display *dpy = s->display->dpy;
		561	Picture src = img->src_picture ();
		562	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		563	Picture mask = create_xrender_mask (dpy, img->pm, False);
		564
		565	XRenderColor mask_c;
		566
		567	mask_c.alpha = float_to_component (factor);
		568	mask_c.red =
		569	mask_c.green =
		570	mask_c.blue = 0;
		571	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		572
		573	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		574
		575	XRenderFreePicture (dpy, src);
		576	XRenderFreePicture (dpy, dst);
		577	XRenderFreePicture (dpy, mask);
		578
		579	return img2;
		580	}
104		581
105	#endif	582	#endif
106		583

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.4 by root, Sun Jun 3 18:14:13 2012 UTC vs. Revision 1.50 by root, Thu Jun 7 19:42:09 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.4 by root, Sun Jun 3 18:14:13 2012 UTC vs.
Revision 1.50 by root, Thu Jun 7 19:42:09 2012 UTC