class: TIFFReader
authorStefan Vogel <sv@exept.de>
Sat, 10 Aug 2013 13:10:37 +0200
changeset 3211 6d43ccc9adc4
parent 3210 784ada4aa13b
child 3212 a5ee318ee18d
class: TIFFReader changed:15 methods use #position/#position: instead of #positionXBased
TIFFReader.st
--- a/TIFFReader.st	Fri Aug 02 17:55:30 2013 +0200
+++ b/TIFFReader.st	Sat Aug 10 13:10:37 2013 +0200
@@ -1545,7 +1545,7 @@
 !TIFFReader methodsFor:'private-reading'!
 
 positionToStrip:stripNr
-    inStream position0Based:(stripOffsets at:stripNr).
+    inStream position:(stripOffsets at:stripNr).
 !
 
 readBytes:n signed:isSigned
@@ -1568,7 +1568,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:(byteOrder ~~ #lsb).
         oldPos := inStream position.
-        inStream position0Based:offset.
+        inStream position:offset.
         isSigned ifTrue:[
             1 to:n do:[:i | bytes at:i put:(inStream nextSignedByte) ].
         ] ifFalse:[
@@ -1595,7 +1595,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:(byteOrder ~~ #lsb).
         oldPos := inStream position.
-        inStream position0Based:offset.
+        inStream position:offset.
         inStream nextBytes:(n - 1) into:string.
         inStream position:oldPos
     ].
@@ -1620,7 +1620,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:msb.
         oldPos := inStream position.
-        inStream position0Based:offset.
+        inStream position:offset.
         1 to:n do:[:index |
             val := Float readBinaryIEEEDoubleFrom:inStream MSB:msb.
             values at:index put:val
@@ -1646,7 +1646,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:msb.
         oldPos := inStream position.
-        inStream position0Based:offset.
+        inStream position:offset.
         1 to:n do:[:index |
             val := ShortFloat readBinaryIEEESingleFrom:inStream MSB:msb.
             values at:index put:val
@@ -1668,7 +1668,7 @@
     values := Array basicNew:n.
     offset := inStream nextLongMSB:msb.
     oldPos := inStream position.
-    inStream position0Based:offset.
+    inStream position:offset.
     1 to:n do:[:index |
         numerator := isSigned ifTrue:[inStream nextLongMSB:msb] ifFalse:[inStream nextUnsignedLongMSB:msb].
         denominator := isSigned ifTrue:[inStream nextLongMSB:msb] ifFalse:[inStream nextUnsignedLongMSB:msb].
@@ -1694,7 +1694,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:msb.
         oldPos := inStream position.
-        inStream position0Based:offset.
+        inStream position:offset.
         1 to:n do:[:index |
             val := isSigned ifTrue:[inStream nextLongMSB:msb] ifFalse:[inStream nextUnsignedLongMSB:msb].
             values at:index put:val
@@ -1729,7 +1729,7 @@
     ] ifFalse:[
         offset := inStream nextLongMSB:msb.
         oldPos := inStream position.
-        inStream position0Based:offset.
+        inStream position:offset.
         1 to:n do:[:index |
             isSigned ifTrue:[
                 val1 := inStream nextShortMSB:msb.
@@ -1750,7 +1750,7 @@
 'bitsPerSample: ' print. bitsPerSample printNewline.
 'store bitspersample at: ' print. outStream position printNewline.
 "
-    bitsPerSamplePos := outStream position0Based.
+    bitsPerSamplePos := outStream position.
     bitsPerSample do:[:n |
         self writeShort:n
     ]
@@ -1759,7 +1759,7 @@
 writeColorMap
     |n|
 
-    colorMapPos := outStream position0Based.
+    colorMapPos := outStream position.
     #(red green blue) do:[:component |
         n := 0.
         colorMap do:[:clr |
@@ -1795,7 +1795,7 @@
 'stripByteCounts: ' print. stripByteCounts printNewline.
 'store stripbytecounts at: ' print. outStream position printNewline.
 "
-    stripByteCountsPos := outStream position0Based.
+    stripByteCountsPos := outStream position.
     stripByteCounts do:[:c |
         self writeShort:c
     ]
@@ -1806,7 +1806,7 @@
 'stripOffsets: ' print. stripOffsets printNewline.
 'store stripoffsets at: ' print. outStream position printNewline.
 "
-    stripOffsetsPos := outStream position0Based.
+    stripOffsetsPos := outStream position.
     stripOffsets do:[:o |
         self writeLong:o
     ]
@@ -2097,7 +2097,7 @@
 
     nBytes := data size.
     nBytes < 16rFFFF ifTrue:[
-        stripOffsets := Array with:(outStream position0Based).
+        stripOffsets := Array with:(outStream position).
         stripByteCounts := Array with:nBytes.
         outStream nextPutBytes:nBytes from:data.
         rowsPerStrip := height
@@ -2109,7 +2109,7 @@
         offs := 1.
         h := height.
         1 to:h do:[:row |
-            stripOffsets at:row put:(outStream position0Based).
+            stripOffsets at:row put:(outStream position).
             outStream nextPutBytes:bytesPerRow from:data startingAt:offs.
             offs := offs + bytesPerRow
         ].
@@ -2177,7 +2177,7 @@
     orientation := nil.
 
     offset := aStream nextLongMSB:msb.
-    aStream position0Based:offset.
+    aStream position:offset.
 
     numberOfTags := self readShort.
     1 to:numberOfTags do:[:index |
@@ -2321,10 +2321,10 @@
         self writeColorMap      "this outputs colorMap, sets colorMapPos"
     ].
 
-    pos := outStream position0Based.        "backpatch tag offset"
+    pos := outStream position.        "backpatch tag offset"
     outStream position:pos1.
     self writeLong:pos.                     "fill in tag offset"
-    outStream position0Based:pos.
+    outStream position:pos.
 "
 ('patch tag offset at: ', (pos1 printStringRadix:16) , ' to ',
                          (pos printStringRadix:16)) printNewline.
@@ -2355,7 +2355,7 @@
 !TIFFReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/TIFFReader.st,v 1.84 2013-03-31 19:34:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/TIFFReader.st,v 1.85 2013-08-10 11:10:37 stefan Exp $'
 ! !