--- binwrap.cpp	2003/03/08 16:02:34	1.10
+++ binwrap.cpp	2009/09/29 22:06:39	1.11
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * binwrap.cpp - Binary I/O wrapper, using standard iostreams library
- * Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
+ * Copyright (C) 2002, 2003, 2009 Simon Peter <dn.tlp@gmx.net>
  */
 
 #include "binwrap.h"
@@ -47,9 +47,12 @@
 {
   if(!in) { err = NotOpen; return 0; }
 
-  int i = in->get();
-  if(i == EOF) err |= Eof;
-  return (Byte)i;
+  if(!in->eof()) {
+    return (Byte)in->get();
+  } else {
+    err |= Eof;
+    return 0;
+  }
 }
 
 long biniwstream::pos()