From 848dfa40d2845ee7cfc110c116a9159e72dea78f Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rg=20Lehmann?= <joergl@users.sourceforge.net>
Date: Mon, 26 Sep 2005 09:05:45 +0000
Subject: [PATCH] =?utf8?q?simplify=20code=20as=20suggested=20by=20Andr?=
 =?utf8?q?=EF=BF=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@2481 069f4177-920e-0410-937b-c2a4a81bcd90
---
 pyx/font/_t1code.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pyx/font/_t1code.c b/pyx/font/_t1code.c
index 10837f0e..f3b183d4 100644
--- a/pyx/font/_t1code.c
+++ b/pyx/font/_t1code.c
@@ -31,9 +31,11 @@ def decoder(code, r, n):
 static PyObject *py_decoder(PyObject *self, PyObject *args)
 {
     unsigned char *code;
-    int lcode, r, n;
+    int lcode, n;
+    unsigned int r;
 
-    if (PyArg_ParseTuple(args, "s#ii", (char **) &code, &lcode, &r, &n)) {
+    /* XXX: should we use U (unsigned int) for argument r */
+    if (PyArg_ParseTuple(args, "s#ii", (char **) &code, &lcode, (int *) &r, &n)) {
       unsigned char *data;
       int i;
       unsigned char x;
@@ -45,7 +47,7 @@ static PyObject *py_decoder(PyObject *self, PyObject *args)
       for (i=0; i<lcode; i++) {
         x = code[i];
         data[i] = x ^ ( r >> 8);
-        r = ((x + r) * C1 + C2) & 0xFFFF;
+        r = (x + r) * C1 + C2;
       }
 
       /* convert result to string stripping first n chars */
@@ -72,9 +74,11 @@ static PyObject *py_encoder(PyObject *self, PyObject *args)
 {
     unsigned char *data;
     unsigned char *random;
-    int ldata, lrandom, r;
+    int ldata, lrandom;
+    unsigned int r;
 
-    if (PyArg_ParseTuple(args, "s#is#", (char **) &data, &ldata, &r, (char **) &random, &lrandom)) {
+    /* XXX: should we use U (unsigned int) for argument r */
+    if (PyArg_ParseTuple(args, "s#is#", (char **) &data, &ldata, (int *) &r, (char **) &random, &lrandom)) {
       unsigned char *code;
       int i;
       PyObject *result;
@@ -84,12 +88,12 @@ static PyObject *py_encoder(PyObject *self, PyObject *args)
 
       for (i=0; i<lrandom; i++) {
         code[i] = random[i] ^ ( r >> 8);
-        r = ((code[i] + r) * C1 + C2) & 0xFFFF;
+        r = (code[i] + r) * C1 + C2;
       }
 
       for (i=0; i<ldata; i++) {
         code[i+lrandom] = data[i] ^ ( r >> 8);
-        r = ((code[i+lrandom] + r) * C1 + C2) & 0xFFFF;
+        r = (code[i+lrandom] + r) * C1 + C2;
       }
 
       result = PyString_FromStringAndSize((const char *)code, ldata + lrandom);
-- 
2.11.4.GIT