[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[mgp-users-jp 01199] Re: Bug##185591: mgp: '%cont, font "foo"' doesn't work



From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [mgp-users-jp 01184] Re: Bug##185591: mgp: '%cont, font "foo"' doesn't work
Date: Fri, 21 Mar 2003 02:26:29 +0900
Message-ID: <>

 > http://bugs.debian.org/185591 ですが、報告されてきた
 > パッチでよさそうに思うのですが、どうでしょうか?

このパッチだとちょっとまずい部分があるので、こんな感じでどうでしょうか?
--
Yoshifumi Nishida
nishida@csl.sony.co.jp


diff -c -r1.200 draw.c
*** draw.c	2003/03/04 20:00:52	1.200
--- draw.c	2003/04/05 08:47:25
***************
*** 1469,1474 ****
--- 1469,1478 ----
  	case O_XTFONT:
  		if (obj->data.xftfont.data)
  			free(obj->data.xftfont.data);
+ 		if (obj->data.xftfont.fontname)
+ 			free(obj->data.xftfont.fontname);
+ 		if (obj->data.xftfont.registry)
+ 			free(obj->data.xftfont.registry);
  		break;
  #endif
  #ifdef MNG
***************
*** 4593,4600 ****
  	obj->fore = fore_color[caching];
  	obj->type = O_XTFONT;
  	obj->data.xftfont.data = strdup(p1);
! 	obj->data.xftfont.fontname = fontname;
! 	obj->data.xftfont.registry = registry;
  	obj->data.xftfont.len = len;
  	obj->data.xftfont.size = size;
  	obj->data.xftfont.charset16 = charset16;
--- 4597,4604 ----
  	obj->fore = fore_color[caching];
  	obj->type = O_XTFONT;
  	obj->data.xftfont.data = strdup(p1);
! 	obj->data.xftfont.fontname = strdup(fontname);
! 	obj->data.xftfont.registry = strdup(registry);
  	obj->data.xftfont.len = len;
  	obj->data.xftfont.size = size;
  	obj->data.xftfont.charset16 = charset16;