--- a/TIFFReader.st	Tue Feb 25 10:47:25 2003 +0100
+++ b/TIFFReader.st	Tue Feb 25 12:45:36 2003 +0100
@@ -1490,7 +1490,7 @@
 !TIFFReader methodsFor:'private - reading'!
 
 positionToStrip:stripNr
-    inStream position:((stripOffsets at:stripNr) + (PositionableStream zeroPosition)).
+    inStream position0Based:(stripOffsets at:stripNr).
 !
 
 readChars:n
@@ -1506,7 +1506,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:(byteOrder ~~ #lsb).
         oldPos := inStream position.
-        inStream position:(offset + (PositionableStream zeroPosition)).
+        inStream position0Based:offset.
         inStream nextBytes:(n - 1) into:string.
         inStream position:oldPos
     ].
@@ -1527,7 +1527,7 @@
     values := Array basicNew:n.
     offset := inStream nextLongMSB:msb.
     oldPos := inStream position.
-    inStream position:(offset + (PositionableStream zeroPosition)).
+    inStream position0Based:offset.
     1 to:n do:[:index |
         numerator := inStream nextLongMSB:msb.
         denominator := inStream nextLongMSB:msb.
@@ -1552,7 +1552,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:msb.
         oldPos := inStream position.
-        inStream position:(offset + (PositionableStream zeroPosition)).
+        inStream position0Based:offset.
         1 to:n do:[:index |
             values at:index put:(inStream nextLongMSB:msb)
         ].
@@ -1581,7 +1581,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:msb.
         oldPos := inStream position.
-        inStream position:(offset + (PositionableStream zeroPosition)).
+        inStream position0Based:offset.
         1 to:n do:[:index |
             values at:index put:(inStream nextUnsignedShortMSB:msb)
         ].
@@ -1944,7 +1944,7 @@
 
     nBytes := data size.
     nBytes < 16rFFFF ifTrue:[
-        stripOffsets := Array with:(outStream position - (PositionableStream zeroPosition)).
+        stripOffsets := Array with:(outStream position0Based).
         stripByteCounts := Array with:nBytes.
         outStream nextPutBytes:nBytes from:data.
         rowsPerStrip := height
@@ -1956,7 +1956,7 @@
         offs := 1.
         h := height.
         1 to:h do:[:row |
-            stripOffsets at:row put:(outStream position - (PositionableStream zeroPosition)).
+            stripOffsets at:row put:(outStream position0Based).
             outStream nextPutBytes:bytesPerRow from:data startingAt:offs.
             offs := offs + bytesPerRow
         ].
@@ -2024,7 +2024,7 @@
     orientation := nil.
 
     offset := aStream nextLongMSB:msb.
-    aStream position:offset + (PositionableStream zeroPosition).
+    aStream position0Based:offset.
 
     numberOfTags := self readShort.
     1 to:numberOfTags do:[:index |
@@ -2185,10 +2185,10 @@
         self writeColorMap      "this outputs colorMap, sets colorMapPos"
     ].
 
-    pos := outStream position.                  "backpatch tag offset"
+    pos := outStream position0Based.        "backpatch tag offset"
     outStream position:pos1.
-    self writeLong:(pos - (PositionableStream zeroPosition)).  "fill in tag offset"
-    outStream position:pos.
+    self writeLong:pos.                     "fill in tag offset"
+    outStream position0Based:pos.
 "
 ('patch tag offset at: ', (pos1 printStringRadix:16) , ' to ',
                          (pos printStringRadix:16)) printNewline.
@@ -2219,7 +2219,7 @@
 !TIFFReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/TIFFReader.st,v 1.67 2003-02-25 09:47:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/TIFFReader.st,v 1.68 2003-02-25 11:45:36 cg Exp $'
 ! !
 
 TIFFReader initialize!