From db1f2800e1fe8eedb102c997e9f133ed74b3af13 Mon Sep 17 00:00:00 2001 From: jvr Date: Tue, 23 Jul 2002 14:54:47 +0000 Subject: [PATCH] back out pfa 'fix'; it reverses a bug fix from last year... git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@291 4cde692c-a291-49d1-8350-778aa11640f8 --- Lib/fontTools/t1Lib.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/fontTools/t1Lib.py b/Lib/fontTools/t1Lib.py index ca399becb..b0d17ff72 100644 --- a/Lib/fontTools/t1Lib.py +++ b/Lib/fontTools/t1Lib.py @@ -312,13 +312,12 @@ def findEncryptedChunks(data): eEnd = string.find(data, EEXECEND, eBegin) if eEnd < 0: raise T1Error, "can't find end of eexec part" - if 0: - cypherText = data[eBegin:eEnd + 2] - plainText, R = eexec.decrypt(cypherText, 55665) - eEndLocal = string.find(plainText, EEXECINTERNALEND) - if eEndLocal < 0: - raise T1Error, "can't find end of eexec part" - eEnd = eBegin + eEndLocal + len(EEXECINTERNALEND) + 1 + cypherText = data[eBegin:eEnd + 2] + plainText, R = eexec.decrypt(cypherText, 55665) + eEndLocal = string.find(plainText, EEXECINTERNALEND) + if eEndLocal < 0: + raise T1Error, "can't find end of eexec part" + eEnd = eBegin + eEndLocal + len(EEXECINTERNALEND) + 1 chunks.append((0, data[:eBegin])) chunks.append((1, data[eBegin:eEnd])) data = data[eEnd:]