diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2011-04-12 14:17:47 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2011-04-12 14:17:47 +0000 |
commit | 307453997ef030ec4dfa1e876feaf0b8b8125bab (patch) | |
tree | ab2054693ba95e9ac8f6e3478b4d0175d893329f /Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge | |
parent | d95b11a25d3d9e17cc4afb9c8713ef4037567527 (diff) |
check in luatex 0.66.0
git-svn-id: svn://tug.org/texlive/trunk@22059 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge')
3 files changed, 8 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/nouiutil.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/nouiutil.c index 3eb886c352f..c2298dcf43f 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/nouiutil.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/nouiutil.c @@ -46,7 +46,7 @@ static void NOUI__LogError(const char *format,va_list ap) { fprintf(stderr,"%s",str); if ( str[strlen(str)-1]!='\n' ) putc('\n',stderr); - free(str); +/* free(str);*/ } static void NOUI_LogError(const char *format,...) { diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c index dc51b328e3d..7b82ce775fc 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c @@ -5005,7 +5005,7 @@ return; } else { if ( dounicode ) info->chars[startglyph+i-start]->unicodeenc = i; - if ( map!=NULL && i < map->enccount ) + if ( map!=NULL && i < map->enccount && i>=0) map->map[i] = startglyph+i-start; } } @@ -5263,7 +5263,7 @@ static void readttfpostnames(FILE *ttf,struct ttfinfo *info) { free(info->chars[i]->name); /* If it's a null string get rid of it */ if ( i==0 ) name = ".notdef"; - else if ( info->chars[i]->unicodeenc==-1 ) { + else if ( info->chars[i]->unicodeenc<0 ) { /* Do this later */; name = NULL; } else { diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c index 1c01d821d8c..ce91a44571e 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c +++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c @@ -4954,13 +4954,14 @@ static void ttf_math_read_icta(FILE *ttf,struct ttfinfo *info, uint32 start, int if ( glyphs==NULL ) return; fseek(ttf,start+4,SEEK_SET); - for ( i=0; i<cnt; ++i ) if ( glyphs[i]<info->glyph_cnt && info->chars[ glyphs[i]]!=NULL ) { - val = (int16) getushort(ttf); + for ( i=0; i<cnt; ++i ) { + val = (int16) getushort(ttf); + offset = getushort(ttf); + if ( glyphs[i]<info->glyph_cnt && info->chars[ glyphs[i]]!=NULL ) { if ( is_ic ) info->chars[ glyphs[i] ]->italic_correction = val; else info->chars[ glyphs[i] ]->top_accent_horiz = val; - offset = getushort(ttf); #ifdef FONTFORGE_CONFIG_DEVICETABLES if ( offset!=0 ) { DeviceTable *dv = chunkalloc(sizeof(DeviceTable)); @@ -4971,6 +4972,7 @@ return; info->chars[ glyphs[i] ]->top_accent_adjusts = dv; } #endif + } } free(glyphs); } |