use #nextUnsignedShortMSB: instead of #nextWord
authorClaus Gittinger <cg@exept.de>
Mon, 06 Apr 1998 10:34:39 +0200
changeset 894 35cbe1ab4484
parent 893 8a142b17a0c8
child 895 ebac67edf08e
use #nextUnsignedShortMSB: instead of #nextWord
ST80FormReader.st
STFormRdr.st
--- a/ST80FormReader.st	Sat Apr 04 19:08:16 1998 +0200
+++ b/ST80FormReader.st	Mon Apr 06 10:34:39 1998 +0200
@@ -109,7 +109,7 @@
     inStream := aStream.
     inStream binary.
 
-    code := inStream nextWord.
+    code := inStream nextUnsignedShortMSB:true.
     code isNil ifTrue:[
         ^ nil
     ].
@@ -117,13 +117,13 @@
         ^ self fileFormatError:'expected magic 1'.
     ].
 
-    width := aStream nextWord.
-    height := aStream nextWord.
+    width := aStream nextUnsignedShortMSB:true.
+    height := aStream nextUnsignedShortMSB:true.
     ((width == 0) or:[height == 0]) ifTrue:[
         ^ self fileFormatError:'zero width/height'.
     ].
-    offsetX := aStream nextWord.
-    offsetY := aStream nextWord.
+    offsetX := aStream nextUnsignedShortMSB:true.
+    offsetY := aStream nextUnsignedShortMSB:true.
 
     nBytes := width + 15 // 16 * 2 * height.
     data := ByteArray new:nBytes.
@@ -135,7 +135,7 @@
 
     "ST80FormReader fromFile:''"
 
-    "Modified: / 3.2.1998 / 17:59:50 / cg"
+    "Modified: / 4.4.1998 / 18:24:40 / cg"
 ! !
 
 !ST80FormReader methodsFor:'writing to file'!
@@ -188,6 +188,6 @@
 !ST80FormReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ST80FormReader.st,v 1.20 1998-02-03 17:00:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ST80FormReader.st,v 1.21 1998-04-06 08:34:39 cg Exp $'
 ! !
 ST80FormReader initialize!
--- a/STFormRdr.st	Sat Apr 04 19:08:16 1998 +0200
+++ b/STFormRdr.st	Mon Apr 06 10:34:39 1998 +0200
@@ -109,7 +109,7 @@
     inStream := aStream.
     inStream binary.
 
-    code := inStream nextWord.
+    code := inStream nextUnsignedShortMSB:true.
     code isNil ifTrue:[
         ^ nil
     ].
@@ -117,13 +117,13 @@
         ^ self fileFormatError:'expected magic 1'.
     ].
 
-    width := aStream nextWord.
-    height := aStream nextWord.
+    width := aStream nextUnsignedShortMSB:true.
+    height := aStream nextUnsignedShortMSB:true.
     ((width == 0) or:[height == 0]) ifTrue:[
         ^ self fileFormatError:'zero width/height'.
     ].
-    offsetX := aStream nextWord.
-    offsetY := aStream nextWord.
+    offsetX := aStream nextUnsignedShortMSB:true.
+    offsetY := aStream nextUnsignedShortMSB:true.
 
     nBytes := width + 15 // 16 * 2 * height.
     data := ByteArray new:nBytes.
@@ -135,7 +135,7 @@
 
     "ST80FormReader fromFile:''"
 
-    "Modified: / 3.2.1998 / 17:59:50 / cg"
+    "Modified: / 4.4.1998 / 18:24:40 / cg"
 ! !
 
 !ST80FormReader methodsFor:'writing to file'!
@@ -188,6 +188,6 @@
 !ST80FormReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/Attic/STFormRdr.st,v 1.20 1998-02-03 17:00:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/Attic/STFormRdr.st,v 1.21 1998-04-06 08:34:39 cg Exp $'
 ! !
 ST80FormReader initialize!