Mercurial Mercurial > hg > stx-libview2 / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
WindowsIconReader.st
changeset 83 97fd04d167c8
parent 53 4f5e734bc59f
child 96 948318b2fbd4 
--- a/WindowsIconReader.st	Tue Jun 27 04:20:19 1995 +0200
+++ b/WindowsIconReader.st	Sun Jul 02 18:18:00 1995 +0200
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.12 1995-03-25 22:15:59 claus Exp $
+$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.13 1995-07-02 16:17:53 claus Exp $
 '!
 
 !WindowsIconReader class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.12 1995-03-25 22:15:59 claus Exp $
+$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.13 1995-07-02 16:17:53 claus Exp $
 "
 !
 
@@ -67,7 +67,7 @@
 
     stream := self streamReadingFile:aFilename.
     stream isNil ifTrue:[^ nil].
-    reader := (self new) fromOS2Stream:aStream.
+    reader := (self new) fromOS2Stream:stream.
     stream close.
     reader notNil ifTrue:[^ reader image].
     ^ nil
@@ -78,7 +78,7 @@
 
     stream := self class streamReadingFile:aFilename.
     stream isNil ifTrue:[^ nil].
-    reader := (self new) fromWindowsBMPStream:aStream.
+    reader := (self new) fromWindowsBMPStream:stream.
     stream close.
     reader notNil ifTrue:[^ reader image].
     ^ nil
@@ -89,7 +89,7 @@
 
     stream := self class streamReadingFile:aFilename.
     stream isNil ifTrue:[^ nil].
-    reader := (self new) fromWindowsICOStream:aStream.
+    reader := (self new) fromWindowsICOStream:stream.
     stream close.
     reader notNil ifTrue:[^ reader image].
     ^ nil
@@ -206,16 +206,16 @@
 
 	aStream nextBytes:(40-4) into:header startingAt:19.
 
-	width := header wordAt:(16r12 + 1).  "(header at:19) + ((header at:20) * 256).   "
-	height := header wordAt:(16r16 + 1). "(header at:23) + ((header at:24) * 256).   "
-	inPlanes := header wordAt:(16r1A + 1).
-	inDepth := header wordAt:(16r1C + 1).
-	compression := header wordAt:(16r1E + 1).
-	imgSize := header doubleWordAt:(16r22 + 1).
-	resH := header doubleWordAt:(16r26 + 1).
-	resV := header doubleWordAt:(16r2A + 1).
-	numColor := header doubleWordAt:(16r2E + 1).
-	numImportantColor := header doubleWordAt:(16r32 + 1).
+	width := header wordAt:(16r12 + 1) MSB:false.  "(header at:19) + ((header at:20) * 256).   "
+	height := header wordAt:(16r16 + 1) MSB:false. "(header at:23) + ((header at:24) * 256).   "
+	inPlanes := header wordAt:(16r1A + 1) MSB:false.
+	inDepth := header wordAt:(16r1C + 1) MSB:false.
+	compression := header wordAt:(16r1E + 1) MSB:false.
+	imgSize := header doubleWordAt:(16r22 + 1) MSB:false.
+	resH := header doubleWordAt:(16r26 + 1) MSB:false.
+	resV := header doubleWordAt:(16r2A + 1) MSB:false.
+	numColor := header doubleWordAt:(16r2E + 1) MSB:false.
+	numImportantColor := header doubleWordAt:(16r32 + 1) MSB:false.
 
 	numColor == 0 ifTrue:[
 	    "
@@ -227,7 +227,7 @@
 	rawMap := ByteArray uninitializedNew:(numColor * 4).
 	aStream nextBytes:(numColor * 4) into:rawMap.
 	fourBytesPerColorInfo := true.
-	dataStart := header wordAt:(16r0A + 1)
+	dataStart := header wordAt:(16r0A + 1) MSB:false
     ] ifFalse:[
 	((header at:(16r0E + 1)) == 12) ifTrue:[     "core-info header size"
 	    "
@@ -236,16 +236,16 @@
 	   'BMP: OS/2 vsn 1.2 format' errorPrintNL.
 	    aStream nextBytes:(12-4) into:header startingAt:19.
 
-	    width := header wordAt:(16r12 + 1).  "(header at:19) + ((header at:20) * 256).   "
-	    height := header wordAt:(16r14 + 1). "(header at:21) + ((header at:22) * 256).   "
-	    inPlanes := header wordAt:(16r16 + 1).
-	    inDepth := header wordAt:(16r18 + 1).
+	    width := header wordAt:(16r12 + 1) MSB:false.  "(header at:19) + ((header at:20) * 256).   "
+	    height := header wordAt:(16r14 + 1) MSB:false. "(header at:21) + ((header at:22) * 256).   "
+	    inPlanes := header wordAt:(16r16 + 1) MSB:false.
+	    inDepth := header wordAt:(16r18 + 1) MSB:false.
 	    numColor := 1 bitShift:inDepth.
 	    rawMap := ByteArray uninitializedNew:(numColor * 3).
 	    aStream nextBytes:(numColor * 3) into:rawMap.
 	    fourBytesPerColorInfo := false.
 	    compression := 0.
-	    dataStart := header wordAt:(16r0A + 1)
+	    dataStart := header wordAt:(16r0A + 1) MSB:false
 	] ifFalse:[
 	    'BMP: unknown format' errorPrintNL.
 	    ^ nil
hg/stx-libview2