X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ffont-ximage.c;h=227327fcf4d81ea0b8b949b7692fb6286427ca54;hb=4ade52359b6eba3621566dac79793a33aa4c915f;hp=c7b0051d752664b6e0b1722c0a1392800acceb07;hpb=50be9bb40dc60130c99ffa568e6677779904ff70;p=xscreensaver diff --git a/hacks/glx/font-ximage.c b/hacks/glx/font-ximage.c index c7b0051d..227327fc 100644 --- a/hacks/glx/font-ximage.c +++ b/hacks/glx/font-ximage.c @@ -1,5 +1,5 @@ /* font-ximage.c --- renders text to an XImage for use with OpenGL. - * xscreensaver, Copyright (c) 2001, 2003 Jamie Zawinski + * xscreensaver, Copyright (c) 2001-2013 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -20,13 +20,16 @@ #ifdef HAVE_COCOA # include "jwxyz.h" -# include #else /* !HAVE_COCOA */ # include # include # include /* only for GLfloat */ #endif /* !HAVE_COCOA */ +#ifdef HAVE_JWZGLES +# include "jwzgles.h" +#endif /* HAVE_JWZGLES */ + extern char *progname; #include "font-ximage.h" @@ -131,6 +134,8 @@ text_to_ximage (Screen *screen, Visual *visual, overall.rbearing = MAX(overall.rbearing, o2.rbearing); lines++; } + free (text); + text = 0; width = overall.lbearing + overall.rbearing + margin + margin + 1; height = ((f->ascent + f->descent) * lines) + margin + margin;