hg/stx-libbasic2: comparison CompressionStream.st

equal deleted inserted replaced

-:42a2a9549bea
+:6c3f9241753a
 "
 COPYRIGHT (c) 2002 by eXept Software AG
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 !CompressionStream class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 2002 by eXept Software AG
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 documentation
 "
 Abstract superclass of streams that compress or deconpress data
 [author:]
-Claus Atzkern
+	Claus Atzkern
 [instance variables:]
 [class variables:]
 zerror:anError
 |error|
 zstream isNil ifTrue:[
-error := 'not open'.
+	error := 'not open'.
 ] ifFalse:[
-anError isNumber ifTrue:[
+	anError isNumber ifTrue:[
-anError ==  1 ifTrue:[ error := 'stream at end' ]
+		     anError ==  1 ifTrue:[ error := 'stream at end' ]
-ifFalse:[anError == -1 ifTrue:[ error := 'processing error: ', anError printString ]
+	    ifFalse:[anError == -1 ifTrue:[ error := 'processing error: ', anError printString ]
-ifFalse:[anError == -2 ifTrue:[ error := 'processing error' ]
+	    ifFalse:[anError == -2 ifTrue:[ error := 'processing error' ]
-ifFalse:[anError == -3 ifTrue:[ error := 'input data are corrupted' ]
+	    ifFalse:[anError == -3 ifTrue:[ error := 'input data are corrupted' ]
-ifFalse:[anError == -4 ifTrue:[ error := 'not enough memory' ]
+	    ifFalse:[anError == -4 ifTrue:[ error := 'not enough memory' ]
-ifFalse:[anError == -5 ifTrue:[ error := 'not enough memory in the output stream' ]
+	    ifFalse:[anError == -5 ifTrue:[ error := 'not enough memory in the output stream' ]
-ifFalse:[anError == -6 ifTrue:[ error := 'version error' ]
+	    ifFalse:[anError == -6 ifTrue:[ error := 'version error' ]
-ifFalse:[
+	    ifFalse:[
-error := 'compressing error: ', anError printString
+		    error := 'compressing error: ', anError printString
-]]]]]]].
+	    ]]]]]]].
-] ifFalse:[
+	] ifFalse:[
-error := anError printString
+	    error := anError printString
-].
+	].
 ].
 StreamError raiseErrorString:(self class name , ': ', error).
 ! !
 !CompressionStream methodsFor:'finalization'!
 executor
 "redefined to return a lightweight copy
 - all we need is the memory handle"
 ^ self class basicNew finalizeCopy:zstream.
 !
 finalize
 "the compressin-stream was garbage collected;
 close the underlying zip-stream"
 zstream := aZStream.
 ! !
 !CompressionStream methodsFor:'low level'!
-z_nextAvailableInto:aCollection startingAt:offset
+z_nextAvailableInto:aCollection startingAt:offset maxCount:maxCount
 "read the next available bytes into a collection, a string or byteArray;
 returns the size read"
 |start count avail|
 avail := readLimit - position.
 avail > 0 ifFalse:[^ 0].
 count := aCollection size - offset + 1.
