Commit 9b59f2c385836c6cb72edde178bcecb6945d6dcd
2001-03-12T01:42:38
In function T1_Decoder_Parse_Charstrings, take into account lenIV seed bytes at the start of a decrypted subroutine.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index be53050..f814aed 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -492,10 +492,10 @@
goto Syntax_Error;
}
- if ( ip[-2] < 251 )
- value = ( ( (FT_Long)ip[-2] - 247 ) << 8 ) + ip[-1] + 108;
- else
- value = -( ( ( (FT_Long)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 );
+ if ( ip[-2] < 251 )
+ value = ( ( (FT_Long)ip[-2] - 247 ) << 8 ) + ip[-1] + 108;
+ else
+ value = -( ( ( (FT_Long)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 );
}
}
else
@@ -907,12 +907,21 @@
zone->cursor = ip; /* save current instruction pointer */
zone++;
- zone->base = decoder->subrs[index] + decoder->lenIV;
+
+ /* The Type 1 driver stores subroutines without the seed bytes. */
+ /* The CID driver stores subroutines with seed bytes. This case */
+ /* is taken care of when decoder->subrs_len == 0. */
+ zone->base = decoder->subrs[index];
if (decoder->subrs_len)
zone->limit = zone->base + decoder->subrs_len[index];
else
- zone->limit = decoder->subrs[index+1];
+ {
+ /* We are using subroutines from a CID font. We must adjust */
+ /* for the seed bytes. */
+ zone->base += ( decoder->lenIV >= 0 ? decoder->lenIV : 0 );
+ zone->limit = decoder->subrs[index + 1];
+ }
zone->cursor = zone->base;