--- a/WindowsIconReader.st	Sun Apr 27 17:41:47 2003 +0200
+++ b/WindowsIconReader.st	Sun Apr 27 17:44:21 2003 +0200
@@ -489,41 +489,41 @@
     aStream nextBytes:4 into:header.
 
     (header startsWith:#(66 77)) ifTrue:[     "BM"
-        aStream position:1.
+        aStream position1Based:1.
 "/        'WinIconReader [info]: Win3.x or OS/2 vsn 2 BM format' infoPrintNL.
         ^ self fromWindowsBMPStream:aStream
     ].
     (header startsWith:#(66 65)) ifTrue:[     "BA"
-        aStream position:1.
+        aStream position1Based:1.
 "/        'WinIconReader [info]: OS/2 vsn 2 BA format' infoPrintNL.
         ^ self fromOS2Stream:aStream
     ].                    
     (header startsWith:#(67 73)) ifTrue:[     "CI"
-        'WinIconReader [warning]: OS/2 CI format not supported:' infoPrintNL.
+        'WinIconReader [warning]: OS/2 CI format not supported:' infoPrintCR.
         ^ nil.
-        aStream position:1.
+        aStream position1Based:1.
 "/        'WinIconReader [info]: OS/2 vsn 2 BA format' infoPrintNL.
         ^ self fromOS2Stream:aStream
     ].
     (header startsWith:#(73 67)) ifTrue:[     "IC"
-        aStream position:1.
+        aStream position1Based:1.
 "/        'WinIconReader [info]: OS/2 IC format' infoPrintNL.
         ^ self fromOS2Stream:aStream
     ].
     (header startsWith:#(80 84)) ifTrue:[     "PT"
-        aStream position:1.
+        aStream position1Based:1.
 "/        'WinIconReader [info]: OS/2 PT format' infoPrintNL.
         ^ self fromOS2Stream:aStream
     ].
     (header startsWith:#(16r53 16r5A)) ifTrue:[     "SZ"
-        'WinIconReader [warning]: OS/2 SZ format not supported:' infoPrintNL.
+        'WinIconReader [warning]: OS/2 SZ format not supported:' infoPrintCR.
         ^ nil.
-"/        aStream position:1.
+"/        aStream position1Based:1.
 "/        'WinIconReader [info]: OS/2 SZ format' infoPrintNL.
 "/        ^ self fromOS2Stream:aStream
     ].
     (header startsWith:#(0 0 1 0)) ifTrue:[
-        aStream position:1.
+        aStream position1Based:1.
 "/        'WinIconReader [info]: Win3.x ICO format' infoPrintNL.
         ^ self fromWindowsICOStream:aStream
     ].
@@ -666,7 +666,7 @@
     ].
 
     dataStart notNil ifTrue:[
-        aStream position:(dataStart + 1).
+        aStream position1Based:(dataStart + 1).
     ].
 
     inDepth == 24 ifTrue:[
@@ -914,7 +914,7 @@
     self writeLong:bfOffBits.  "Offset of bitmap data from start of hdr (and file)"
 
     "Write the bitmap info header"
-    outStream position: bhSize+1.
+    outStream position1Based: bhSize+1.
     self writeLong:biSize.  "info header size in bytes" 
     self writeLong:width.  "biWidth" 
     self writeLong:height.  "biHeight" 
@@ -1102,7 +1102,7 @@
 !WindowsIconReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.52 2003-04-10 14:25:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.53 2003-04-27 15:44:03 cg Exp $'
 ! !
 
 WindowsIconReader initialize!

--- a/XWDReader.st	Sun Apr 27 17:41:47 2003 +0200
+++ b/XWDReader.st	Sun Apr 27 17:44:21 2003 +0200
@@ -248,7 +248,7 @@
     aStream nextPut: 0. "/ 7
     aStream nextPut: 0. "/ 8
 
-"/    [(aStream position rem: 4) == 0] whileFalse: [ aStream nextPut: 0 ].
+"/    [(aStream position1Based rem: 4) == 0] whileFalse: [ aStream nextPut: 0 ].
 
     "Write out the color table.  Each color table entry is 12 bytes long composed of:
                     an index                (4 bytes)
@@ -299,7 +299,7 @@
 !XWDReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/XWDReader.st,v 1.23 2003-04-10 14:25:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/XWDReader.st,v 1.24 2003-04-27 15:44:21 cg Exp $'
 ! !
 
 XWDReader initialize!