# HG changeset patch
# User Thibaut Girka <thib@sitedethib.com>
# Date 1327244091 -3600
# Node ID b5c7369abd7cb494e0e273ca161bb379a415174e
# Parent  4b549894ef6b79bbdf0af1e27105fef68cea376d
Improve data reading perfs

diff --git a/pytouhou/formats/pbg3.py b/pytouhou/formats/pbg3.py
--- a/pytouhou/formats/pbg3.py
+++ b/pytouhou/formats/pbg3.py
@@ -79,7 +79,7 @@ class PBG3(object):
     """
 
     def __init__(self, entries=None, bitstream=None):
-        self.entries = entries or []
+        self.entries = entries or {}
         self.bitstream = bitstream #TODO
 
 
diff --git a/pytouhou/utils/bitstream.pyx b/pytouhou/utils/bitstream.pyx
--- a/pytouhou/utils/bitstream.pyx
+++ b/pytouhou/utils/bitstream.pyx
@@ -15,7 +15,8 @@
 cdef class BitStream:
     cdef public io
     cdef public int bits
-    cdef public int byte
+    cdef public unsigned char byte
+
 
     def __init__(BitStream self, io):
         self.io = io
@@ -53,9 +54,10 @@ cdef class BitStream:
         return (self.byte >> self.bits) & 0x01
 
 
-    def read(BitStream self, nb_bits):
-        cdef unsigned int value
-        value = 0
+    cpdef unsigned int read(BitStream self, int nb_bits):
+        cdef unsigned int value = 0
+        cdef int i
+
         for i in range(nb_bits - 1, -1, -1):
             value |= self.read_bit() << i
         return value
diff --git a/pytouhou/utils/lzss.py b/pytouhou/utils/lzss.pyx
rename from pytouhou/utils/lzss.py
rename to pytouhou/utils/lzss.pyx
--- a/pytouhou/utils/lzss.py
+++ b/pytouhou/utils/lzss.pyx
@@ -12,12 +12,24 @@
 ## GNU General Public License for more details.
 ##
 
-def decompress(bitstream, size, dictionary_size=0x2000,
-               offset_size=13, length_size=4, minimum_match_length=3):
-    out_data = []
-    dictionary = [0] * dictionary_size
-    dictionary_head = 1
-    while len(out_data) < size:
+from libc.stdlib cimport calloc, malloc, free
+
+
+cpdef bytes decompress(object bitstream,
+                       Py_ssize_t size,
+                       unsigned int dictionary_size=0x2000,
+                       unsigned int offset_size=13,
+                       unsigned int length_size=4,
+                       unsigned int minimum_match_length=3):
+    cdef unsigned int i, ptr, dictionary_head, offset, length
+    cdef unsigned char flag, byte, *out_data, *dictionary
+    cdef bytes _out_data
+
+    out_data = <unsigned char*> malloc(size)
+    dictionary = <unsigned char*> calloc(dictionary_size, 1)
+    dictionary_head, ptr = 1, 0
+
+    while ptr < size:
         flag = bitstream.read_bit()
         if flag:
             # The `flag` bit is set, indicating the upcoming chunk of data is a literal
@@ -25,15 +37,22 @@ def decompress(bitstream, size, dictiona
             byte = bitstream.read(8)
             dictionary[dictionary_head] = byte
             dictionary_head = (dictionary_head + 1) % dictionary_size
-            out_data.append(byte)
+            out_data[ptr] = byte
+            ptr += 1
         else:
             # The `flag` bit is not set, the upcoming chunk is a (offset, length) tuple
             offset = bitstream.read(offset_size)
             length = bitstream.read(length_size) + minimum_match_length
-            if (offset, length) == (0, 0):
+            if offset == 0 and length == 0:
                 break
             for i in range(offset, offset + length):
-                out_data.append(dictionary[i % dictionary_size])
+                out_data[ptr % size] = dictionary[i % dictionary_size]
+                ptr += 1
                 dictionary[dictionary_head] = dictionary[i % dictionary_size]
                 dictionary_head = (dictionary_head + 1) % dictionary_size
-    return b''.join(chr(byte) for byte in out_data)
+
+    _out_data = out_data[:size]
+    free(out_data)
+    free(dictionary)
+    return _out_data
+