diff options
| author | lecoanet | 2003-03-17 16:20:33 +0000 |
|---|---|---|
| committer | lecoanet | 2003-03-17 16:20:33 +0000 |
| commit | 60dea782cbf0c5a3a7039ba04001edd05531a17c (patch) | |
| tree | a6a1a0018bae61feed162bca695cf5ccda387dad /generic/Image.c | |
| parent | bb25185914fa29a85ae445add77f15108ad50af9 (diff) | |
| download | tkzinc-60dea782cbf0c5a3a7039ba04001edd05531a17c.zip tkzinc-60dea782cbf0c5a3a7039ba04001edd05531a17c.tar.gz tkzinc-60dea782cbf0c5a3a7039ba04001edd05531a17c.tar.bz2 tkzinc-60dea782cbf0c5a3a7039ba04001edd05531a17c.tar.xz | |
* (ZnFreeTexFont): Correction de l'ordre de desallocation
du txf qui conduisait � un core dump.
* Correction de la liste des caract�res sacceptables dans une
fonte en GL, il y avait deux fois ~
Diffstat (limited to 'generic/Image.c')
| -rw-r--r-- | generic/Image.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/Image.c b/generic/Image.c index 1ce7dc7..00f5f22 100644 --- a/generic/Image.c +++ b/generic/Image.c @@ -471,6 +471,7 @@ ZnGetImage(WidgetInfo *wi, bits->images = NULL; bits->mask = NULL; bits->bpixels = NULL; + bits->ipixels = NULL; entry = Tcl_CreateHashEntry(&images, image_name, &new); bits->hash = entry; Tcl_SetHashValue(entry, (ClientData) bits); @@ -1225,7 +1226,7 @@ ZnGetTexFont(WidgetInfo *wi, TexFontInfo *tfi; static int inited = 0; Tcl_HashEntry *entry; - char *fontname = Tk_NameOfFont(font); + char const *fontname = Tk_NameOfFont(font); int new; if (!inited) { @@ -1309,7 +1310,7 @@ ZnTexFontTex(ZnTexFontInfo tfi) { TexFontInfo *this = (TexFontInfo *) tfi; TexFont *txf = this->txf; - unsigned char *glisto = "\t\x14\x15\x16\x17 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijmklmnopqrstuvwxyz{|}~°ÀÂÇÈÉÊËÎÏÔÙÛÜàâçèéêëîïôùûü~`~"; + unsigned char *glisto = "\t\x14\x15\x16\x17 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijmklmnopqrstuvwxyz{|}~°ÀÂÇÈÉÊËÎÏÔÙÛÜàâçèéêëîïôùûü~`"; unsigned char *glist=NULL, *glist2=NULL; TexGlyphInfo *tgi; int i, j; @@ -1632,8 +1633,8 @@ ZnFreeTexFont(ZnTexFontInfo tfi) ZnFree(txf->tgvi); ZnFree(txf->lut); ZnFree(txf->teximage); - ZnFree(txf); Tcl_DeleteHashEntry(txf->hash); + ZnFree(txf); } ZnFree(this); |