--- a/SunRasterReader.st	Mon Mar 07 00:39:15 2016 +0100
+++ b/SunRasterReader.st	Mon Mar 07 00:39:29 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:#SunRasterReader
 	instanceVariableNames:''
@@ -74,10 +75,10 @@
 
     "try sun raster"
     inStream binary.
-    ((inStream nextWord == 16r59A6) 
-    and:[inStream nextWord == 16r6A95]) ifTrue: [
-	inStream close.
-	^ true
+    (((inStream nextUnsignedInt16MSB:true) == 16r59A6) 
+    and:[(inStream nextUnsignedInt16MSB:true) == 16r6A95]) ifTrue: [
+        inStream close.
+        ^ true
     ].
 
     inStream isPositionable ifFalse:[^ false].
@@ -92,25 +93,25 @@
     inStream next ~~ $* ifTrue:[^ false].
 
     (inStream skipThroughAll: 'idth') isNil ifTrue: [
-	inStream close.
-	^ false
+        inStream close.
+        ^ false
     ].
     inStream next; skipSeparators.
     nr := Integer readFrom: inStream.
     (nr isNil or:[nr <= 0]) ifTrue: [
-	inStream close.
-	^ false
+        inStream close.
+        ^ false
     ].
 
     (inStream skipThroughAll: 'eight') isNil ifTrue: [
-	inStream close.
-	^ false
+        inStream close.
+        ^ false
     ].
     inStream next; skipSeparators.
     nr := Integer readFrom: inStream.
     (nr isNil or:[nr <= 0]) ifTrue: [
-	inStream close.
-	^ false
+        inStream close.
+        ^ false
     ].
 
     inStream close.
@@ -277,7 +278,8 @@
 !SunRasterReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/SunRasterReader.st,v 1.31 2003-11-19 15:25:57 cg Exp $'
+    ^ '$Header$'
 ! !
 
+
 SunRasterReader initialize!