--- a/ST80FormReader.st	Sun Mar 06 00:05:41 2016 +0100
+++ b/ST80FormReader.st	Mon Mar 07 00:39:15 2016 +0100
@@ -9,8 +9,9 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+"{ Package: 'stx:libview2' }"
 
-"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
 
 ImageReader subclass:#ST80FormReader
 	instanceVariableNames:''
@@ -86,11 +87,11 @@
     inStream isNil ifTrue:[^ false].
 
     inStream binary.
-    code := inStream nextWord.
+    code := inStream nextUnsignedInt16MSB:true.
     ok := (code == 1).
 
-    w := inStream nextWord.
-    h := inStream nextWord.
+    w := inStream nextUnsignedInt16MSB:true.
+    h := inStream nextUnsignedInt16MSB:true.
     ((w == 0) or:[h == 0]) ifTrue:[
         ok := false
     ].
@@ -185,7 +186,8 @@
 !ST80FormReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ST80FormReader.st,v 1.25 2003-11-19 15:26:11 cg Exp $'
+    ^ '$Header$'
 ! !
 
+
 ST80FormReader initialize!