-count > 0 ifFalse:[
+count < 0 ifTrue:[
-	count < 0 ifTrue:[
+	self zerror:'invalid arguments'
-	    self zerror:'invalid arguments'
+].
-	].
+count == 0 ifTrue:[
 	^ 0
 ].
-count    := avail min:count.
-start    := position.
+count := avail min:count.
+maxCount notNil ifTrue:[ count := count min:maxCount ].
+start := position.
 position := position + count.
 %{  unsigned char * _dstPt;
 if( __isBytes(aCollection) ) {
 %}.
 ^ self zerror:'invalid argument'
 !
+z_nextAvailableInto:aCollection startingAt:offset
+^ self z_nextAvailableInto:aCollection startingAt:offset maxCount:nil
+!
 zclose
 "low level close of the zip stream"
 ^ self subclassResponsibility
 !
 updates the readLimit and position"
 |n|
 mode == #readonly ifFalse:[
-self errorWriteOnly
+	self errorWriteOnly
 ].
 hitEOF == true ifTrue:[^ false].
 position >= readLimit ifTrue:[
-[(readLimit := self zinflate) == 0] whileTrue:[
+	[(readLimit := self zinflate) == 0] whileTrue:[
-n := onStream nextBytes:(inputBytes size) into:inputBytes startingAt:1.
+	    n := onStream nextBytes:(inputBytes size) into:inputBytes startingAt:1.
-n == 0 ifTrue:[
+	    n == 0 ifTrue:[
-hitEOF := true.
+		hitEOF := true.
-^ false
+		^ false
-].
+	    ].
-self zset_avail_in:n.
+	    self zset_avail_in:n.
-].
+	].
-readLimit isNil ifTrue:[
+	readLimit isNil ifTrue:[
-hitEOF := true.
+	    hitEOF := true.
-^ false
+	    ^ false
-].
+	].
-position := 0.
+	position := 0.
 ].
 ^ true
 !
 isBinary
 "return the entire contents of and close the stream"
 |species stream bfsize buffer count|
 mode == #readonly ifFalse:[
-self errorWriteOnly
+	self errorWriteOnly
 ].
 bfsize := outputBytes size.
 species := self contentsSpecies.
 buffer  := species new:bfsize.
 stream  := WriteStream on:(species new:bfsize).
 [self canReadWithoutBlocking] whileTrue:[
-count := self z_nextAvailableInto:buffer startingAt:1.
+	count := self z_nextAvailableInto:buffer startingAt:1.
-count == bfsize ifTrue:[
+	count == bfsize ifTrue:[
-stream nextPutAll:buffer.
+	    stream nextPutAll:buffer.
-] ifFalse:[
+	] ifFalse:[
-count > 0 ifTrue:[
+	    count > 0 ifTrue:[
-stream nextPutAll:buffer startingAt:1 to:count.
+		stream nextPutAll:buffer startingAt:1 to:count.
-]
+	    ]
-].
+	].
 ].
 self close.
 ^ stream contents
 !
 	offset > n ifTrue:[^ data]
 ].
 ^ data copyFrom:1 to:(offset - 1)
 !
 skip:count
 "skip count objects, return the receiver
 redefined for optimization"
 |n avail|
 n := count.
 n <= 0 ifTrue:[
-n ~~ 0 ifTrue:[
+	n ~~ 0 ifTrue:[
-"dont know how to unread ..."
+	    "dont know how to unread ..."
-PositionError raiseRequest
+	    PositionError raiseRequest
-].
+	].
-^ self
+	^ self
 ].
 [self canReadWithoutBlocking] whileTrue:[
-avail := readLimit - position.
+	avail := readLimit - position.
-avail >= n ifTrue:[
+	avail >= n ifTrue:[
-position := position + n.
+	    position := position + n.
-^ self
+	    ^ self
-].
+	].
-position := readLimit := 0. "/ reset input
+	position := readLimit := 0. "/ reset input
-n := n - avail.
+	n := n - avail.
 ].
 ! !
 !CompressionStream methodsFor:'startup & release'!
 ^ self streamOpenWithMode:aMode on:aStream.
 !
 streamOpenWithMode:aMode on:aStream
 "open the compression stream on a stream
-#readonly    uncompress the data derived from the read-stream,  aStream
+	 #readonly    uncompress the data derived from the read-stream,  aStream
-#writeonly   compress   the data and write to the write-stream, aStream
+	 #writeonly   compress   the data and write to the write-stream, aStream
 "
 aStream isNil ifTrue:[
-^ self errorNotOpen
+	^ self errorNotOpen
 ].
 onStream    := aStream.
 mode        := aMode.
 outputBytes := ExternalBytes unprotectedNew:16384.
 inputBytes  := ExternalBytes unprotectedNew:16384.
 readLimit   := position := 0.
 binary      := false.
 self registerForFinalization.
 hitEOF := false.
 aMode == #readonly ifTrue:[
-self zinflateInit.
+	self zinflateInit.
 ] ifFalse:[
-self zdeflateInit
+	self zdeflateInit
 ].
 ! !
 !CompressionStream methodsFor:'writing'!
 self zset_avail_in:position.
 position := 0.
 [   continue := self zdeflate.
-availOut := self zget_avail_out.
+	availOut := self zget_avail_out.
-availOut > 0 ifTrue:[
+	availOut > 0 ifTrue:[
-self onStreamPutBytes:availOut from:outputBytes
+	    self onStreamPutBytes:availOut from:outputBytes
-].
+	].
 ] doWhile:[ continue == true ].
 !
 nextPut:aByteOrCharacter
 |limit|
 limit := inputBytes size.
 aCollection do:[:aByteOrCharacter|
-position == limit ifTrue:[self flush].
+	position == limit ifTrue:[self flush].
-position := position + 1.
+	position := position + 1.
-inputBytes at:position put:aByteOrCharacter asInteger.
+	inputBytes at:position put:aByteOrCharacter asInteger.
 ].
 ^ aCollection
 ! !
 !CompressionStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/CompressionStream.st,v 1.22 2008-06-05 09:15:06 ab Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/CompressionStream.st,v 1.23 2009-07-31 11:16:42 cg Exp $'
 ! !
 CompressionStream initialize!

changeset 2190	6c3f9241753a
parent 2005	a6ef1083aa32
child 2191	7cb40c5e5511