hg/stx-libview2: comparison TIFFRdr.st

equal deleted inserted replaced

-:cb2815b77100
+:947cc10f86dc
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
 ImageReader subclass:#TIFFReader
-	 instanceVariableNames:'planarConfiguration subFileType stripOffsets rowsPerStrip
+	instanceVariableNames:'planarConfiguration subFileType stripOffsets rowsPerStrip
 		fillOrder compression group3options predictor stripByteCounts
 		currentOffset stripOffsetsPos stripByteCountsPos bitsPerSamplePos
 		colorMapPos'
-	 classVariableNames:''
+	classVariableNames:''
-	 poolDictionaries:''
+	poolDictionaries:''
-	 category:'Graphics-Images support'
+	category:'Graphics-Images support'
 !
 !TIFFReader class methodsFor:'documentation'!
 copyright
 ! !
 !TIFFReader methodsFor:'reading from file'!
 fromStream:aStream
-"read an image from aStream"
+"read a stream containing a TIFF image.
+Leave image description in instance variables."
 |char1 char2 version
 numberOfTags "{ Class: SmallInteger }"
 tagType      "{ Class: SmallInteger }"
 numberType   "{ Class: SmallInteger }"
 inStream := aStream.
 char1 := aStream next.
 char2 := aStream next.
 (char1 ~~ char2) ifTrue:[
-	'TIFFReader: not a tiff file' errorPrintNL.
+'TIFFReader: not a tiff file' errorPrintNL.
-	^ nil
+^ nil
 ].
 (char1 == $I) ifTrue:[
-	byteOrder := #lsb.
+byteOrder := #lsb.
-	msb := false.
+msb := false.
 ] ifFalse:[
-	(char1 == $M) ifTrue:[
+(char1 == $M) ifTrue:[
-	    byteOrder := #msb.
+byteOrder := #msb.
-	    msb := true.
+msb := true.
-	] ifFalse:[
+] ifFalse:[
-	    'TIFFReader: not a tiff file' errorPrintNL.
+'TIFFReader: not a tiff file' errorPrintNL.
-	    ^ nil
+^ nil
-	]
+]
 ].
 aStream binary.
 version := self readShort.
 (version ~~ 42) ifTrue:[
-	'TIFFReader: version of tiff-file not supported' errorPrintNL.
+'TIFFReader: version of tiff-file not supported' errorPrintNL.
-	^ nil
+^ nil
 ].
 "setup default values"
 compression := 1. "none"
 offset := aStream nextLongMSB:msb.
 aStream position:offset + 1.
 numberOfTags := self readShort.
 1 to:numberOfTags do:[:index |
-	tagType := self readShort.
+tagType := self readShort.
-	numberType := self readShort.
+numberType := self readShort.
-	length := aStream nextLongMSB:msb.
+length := aStream nextLongMSB:msb.
-	self decodeTiffTag:tagType numberType:numberType length:length
+self decodeTiffTag:tagType numberType:numberType length:length
 ].
 offset := aStream nextLongMSB:msb.
 (offset ~~ 0) ifTrue:[
-	'TIFFReader: more tags ignored' errorPrintNL
+'TIFFReader: more tags ignored' errorPrintNL
 ].
 "check for required tags"
 ok := true.
 width isNil ifTrue:[
-	'TIFFReader: missing width tag' errorPrintNL.
+'TIFFReader: missing width tag' errorPrintNL.
-	ok := false
+ok := false
 ].
 height isNil ifTrue:[
-	'TIFFReader: missing length tag' errorPrintNL.
+'TIFFReader: missing length tag' errorPrintNL.
-	ok := false
+ok := false
 ].
 photometric isNil ifTrue:[
-	'TIFFReader: missing photometric tag' errorPrintNL.
+'TIFFReader: missing photometric tag' errorPrintNL.
-	ok := false
+ok := false
 ].
 stripOffsets isNil ifTrue:[
-	'TIFFReader: missing stripOffsets tag' errorPrintNL.
+'TIFFReader: missing stripOffsets tag' errorPrintNL.
-	ok := false
+ok := false
 ].
 stripByteCounts isNil ifTrue:[
-	stripOffsets size == 1 ifTrue:[
+stripOffsets size == 1 ifTrue:[
-	    stripByteCounts := Array with:(self bitsPerPixel // 8) * width * height
+stripByteCounts := Array with:(self bitsPerPixel // 8) * width * height
-	]
+]
 ].
 stripByteCounts isNil ifTrue:[
-	'TIFFReader: missing stripByteCounts tag' errorPrintNL.
+'TIFFReader: missing stripByteCounts tag' errorPrintNL.
-	ok := false
+ok := false
 ].
 ok ifFalse:[
-	^ nil
+^ nil
 ].
 "given all the information, read the bits"
 rowsPerStrip isNil ifTrue:[
-	rowsPerStrip := height
+rowsPerStrip := height
 ].
 ok := false.
 (compression == 1) ifTrue:[
-	result := self readUncompressedTiffImageData.
+result := self readUncompressedTiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 2) ifTrue:[
-	result := self readCCITT3RLETiffImageData.
+result := self readCCITT3RLETiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 3) ifTrue:[
-	result := self readCCITTGroup3TiffImageData.
+result := self readCCITTGroup3TiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 4) ifTrue:[
-	result := self readCCITTGroup4TiffImageData.
+result := self readCCITTGroup4TiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 5) ifTrue:[
-	result := self readLZWTiffImageData.
+result := self readLZWTiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 6) ifTrue:[
-	result := self readJPEGTiffImageData.
+result := self readJPEGTiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 32766) ifTrue:[
-	result := self readNeXTRLE2TiffImageData.
+result := self readNeXTRLE2TiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 32771) ifTrue:[
-	result := self readCCITTRLEWTiffImageData.
+result := self readCCITTRLEWTiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 32773) ifTrue:[
-	result := self readPackbitsTiffImageData.
+result := self readPackbitsTiffImageData.
-	ok := true
+ok := true
 ].
 (compression == 32865) ifTrue:[
-	result := self readNeXTJPEGTiffImageData.
+result := self readNeXTJPEGTiffImageData.
-	ok := true
+ok := true
 ].
 ok ifFalse:[
-	'TIFFReader: compression type ' errorPrint. compression errorPrint.
+'TIFFReader: compression type ' errorPrint. compression errorPrint.
-	' not known' errorPrintNL
+' not known' errorPrintNL
 ].
 ^ result
+"Modified: 22.4.1996 / 19:12:12 / cg"
 ! !
 !TIFFReader methodsFor:'writing to file'!
 save:image onFile:aFileName
 ! !
 !TIFFReader class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview2/Attic/TIFFRdr.st,v 1.28 1996-02-04 15:35:54 cg Exp $'
+^ '$Header: /cvs/stx/stx/libview2/Attic/TIFFRdr.st,v 1.29 1996-04-22 17:38:48 cg Exp $'
 ! !
 TIFFReader initialize!

changeset 192	947cc10f86dc
parent 159	327da5085900
child 195	7975a2c4a890