comparison pytouhou/utils/bitstream.pyx @ 606:3c2f96f1d715

Fix compilation under Cython 0.22, by making the pyx and the pxd declarations’ except clause similar.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Wed, 26 Nov 2014 13:36:38 +0100
parents 1b532e7dd521
children
comparison
equal deleted inserted replaced
605:d6ead6f0ba80 606:3c2f96f1d715
31 self.io.seek(offset, whence) 31 self.io.seek(offset, whence)
32 self.byte = 0 32 self.byte = 0
33 self.bits = 0 33 self.bits = 0
34 34
35 35
36 cdef bint read_bit(self): 36 cdef bint read_bit(self) except -1:
37 cdef bytes byte 37 cdef bytes byte
38 if not self.bits: 38 if not self.bits:
39 byte = self.io.read(1) 39 byte = self.io.read(1)
40 self.byte = (<unsigned char*>byte)[0] 40 self.byte = (<unsigned char*>byte)[0]
41 self.bits = 8 41 self.bits = 8
42 self.bits -= 1 42 self.bits -= 1
43 return (self.byte >> self.bits) & 0x01 43 return (self.byte >> self.bits) & 0x01
44 44
45 45
46 cpdef unsigned int read(self, unsigned int nb_bits): 46 cpdef unsigned int read(self, unsigned int nb_bits) except? 4242:
47 cdef unsigned int value = 0, read = 0 47 cdef unsigned int value = 0, read = 0
48 cdef unsigned int nb_bits2 = nb_bits 48 cdef unsigned int nb_bits2 = nb_bits
49 cdef bytes byte 49 cdef bytes byte
50 50
51 while nb_bits2: 51 while nb_bits2: