hg/stx-libview2: comparison XPMReader.st

equal deleted inserted replaced

-:a8f1fcc3e6bc
+:a1ed08195ee7
 "
 "{ Package: 'stx:libview2' }"
 ImageReader subclass:#XPMReader
-	instanceVariableNames:''
+	instanceVariableNames:'charsPerPixel maskPixelValue characterTranslation'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Graphics-Images-Support'
 !
 (line startsWith:'/* XPM') ifFalse:[^ false].
 ^ true
 "
 XPMReader isValidImageFile:'fooBar'
-XPMReader isValidImageFile:'bitmaps/xpmBitmaps/device_images/ljet.xpm'
+XPMReader isValidImageFile:'../../goodies/bitmaps/xpmBitmaps/device_images/ljet.xpm'
 XPMReader isValidImageFile:'bitmaps/gifImages/garfield.gif'
 "
 "Modified: 24.4.1997 / 20:29:40 / cg"
 ! !
 	s := s copyWith:aStream next
 ].
 ^ s
 !
-fromStream:aStream
+readColorMap:colorMapSize
-"read an XPM-image from aStream. Return the receiver
+|redMap greenMap blueMap s key lineDone state
-(with all relevant instance variables set for the image)
+symbolicName monoName greyName grey4Name colorName|
-or nil on error"
-|line
-srcIndex "{ Class: SmallInteger }"
-dstIndex "{ Class: SmallInteger }"
-colorName monoName greyName grey4Name symbolicName colorMapSize redMap greenMap blueMap
-charsPerPixel xlation s bitsPerPixel lineDone maskPixelValue
-state key lastKey lastChar1 lastChar2 c1 c2 lastXLation|
-inStream := aStream.
-line := aStream nextLine.
-(line notNil and:[line startsWith:'/* XPM']) ifFalse:[
-^ self fileFormatError:'format error (expected XPM)'.
-].
-line := aStream nextLine.
-[line notNil and:[(line startsWith:'/*') or:[line isBlank or:[(line startsWith:' *')]]]] whileTrue:[
-line := aStream nextLine.
-].
-(line notNil and:[line startsWith:'static char']) ifFalse:[
-^ self fileFormatError:'format error (expected static char)'.
-].
-line := aStream nextLine.
-(line notNil and:[line startsWith:'/*']) ifTrue:[
-[line notNil
-and:[(line startsWith:'/*') or:[line startsWith:' *']]] whileTrue:[
-line := aStream nextLine.
-].
-].
-line notNil ifTrue:[
-line := line withoutSeparators
-].
-(line notNil and:[line startsWith:'"']) ifFalse:[
-^ self fileFormatError:'format error (expected "ww hh nn mm)'.
-].
-s := ReadStream on:line.
-s next.  "skip quote"
-width := Integer readFrom:s.
-height := Integer readFrom:s.
-colorMapSize := Integer readFrom:s.
-charsPerPixel := Integer readFrom:s.
-charsPerPixel ~~ 1 ifTrue:[
-xlation := Dictionary new:colorMapSize.
-] ifFalse:[
-xlation := Array new:256.
-].
 redMap := ByteArray new:colorMapSize.
 greenMap := ByteArray new:colorMapSize.
 blueMap := ByteArray new:colorMapSize.
 colorMap := Colormap redVector:redMap greenVector:greenMap blueVector:blueMap.
 1 to:colorMapSize do:[:colorIndex |
 |index line color t word|
-line := aStream nextLine.
+line := inStream nextLine.
 [line notNil and:[line startsWith:'/*']] whileTrue:[
 [line notNil and:[(line endsWith:'*/') not]] whileTrue:[
-line := aStream nextLine.
+line := inStream nextLine.
 ].
-line := aStream nextLine.
+line := inStream nextLine.
 ].
 line notNil ifTrue:[
 line := line withoutSeparators
 ].
 (line notNil and:[line startsWith:'"']) ifFalse:[
 s := ReadStream on:line.
 s next. "skip quote"
 charsPerPixel ~~ 1 ifTrue:[
 key := s next:charsPerPixel.
-xlation at:key put:colorIndex - 1.
+characterTranslation at:key put:colorIndex - 1.
 ] ifFalse:[
 index := s next asciiValue.
-xlation at:index put:colorIndex - 1.
+characterTranslation at:index put:colorIndex - 1.
 ].
 lineDone := false.
 state := nil.
 redMap at:colorIndex put:(color red asFloat * 255.0 // 100).
 greenMap at:colorIndex put:(color green asFloat * 255.0 // 100).
 blueMap at:colorIndex put:(color blue asFloat * 255.0 // 100).
 ].
 ].
+!
+readImage
+"read an XPM-image from my inStream. Return the receiver
+(with all relevant instance variables set for the image)
+or nil on error"
+|line
+srcIndex "{ Class: SmallInteger }"
+dstIndex "{ Class: SmallInteger }"
+colorMapSize
+s bitsPerPixel key lastKey lastChar1 lastChar2 c1 c2 lastXLation|
+line := inStream nextLine.
+(line notNil and:[line startsWith:'/* XPM']) ifFalse:[
+^ self fileFormatError:'format error (expected XPM)'.
+].
+line := inStream nextLine.
+[line notNil and:[(line startsWith:'/*') or:[line isBlank or:[(line startsWith:' *')]]]] whileTrue:[
+line := inStream nextLine.
+].
+(line notNil and:[line startsWith:'static char']) ifFalse:[
+^ self fileFormatError:'format error (expected static char)'.
+].
+line := inStream nextLine.
+(line notNil and:[line startsWith:'/*']) ifTrue:[
+[line notNil
+and:[(line startsWith:'/*') or:[line startsWith:' *']]] whileTrue:[
+line := inStream nextLine.
+].
+].
+line notNil ifTrue:[
+line := line withoutSeparators
+].
+(line notNil and:[line startsWith:'"']) ifFalse:[
+^ self fileFormatError:'format error (expected "ww hh nn mm)'.
+].
+s := ReadStream on:line.
+s next.  "skip quote"
+width := Integer readFrom:s.
+height := Integer readFrom:s.
+colorMapSize := Integer readFrom:s.
+charsPerPixel := Integer readFrom:s.
+charsPerPixel ~~ 1 ifTrue:[
+characterTranslation := Dictionary new:colorMapSize.
+] ifFalse:[
+characterTranslation := Array new:256.
+].
+self readColorMap:colorMapSize.
 "actually, could make it an image with less depth most of the time ..."
 "
 bitsPerPixel := ((colorMapSize - 1) log:2) truncated + 1.
 data := ByteArray new:(width * height).
 ].
 dstIndex := 1.
 1 to:height do:[:row |
-line := aStream nextLine withoutSpaces.
+line := inStream nextLine withoutSpaces.
 [line notNil and:[line startsWith:'/*']] whileTrue:[
-line := aStream nextLine withoutSpaces.
+line := inStream nextLine withoutSpaces.
 ].
 line notNil ifTrue:[
 line := line withoutSeparators
 ].
 (line notNil and:[line startsWith:'"']) ifFalse:[
 charsPerPixel == 1 ifTrue:[
 srcIndex := 2. "skip dquote"
 1 to:width do:[:col |
 key := line at:srcIndex.
 key ~~ lastKey ifTrue:[
-lastXLation := xlation at:key asciiValue.
+lastXLation := characterTranslation at:key asciiValue.
 lastKey := key
 ].
 data at:dstIndex put:lastXLation.
 srcIndex := srcIndex + 1.
 dstIndex := dstIndex + 1
 c1 := line at:srcIndex.
 c2 := line at:srcIndex+1.
 (c1 ~~ lastChar1 or:[c2 ~~ lastChar2]) ifTrue:[
 key at:1 put:c1.
 key at:2 put:c2.
-lastXLation := xlation at:key.
+lastXLation := characterTranslation at:key.
 lastChar1 := c1.
 lastChar2 := c2.
 ].
 bitsPerPixel == 24 ifTrue:[
 data at:dstIndex   put:(colorMap at:lastXLation+1) redByte.
 ] ifFalse:[
 s := line readStream.
 s next. "/ skip dquote
 1 to:width do:[:col |
 key := s next:charsPerPixel.
-"/                data at:dstIndex put:(xlation at:key).
+"/                data at:dstIndex put:(characterTranslation at:key).
 key ~= lastKey ifTrue:[
-lastXLation := xlation at:key.
+lastXLation := characterTranslation at:key.
 lastKey := key
 ].
 data at:dstIndex put:lastXLation.
 dstIndex := dstIndex + 1
 ]
 maskPixelValue notNil ifTrue:[
 self buildMaskFromColor:maskPixelValue
 ].
 "
-XPMReader fromStream:('bitmaps/ljet.xpm' asFilename readStream)
+XPMReader fromStream:('../../goodies/bitmaps/xpmBitmaps/FATAL.xpm' asFilename readStream)
-XPMReader fromStream:('bitmaps/magtape.xpm' asFilename readStream)
-XPMReader fromStream:('bitmaps/pixmap.xpm' asFilename readStream)
-XPMReader fromStream:('bitmaps/SBrowser.xbm' asFilename readStream)
 "
 "Created: / 24.9.1995 / 06:20:06 / claus"
 "Modified: / 24.9.1995 / 07:07:33 / claus"
 "Modified: / 5.7.1996 / 17:27:59 / stefan"
 ! !
 !XPMReader class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview2/XPMReader.st,v 1.49 2003-03-02 18:39:45 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview2/XPMReader.st,v 1.50 2003-04-04 17:07:22 cg Exp $'
 ! !
 XPMReader initialize!

changeset 1737	a1ed08195ee7
parent 1710	ad35e6a18e98
child 1743	2f206c9f1319