Merge from branch 3.0

This commit is contained in:
ffsup2
2011-03-19 00:02:29 +01:00
parent 910bcc688c
commit f9d74687b9
20 changed files with 1873 additions and 1586 deletions

View File

@@ -53,7 +53,7 @@ inline void fseek (IMFILE* f, int p, int how) {
else if (how==SEEK_END)
f->pos = f->size-p;
if (f->pos < 0 || f->pos> f->size)
if (f->pos < 0 || f->pos> f->size)
f->pos = fpos;
}