From d78d99a1cbb3edad63017b6fb864da018716f76c Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 6 Mar 2001 13:56:42 +0000 Subject: [PATCH] formatting --- ChangeLog | 9 ++++----- src/cff/cffgload.c | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47648ec5e..bda8f7596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,13 @@ -2001-03-05 Tom Kacvinsky +2001-03-05 Tom Kacvinsky * src/cff/cffgload.c (CFF_Load_Glyph): Set glyph control data to the - the Type 2 glyph charstring (used by conversion programs). Submitted - by Ha Shao . + the Type 2 glyph charstring (used by conversion programs). + Submitted by Ha Shao . 2001-03-04 Antoine Leca * include/freetype/ttnameid.h: Correct a stupid typo which prevented correct compilation (TT_MS_LANGID_TIGRIGNA_ETHIOPIA appeared twice). - I am sorry for the inconvenience :-(. 2001-03-04 Werner Lemberg @@ -47,7 +46,7 @@ the Type 1 glyph charstring (used by conversion programs). Submitted by Ha Shao . -2001-02-22 David Turner +2001-02-22 David Turner * src/base/ftgrays.c (grays_sweep): The function didn't exit immediately if `num_cells' was 0 as it should. Thanks to Boris for diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 480562607..f88ecee87 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -2139,6 +2139,7 @@ { CFF_Index csindex = cff->charstrings_index; + CFF_Prepare_Decoder( &decoder, glyph_index ); error = CFF_Parse_CharStrings( &decoder, charstring, charstring_len ); @@ -2147,9 +2148,10 @@ /* We set control_data and control_len if charstrings is loaded. */ /* See how charstring loads at CFF_Access_Element() in cffload.c. */ - glyph->root.control_data = csindex.bytes + csindex.offsets[glyph_index] - 1; - glyph->root.control_len = charstring_len; - + glyph->root.control_data = + csindex.bytes + csindex.offsets[glyph_index] - 1; + glyph->root.control_len = + charstring_len; } /* save new glyph tables */