From f658209d25477c490bf1892e68a0fd1384c1dded Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Tue, 23 Jun 2009 20:55:28 +0000
Subject: *** empty log message ***

---
 src/xrender/cdxrender.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/xrender')

diff --git a/src/xrender/cdxrender.c b/src/xrender/cdxrender.c
index 98f65aa..4dc69e2 100644
--- a/src/xrender/cdxrender.c
+++ b/src/xrender/cdxrender.c
@@ -716,31 +716,29 @@ static void cdgetfontdim(cdCtxCanvas *ctxcanvas, int *max_width, int *height, in
   if (descent)   *descent   = ctxcanvas->ctxplus->font->descent;
 }
 
-static void cdgettextsize(cdCtxCanvas *ctxcanvas, const char *text, int *width, int *height)
+static void cdgettextsize(cdCtxCanvas *ctxcanvas, const char *text, int len, int *width, int *height)
 {
   XGlyphInfo extents;
   if (!ctxcanvas->ctxplus->font) 
     return;
 
   if (ctxcanvas->canvas->text_orientation)
-    XftTextExtents8(ctxcanvas->dpy, ctxcanvas->ctxplus->flat_font, (XftChar8*)text, strlen(text), &extents);
+    XftTextExtents8(ctxcanvas->dpy, ctxcanvas->ctxplus->flat_font, (XftChar8*)text, len, &extents);
   else
-    XftTextExtents8(ctxcanvas->dpy, ctxcanvas->ctxplus->font, (XftChar8*)text, strlen(text), &extents);
+    XftTextExtents8(ctxcanvas->dpy, ctxcanvas->ctxplus->font, (XftChar8*)text, len, &extents);
 
   if (width)  *width  = extents.width+extents.x;
   if (height) *height = extents.height+extents.y;
 }
 
-static void cdtext(cdCtxCanvas *ctxcanvas, int x, int y, const char *text)
+static void cdtext(cdCtxCanvas *ctxcanvas, int x, int y, const char *text, int len)
 {
   XGlyphInfo extents;
-  int ox, oy, w, h, len, descent, dir = -1;
+  int ox, oy, w, h, descent, dir = -1;
 
   if (!ctxcanvas->ctxplus->font)
     return;
 
-  len = strlen(text);
-
   if (ctxcanvas->canvas->text_orientation)
     XftTextExtents8(ctxcanvas->dpy, ctxcanvas->ctxplus->flat_font, (XftChar8*)text, len, &extents);
   else
-- 
cgit v1.2.3