summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2006-06-11 10:21:35 +0000
committerMikael Magnusson <mikachu@comhem.se>2006-06-11 10:21:35 +0000
commitdd489976687342c82bb8c8e884a7af7c08d364fc (patch)
tree941a888afb98ce5a734ce40439e04b4e4d760e67
parente0aa54a8912e34e94d42872dba95ade0fda7fdca (diff)
fix two memleaks
-rw-r--r--render/font.c6
-rw-r--r--render/render.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/render/font.c b/render/font.c
index 11a8edc6..b715bb80 100644
--- a/render/font.c
+++ b/render/font.c
@@ -203,12 +203,12 @@ RrFont *RrFontOpen(const RrInstance *inst, gchar *fontstring)
void RrFontClose(RrFont *f)
{
if (f) {
+#ifdef USE_PANGO
+ pango_font_description_free(f->pango_font_description);
+#endif
XftFontClose(RrDisplay(f->inst), f->xftfont);
g_free(f);
}
-#ifdef USE_PANGO
- pango_font_description_free(f->pango_font_description);
-#endif
}
static void font_measure_full(const RrFont *f, const gchar *str,
diff --git a/render/render.c b/render/render.c
index 05f7c993..355a2451 100644
--- a/render/render.c
+++ b/render/render.c
@@ -329,6 +329,7 @@ void RrMinsize(RrAppearance *a, gint *w, gint *h)
*w = MAX(*w, m->width + 4);
m->height = RrFontHeight(a->texture[i].data.text.font);
*h += MAX(*h, m->height);
+ g_free(m);
break;
case RR_TEXTURE_RGBA:
*w += MAX(*w, a->texture[i].data.rgba.width);