Rev 71: Merge the gc for pyrex 0.9.6.4 updates in http://bzr.arbash-meinel.com/plugins/groupcompress_rabin

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/groupcompress_rabin

------------------------------------------------------------
revno: 71
revision-id: john at arbash-meinel.com-20090302180420-8m229eh99p2bp2r5
parent: john at arbash-meinel.com-20090302180323-cx4qz36qnmd0dnki
parent: john at arbash-meinel.com-20090302160108-9pl56rebxcd23w35
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: groupcompress_rabin
timestamp: Mon 2009-03-02 12:04:20 -0600
message:
  Merge the gc for pyrex 0.9.6.4 updates
modified:
  _groupcompress_pyx.pyx         _groupcompress_c.pyx-20080724041824-yelg6ii7c7zxt4z0-1
    ------------------------------------------------------------
    revno: 68.1.1
    revision-id: john at arbash-meinel.com-20090302160108-9pl56rebxcd23w35
    parent: john at arbash-meinel.com-20090228050444-38soix727ge8yhvn
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: groupcompress_rabin
    timestamp: Mon 2009-03-02 10:01:08 -0600
    message:
      Make the groupcompress pyrex extension compatible with pyrex 0.9.6.4
      Also fix a bug in processing the offsets.
    modified:
      _groupcompress_c.pyx           _groupcompress_c.pyx-20080724041824-yelg6ii7c7zxt4z0-1
-------------- next part --------------
=== modified file '_groupcompress_pyx.pyx'
--- a/_groupcompress_pyx.pyx	2009-03-02 17:05:33 +0000
+++ b/_groupcompress_pyx.pyx	2009-03-02 18:04:20 +0000
@@ -242,22 +242,22 @@
                 cp_off = data[0]
                 data = data + 1
             if (cmd & 0x02):
-                cp_off |= (data[0] << 8)
+                cp_off = cp_off | (data[0] << 8)
                 data = data + 1
             if (cmd & 0x04):
-                cp_off |= (data[0] << 16)
+                cp_off = cp_off | (data[0] << 16)
                 data = data + 1
             if (cmd & 0x08):
-                cp_off |= (data[0] << 24)
-                data[0] += 1
+                cp_off = cp_off | (data[0] << 24)
+                data = data + 1
             if (cmd & 0x10):
                 cp_size = data[0]
                 data = data + 1
             if (cmd & 0x20):
-                cp_size |= (data[0] << 8)
+                cp_size = cp_size | (data[0] << 8)
                 data = data + 1
             if (cmd & 0x40):
-                cp_size |= (data[0] << 16)
+                cp_size = cp_size | (data[0] << 16)
                 data = data + 1
             if (cp_size == 0):
                 cp_size = 0x10000
@@ -267,14 +267,14 @@
                 break
             memcpy(out, source + cp_off, cp_size)
             out = out + cp_size
-            size -= cp_size
+            size = size - cp_size
         elif (cmd):
             if (cmd > size):
                 break
             memcpy(out, data, cmd)
             out = out + cmd
             data = data + cmd
-            size -= cmd
+            size = size - cmd
         else:
             # /*
             #  * cmd == 0 is reserved for future encoding