fixed a bug in memreader.

[swftools.git] / lib / bitio.c

diff --git a/lib/bitio.c b/lib/bitio.c
index eab01f2..b3cdf24 100644 (file)
--- a/lib/bitio.c
+++ b/lib/bitio.c
@@ -89,7 +89,7 @@ static int reader_memread(struct reader_t*reader, void* data, int len)
        return len;
     } else {
        memcpy(data, &mr->data[reader->pos], mr->length - reader->pos);
-       reader->pos = mr->length;
+       reader->pos += mr->length;
        return mr->length - reader->pos;
     }
 }
@@ -575,42 +575,3 @@ void reader_resetbits(struct reader_t*r)
     r->bitpos = 8;
 
 }
-U8 readU8(struct reader_t*r)
-{
-    U8 b;
-    r->read(r, &b, 1);
-    return b;
-}
-U16 readU16(struct reader_t*r)
-{
-    U8 b[2];
-    r->read(r, b, 2);
-    return b[0]|b[1]<<8;
-}
-U32 readU32(struct reader_t*r)
-{
-    U8 b[4];
-    r->read(r, b, 4);
-    return b[0]|b[1]<<8|b[2]<<16|b[3]<<24;
-}
-void writeU8(struct writer_t*wr, U8 b)
-{
-    wr->write(wr, &b, 1);
-}
-void writeU16(struct writer_t*wr, U16 w)
-{
-    U8 b[2];
-    b[0] = w;
-    b[1] = w>>8;
-    wr->write(wr, b, 2);
-}
-void writeU32(struct writer_t*wr, U32 d) 
-{
-    U8 b[4];
-    b[0] = d;
-    b[1] = d>>8;
-    b[2] = d>>16;
-    b[3] = d>>24;
-    wr->write(wr, b, 4);
-}
-