Mercurial Mercurial > hg > stx-libview2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
return .ico files as Depth4Images (not Depth8)
authorClaus Gittinger <cg@exept.de>
Fri, 07 Jun 1996 15:48:46 +0200
changeset 298 cd59c474524a
parent 297 14971808870c
child 299 23d89531904f
return .ico files as Depth4Images (not Depth8)
WinIconRdr.st file | annotate | diff | comparison | revisions
WindowsIconReader.st file | annotate | diff | comparison | revisions 
--- a/WinIconRdr.st	Fri Jun 07 10:02:31 1996 +0200
+++ b/WinIconRdr.st	Fri Jun 07 15:48:46 1996 +0200
@@ -619,27 +619,34 @@
     ].
     data4 := tmp.
 
-    "expand into bytes"
-
-    data := ByteArray new:(width * height).
-    data4 expandPixels:inDepth width:width height:height
-                  into:data mapping:nil.
 
     photometric := #palette.
     samplesPerPixel := 1.
-    bitsPerSample := #(8).
+
     colorMap := Colormap redVector:rMap greenVector:gMap blueVector:bMap.
 
+    false ifTrue:[
+    "expand into bytes"
+
+        data := ByteArray new:(width * height).
+        data4 expandPixels:inDepth width:width height:height
+                      into:data mapping:nil.
+        bitsPerSample := #(8).
+    ] ifFalse:[
+        data := data4.
+        bitsPerSample := #(4).
+    ].
+
     "
      WindowsIconReader new fromWindowsICOFile:'/phys/clam2//LocalLibrary/Images/WIN_icons/ibm.ico'.
     "
 
-    "Modified: 23.4.1996 / 13:10:18 / cg"
+    "Modified: 7.6.1996 / 15:46:30 / cg"
 ! !
 
 !WindowsIconReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/Attic/WinIconRdr.st,v 1.25 1996-05-10 16:46:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/Attic/WinIconRdr.st,v 1.26 1996-06-07 13:48:46 cg Exp $'
 ! !
 WindowsIconReader initialize!
--- a/WindowsIconReader.st	Fri Jun 07 10:02:31 1996 +0200
+++ b/WindowsIconReader.st	Fri Jun 07 15:48:46 1996 +0200
@@ -619,27 +619,34 @@
     ].
     data4 := tmp.
 
-    "expand into bytes"
-
-    data := ByteArray new:(width * height).
-    data4 expandPixels:inDepth width:width height:height
-                  into:data mapping:nil.
 
     photometric := #palette.
     samplesPerPixel := 1.
-    bitsPerSample := #(8).
+
     colorMap := Colormap redVector:rMap greenVector:gMap blueVector:bMap.
 
+    false ifTrue:[
+    "expand into bytes"
+
+        data := ByteArray new:(width * height).
+        data4 expandPixels:inDepth width:width height:height
+                      into:data mapping:nil.
+        bitsPerSample := #(8).
+    ] ifFalse:[
+        data := data4.
+        bitsPerSample := #(4).
+    ].
+
     "
      WindowsIconReader new fromWindowsICOFile:'/phys/clam2//LocalLibrary/Images/WIN_icons/ibm.ico'.
     "
 
-    "Modified: 23.4.1996 / 13:10:18 / cg"
+    "Modified: 7.6.1996 / 15:46:30 / cg"
 ! !
 
 !WindowsIconReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.25 1996-05-10 16:46:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/WindowsIconReader.st,v 1.26 1996-06-07 13:48:46 cg Exp $'
 ! !
 WindowsIconReader initialize!
hg/stx-libview2