--- a/WindowsIconReader.st Fri Oct 02 02:46:58 2009 +0200
+++ b/WindowsIconReader.st Sun Oct 04 17:56:05 2009 +0200
@@ -374,40 +374,40 @@
"helper: load a BMP image"
d == 8 ifTrue:[
- compression == 0 ifTrue:[
- ^ self loadUncompressedFrom:aStream into:data.
- ].
- compression == 1 ifTrue:[
- ^ self loadRLECompressedBMP8From:aStream into:data.
- ].
-self halt.
- ^ false
+ compression == 0 ifTrue:[
+ ^ self loadUncompressedFrom:aStream into:data.
+ ].
+ compression == 1 ifTrue:[
+ ^ self loadRLECompressedBMP8From:aStream into:data.
+ ].
+ self breakPoint:#cg info:'unhandled compression'.
+ ^ false
].
d == 4 ifTrue:[
- ^ self loadBMP4From:aStream into:data
+ ^ self loadBMP4From:aStream into:data
].
d == 2 ifTrue:[
- ^ self loadBMP2From:aStream into:data
+ ^ self loadBMP2From:aStream into:data
].
d == 1 ifTrue:[
- ^ self loadBMP1From:aStream into:data
+ ^ self loadBMP1From:aStream into:data
].
((d == 16)
or:[ (d == 24)
or:[ (d == 32) ]]) ifTrue:[
- (self loadBMPWidth:w height:h bytesPerPixel:(d // 8) from:aStream into:data) ifFalse:[
- ^ false
- ].
- inDepth == 16 ifTrue:[
- "/ Depth16Image keeps its data MSB (sigh); here they come LSB.
- data swapBytes.
- ].
- inDepth == 24 ifTrue:[
- "/ Depth24Image keeps its data r/g/b; BMP has it b/g/r (sigh)
- self swapBytesFromRGB_to_BGR.
- ].
+ (self loadBMPWidth:w height:h bytesPerPixel:(d // 8) from:aStream into:data) ifFalse:[
+ ^ false
+ ].
+ inDepth == 16 ifTrue:[
+ "/ Depth16Image keeps its data MSB (sigh); here they come LSB.
+ data swapBytes.
+ ].
+ inDepth == 24 ifTrue:[
+ "/ Depth24Image keeps its data r/g/b; BMP has it b/g/r (sigh)
+ self swapBytesFromRGB_to_BGR.
+ ].
- ^ true
+ ^ true
].
^ false
@@ -1318,7 +1318,11 @@
!WindowsIconReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.63 2008-12-03 12:24:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.64 2009-10-04 15:56:05 cg Exp $'
+!
+
+version_CVS
+ ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.64 2009-10-04 15:56:05 cg Exp $'
! !
WindowsIconReader initialize!