hg/stx-libview2: comparison TIFFReader.st

equal deleted inserted replaced

-:784ada4aa13b
+:6d43ccc9adc4
 ! !
 !TIFFReader methodsFor:'private-reading'!
 positionToStrip:stripNr
-inStream position0Based:(stripOffsets at:stripNr).
+inStream position:(stripOffsets at:stripNr).
 !
 readBytes:n signed:isSigned
 "read n 8bit signed or unsigned integers and return them in an array or byteArray"
 inStream skip:(4 - n).
 ]
 ] 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:[
 inStream nextBytes:n into:bytes.
 ].
 inStream skip:(4 - n).
 ]
 ] ifFalse:[
 offset := inStream nextLongMSB:(byteOrder ~~ #lsb).
 oldPos := inStream position.
-inStream position0Based:offset.
+inStream position:offset.
 inStream nextBytes:(n - 1) into:string.
 inStream position:oldPos
 ].
 ^ string
 val := Float readBinaryIEEEDoubleFrom:inStream MSB:msb.
 values at:1 put:val.
 ] 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
 ].
 inStream position:oldPos
 val := ShortFloat readBinaryIEEESingleFrom:inStream MSB:msb.
 values at:1 put:val.
 ] 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
 ].
 inStream position:oldPos
 msb := byteOrder ~~ #lsb.
 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].
 values at:index put:(Fraction numerator:numerator denominator:denominator)
 ].
 val := isSigned ifTrue:[inStream nextLongMSB:msb] ifFalse:[inStream nextUnsignedLongMSB:msb].
 values at:1 put:val.
 ] 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
 ].
 inStream position:oldPos
 values at:2 put:val2
 ]
 ] 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.
 ] ifFalse:[
 val1 := inStream nextUnsignedShortMSB:msb.
 writeBitsPerSample
 "
 'bitsPerSample: ' print. bitsPerSample printNewline.
 'store bitspersample at: ' print. outStream position printNewline.
 "
-bitsPerSamplePos := outStream position0Based.
+bitsPerSamplePos := outStream position.
 bitsPerSample do:[:n |
 self writeShort:n
 ]
 !
 writeColorMap
 |n|
-colorMapPos := outStream position0Based.
+colorMapPos := outStream position.
 #(red green blue) do:[:component |
 n := 0.
 colorMap do:[:clr |
 |entry|
 writeStripByteCounts
 "
 'stripByteCounts: ' print. stripByteCounts printNewline.
 'store stripbytecounts at: ' print. outStream position printNewline.
 "
-stripByteCountsPos := outStream position0Based.
+stripByteCountsPos := outStream position.
 stripByteCounts do:[:c |
 self writeShort:c
 ]
 !
 writeStripOffsets
 "
 'stripOffsets: ' print. stripOffsets printNewline.
 'store stripoffsets at: ' print. outStream position printNewline.
 "
-stripOffsetsPos := outStream position0Based.
+stripOffsetsPos := outStream position.
 stripOffsets do:[:o |
 self writeLong:o
 ]
 !
 |offs bytesPerRow nBytes
 h "{ Class: SmallInteger }"|
 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
 ] ifFalse:[
 stripOffsets := Array basicNew:height.
 stripByteCounts := (Array basicNew:height) atAllPut:bytesPerRow.
 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
 ].
 rowsPerStrip := 1
 ].
 "resolutionUnit := 2."
 predictor := 1.
 orientation := nil.
 offset := aStream nextLongMSB:msb.
-aStream position0Based:offset.
+aStream position:offset.
 numberOfTags := self readShort.
 1 to:numberOfTags do:[:index |
 tagType := self readShort.
 numberType := self readShort.
 self writeBitsPerSample.    "this outputs bitsPerSample, sets bitsPerSamplePos"
 photometric == #palette ifTrue:[
 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.
 "
 "output tag data"
 ! !
 !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 $'
 ! !
 TIFFReader initialize!

changeset 3211	6d43ccc9adc4
parent 3112	d6fbee4954ca
child 3382	cca44f2caa2d