class: MacOSXIconReader
changed:
#colormap4
#colormap8
#read_ics8_from:
--- a/MacOSXIconReader.st Mon May 06 20:25:02 2013 +0200
+++ b/MacOSXIconReader.st Mon May 06 20:28:14 2013 +0200
@@ -249,284 +249,282 @@
colormap4
^ #(
- (16rFF 16rFF 16rFF)
- (16rFC 16rF3 16r05)
- (16rFF 16r64 16r02)
- (16rDD 16r08 16r06)
- (16rF2 16r08 16r84)
- (16r46 16r00 16rA5)
- (16r00 16r00 16rD4)
- (16r02 16rAB 16rEA)
- (16r1F 16rB7 16r14)
- (16r00 16r64 16r11)
- (16r56 16r2C 16r05)
- (16r90 16r71 16r3A)
- (16rC0 16rC0 16rC0)
- (16r80 16r80 16r80)
- (16r40 16r40 16r40)
- (16r00 16r00 16r00)
- )
+ 16rFF 16rFF 16rFF
+ 16rFC 16rF3 16r05
+ 16rFF 16r64 16r02
+ 16rDD 16r08 16r06
+ 16rF2 16r08 16r84
+ 16r46 16r00 16rA5
+ 16r00 16r00 16rD4
+ 16r02 16rAB 16rEA
+ 16r1F 16rB7 16r14
+ 16r00 16r64 16r11
+ 16r56 16r2C 16r05
+ 16r90 16r71 16r3A
+ 16rC0 16rC0 16rC0
+ 16r80 16r80 16r80
+ 16r40 16r40 16r40
+ 16r00 16r00 16r00)
!
colormap8
^ #(
- (16rFF 16rFF 16rFF)
- (16rFF 16rFF 16rCC)
- (16rFF 16rFF 16r99)
- (16rFF 16rFF 16r66)
- (16rFF 16rFF 16r33)
- (16rFF 16rFF 16r00)
- (16rFF 16rCC 16rFF)
- (16rFF 16rCC 16rCC)
- (16rFF 16rCC 16r99)
- (16rFF 16rCC 16r66)
- (16rFF 16rCC 16r33)
- (16rFF 16rCC 16r00)
- (16rFF 16r99 16rFF)
- (16rFF 16r99 16rCC)
- (16rFF 16r99 16r99)
- (16rFF 16r99 16r66)
- (16rFF 16r99 16r33)
- (16rFF 16r99 16r00)
- (16rFF 16r66 16rFF)
- (16rFF 16r66 16rCC)
- (16rFF 16r66 16r99)
- (16rFF 16r66 16r66)
- (16rFF 16r66 16r33)
- (16rFF 16r66 16r00)
- (16rFF 16r33 16rFF)
- (16rFF 16r33 16rCC)
- (16rFF 16r33 16r99)
- (16rFF 16r33 16r66)
- (16rFF 16r33 16r33)
- (16rFF 16r33 16r00)
- (16rFF 16r00 16rFF)
- (16rFF 16r00 16rCC)
- (16rFF 16r00 16r99)
- (16rFF 16r00 16r66)
- (16rFF 16r00 16r33)
- (16rFF 16r00 16r00)
- (16rCC 16rFF 16rFF)
- (16rCC 16rFF 16rCC)
- (16rCC 16rFF 16r99)
- (16rCC 16rFF 16r66)
- (16rCC 16rFF 16r33)
- (16rCC 16rFF 16r00)
- (16rCC 16rCC 16rFF)
- (16rCC 16rCC 16rCC)
- (16rCC 16rCC 16r99)
- (16rCC 16rCC 16r66)
- (16rCC 16rCC 16r33)
- (16rCC 16rCC 16r00)
- (16rCC 16r99 16rFF)
- (16rCC 16r99 16rCC)
- (16rCC 16r99 16r99)
- (16rCC 16r99 16r66)
- (16rCC 16r99 16r33)
- (16rCC 16r99 16r00)
- (16rCC 16r66 16rFF)
- (16rCC 16r66 16rCC)
- (16rCC 16r66 16r99)
- (16rCC 16r66 16r66)
- (16rCC 16r66 16r33)
- (16rCC 16r66 16r00)
- (16rCC 16r33 16rFF)
- (16rCC 16r33 16rCC)
- (16rCC 16r33 16r99)
- (16rCC 16r33 16r66)
- (16rCC 16r33 16r33)
- (16rCC 16r33 16r00)
- (16rCC 16r00 16rFF)
- (16rCC 16r00 16rCC)
- (16rCC 16r00 16r99)
- (16rCC 16r00 16r66)
- (16rCC 16r00 16r33)
- (16rCC 16r00 16r00)
- (16r99 16rFF 16rFF)
- (16r99 16rFF 16rCC)
- (16r99 16rFF 16r99)
- (16r99 16rFF 16r66)
- (16r99 16rFF 16r33)
- (16r99 16rFF 16r00)
- (16r99 16rCC 16rFF)
- (16r99 16rCC 16rCC)
- (16r99 16rCC 16r99)
- (16r99 16rCC 16r66)
- (16r99 16rCC 16r33)
- (16r99 16rCC 16r00)
- (16r99 16r99 16rFF)
- (16r99 16r99 16rCC)
- (16r99 16r99 16r99)
- (16r99 16r99 16r66)
- (16r99 16r99 16r33)
- (16r99 16r99 16r00)
- (16r99 16r66 16rFF)
- (16r99 16r66 16rCC)
- (16r99 16r66 16r99)
- (16r99 16r66 16r66)
- (16r99 16r66 16r33)
- (16r99 16r66 16r00)
- (16r99 16r33 16rFF)
- (16r99 16r33 16rCC)
- (16r99 16r33 16r99)
- (16r99 16r33 16r66)
- (16r99 16r33 16r33)
- (16r99 16r33 16r00)
- (16r99 16r00 16rFF)
- (16r99 16r00 16rCC)
- (16r99 16r00 16r99)
- (16r99 16r00 16r66)
- (16r99 16r00 16r33)
- (16r99 16r00 16r00)
- (16r66 16rFF 16rFF)
- (16r66 16rFF 16rCC)
- (16r66 16rFF 16r99)
- (16r66 16rFF 16r66)
- (16r66 16rFF 16r33)
- (16r66 16rFF 16r00)
- (16r66 16rCC 16rFF)
- (16r66 16rCC 16rCC)
- (16r66 16rCC 16r99)
- (16r66 16rCC 16r66)
- (16r66 16rCC 16r33)
- (16r66 16rCC 16r00)
- (16r66 16r99 16rFF)
- (16r66 16r99 16rCC)
- (16r66 16r99 16r99)
- (16r66 16r99 16r66)
- (16r66 16r99 16r33)
- (16r66 16r99 16r00)
- (16r66 16r66 16rFF)
- (16r66 16r66 16rCC)
- (16r66 16r66 16r99)
- (16r66 16r66 16r66)
- (16r66 16r66 16r33)
- (16r66 16r66 16r00)
- (16r66 16r33 16rFF)
- (16r66 16r33 16rCC)
- (16r66 16r33 16r99)
- (16r66 16r33 16r66)
- (16r66 16r33 16r33)
- (16r66 16r33 16r00)
- (16r66 16r00 16rFF)
- (16r66 16r00 16rCC)
- (16r66 16r00 16r99)
- (16r66 16r00 16r66)
- (16r66 16r00 16r33)
- (16r66 16r00 16r00)
- (16r33 16rFF 16rFF)
- (16r33 16rFF 16rCC)
- (16r33 16rFF 16r99)
- (16r33 16rFF 16r66)
- (16r33 16rFF 16r33)
- (16r33 16rFF 16r00)
- (16r33 16rCC 16rFF)
- (16r33 16rCC 16rCC)
- (16r33 16rCC 16r99)
- (16r33 16rCC 16r66)
- (16r33 16rCC 16r33)
- (16r33 16rCC 16r00)
- (16r33 16r99 16rFF)
- (16r33 16r99 16rCC)
- (16r33 16r99 16r99)
- (16r33 16r99 16r66)
- (16r33 16r99 16r33)
- (16r33 16r99 16r00)
- (16r33 16r66 16rFF)
- (16r33 16r66 16rCC)
- (16r33 16r66 16r99)
- (16r33 16r66 16r66)
- (16r33 16r66 16r33)
- (16r33 16r66 16r00)
- (16r33 16r33 16rFF)
- (16r33 16r33 16rCC)
- (16r33 16r33 16r99)
- (16r33 16r33 16r66)
- (16r33 16r33 16r33)
- (16r33 16r33 16r00)
- (16r33 16r00 16rFF)
- (16r33 16r00 16rCC)
- (16r33 16r00 16r99)
- (16r33 16r00 16r66)
- (16r33 16r00 16r33)
- (16r33 16r00 16r00)
- (16r00 16rFF 16rFF)
- (16r00 16rFF 16rCC)
- (16r00 16rFF 16r99)
- (16r00 16rFF 16r66)
- (16r00 16rFF 16r33)
- (16r00 16rFF 16r00)
- (16r00 16rCC 16rFF)
- (16r00 16rCC 16rCC)
- (16r00 16rCC 16r99)
- (16r00 16rCC 16r66)
- (16r00 16rCC 16r33)
- (16r00 16rCC 16r00)
- (16r00 16r99 16rFF)
- (16r00 16r99 16rCC)
- (16r00 16r99 16r99)
- (16r00 16r99 16r66)
- (16r00 16r99 16r33)
- (16r00 16r99 16r00)
- (16r00 16r66 16rFF)
- (16r00 16r66 16rCC)
- (16r00 16r66 16r99)
- (16r00 16r66 16r66)
- (16r00 16r66 16r33)
- (16r00 16r66 16r00)
- (16r00 16r33 16rFF)
- (16r00 16r33 16rCC)
- (16r00 16r33 16r99)
- (16r00 16r33 16r66)
- (16r00 16r33 16r33)
- (16r00 16r33 16r00)
- (16r00 16r00 16rFF)
- (16r00 16r00 16rCC)
- (16r00 16r00 16r99)
- (16r00 16r00 16r66)
- (16r00 16r00 16r33)
- (16rEE 16r00 16r00)
- (16rDD 16r00 16r00)
- (16rBB 16r00 16r00)
- (16rAA 16r00 16r00)
- (16r88 16r00 16r00)
- (16r77 16r00 16r00)
- (16r55 16r00 16r00)
- (16r44 16r00 16r00)
- (16r22 16r00 16r00)
- (16r11 16r00 16r00)
- (16r00 16rEE 16r00)
- (16r00 16rDD 16r00)
- (16r00 16rBB 16r00)
- (16r00 16rAA 16r00)
- (16r00 16r88 16r00)
- (16r00 16r77 16r00)
- (16r00 16r55 16r00)
- (16r00 16r44 16r00)
- (16r00 16r22 16r00)
- (16r00 16r11 16r00)
- (16r00 16r00 16rEE)
- (16r00 16r00 16rDD)
- (16r00 16r00 16rBB)
- (16r00 16r00 16rAA)
- (16r00 16r00 16r88)
- (16r00 16r00 16r77)
- (16r00 16r00 16r55)
- (16r00 16r00 16r44)
- (16r00 16r00 16r22)
- (16r00 16r00 16r11)
- (16rEE 16rEE 16rEE)
- (16rDD 16rDD 16rDD)
- (16rBB 16rBB 16rBB)
- (16rAA 16rAA 16rAA)
- (16r88 16r88 16r88)
- (16r77 16r77 16r77)
- (16r55 16r55 16r55)
- (16r44 16r44 16r44)
- (16r22 16r22 16r22)
- (16r11 16r11 16r11)
- (16r00 16r00 16r00)
- )
+ 16rFF 16rFF 16rFF
+ 16rFF 16rFF 16rCC
+ 16rFF 16rFF 16r99
+ 16rFF 16rFF 16r66
+ 16rFF 16rFF 16r33
+ 16rFF 16rFF 16r00
+ 16rFF 16rCC 16rFF
+ 16rFF 16rCC 16rCC
+ 16rFF 16rCC 16r99
+ 16rFF 16rCC 16r66
+ 16rFF 16rCC 16r33
+ 16rFF 16rCC 16r00
+ 16rFF 16r99 16rFF
+ 16rFF 16r99 16rCC
+ 16rFF 16r99 16r99
+ 16rFF 16r99 16r66
+ 16rFF 16r99 16r33
+ 16rFF 16r99 16r00
+ 16rFF 16r66 16rFF
+ 16rFF 16r66 16rCC
+ 16rFF 16r66 16r99
+ 16rFF 16r66 16r66
+ 16rFF 16r66 16r33
+ 16rFF 16r66 16r00
+ 16rFF 16r33 16rFF
+ 16rFF 16r33 16rCC
+ 16rFF 16r33 16r99
+ 16rFF 16r33 16r66
+ 16rFF 16r33 16r33
+ 16rFF 16r33 16r00
+ 16rFF 16r00 16rFF
+ 16rFF 16r00 16rCC
+ 16rFF 16r00 16r99
+ 16rFF 16r00 16r66
+ 16rFF 16r00 16r33
+ 16rFF 16r00 16r00
+ 16rCC 16rFF 16rFF
+ 16rCC 16rFF 16rCC
+ 16rCC 16rFF 16r99
+ 16rCC 16rFF 16r66
+ 16rCC 16rFF 16r33
+ 16rCC 16rFF 16r00
+ 16rCC 16rCC 16rFF
+ 16rCC 16rCC 16rCC
+ 16rCC 16rCC 16r99
+ 16rCC 16rCC 16r66
+ 16rCC 16rCC 16r33
+ 16rCC 16rCC 16r00
+ 16rCC 16r99 16rFF
+ 16rCC 16r99 16rCC
+ 16rCC 16r99 16r99
+ 16rCC 16r99 16r66
+ 16rCC 16r99 16r33
+ 16rCC 16r99 16r00
+ 16rCC 16r66 16rFF
+ 16rCC 16r66 16rCC
+ 16rCC 16r66 16r99
+ 16rCC 16r66 16r66
+ 16rCC 16r66 16r33
+ 16rCC 16r66 16r00
+ 16rCC 16r33 16rFF
+ 16rCC 16r33 16rCC
+ 16rCC 16r33 16r99
+ 16rCC 16r33 16r66
+ 16rCC 16r33 16r33
+ 16rCC 16r33 16r00
+ 16rCC 16r00 16rFF
+ 16rCC 16r00 16rCC
+ 16rCC 16r00 16r99
+ 16rCC 16r00 16r66
+ 16rCC 16r00 16r33
+ 16rCC 16r00 16r00
+ 16r99 16rFF 16rFF
+ 16r99 16rFF 16rCC
+ 16r99 16rFF 16r99
+ 16r99 16rFF 16r66
+ 16r99 16rFF 16r33
+ 16r99 16rFF 16r00
+ 16r99 16rCC 16rFF
+ 16r99 16rCC 16rCC
+ 16r99 16rCC 16r99
+ 16r99 16rCC 16r66
+ 16r99 16rCC 16r33
+ 16r99 16rCC 16r00
+ 16r99 16r99 16rFF
+ 16r99 16r99 16rCC
+ 16r99 16r99 16r99
+ 16r99 16r99 16r66
+ 16r99 16r99 16r33
+ 16r99 16r99 16r00
+ 16r99 16r66 16rFF
+ 16r99 16r66 16rCC
+ 16r99 16r66 16r99
+ 16r99 16r66 16r66
+ 16r99 16r66 16r33
+ 16r99 16r66 16r00
+ 16r99 16r33 16rFF
+ 16r99 16r33 16rCC
+ 16r99 16r33 16r99
+ 16r99 16r33 16r66
+ 16r99 16r33 16r33
+ 16r99 16r33 16r00
+ 16r99 16r00 16rFF
+ 16r99 16r00 16rCC
+ 16r99 16r00 16r99
+ 16r99 16r00 16r66
+ 16r99 16r00 16r33
+ 16r99 16r00 16r00
+ 16r66 16rFF 16rFF
+ 16r66 16rFF 16rCC
+ 16r66 16rFF 16r99
+ 16r66 16rFF 16r66
+ 16r66 16rFF 16r33
+ 16r66 16rFF 16r00
+ 16r66 16rCC 16rFF
+ 16r66 16rCC 16rCC
+ 16r66 16rCC 16r99
+ 16r66 16rCC 16r66
+ 16r66 16rCC 16r33
+ 16r66 16rCC 16r00
+ 16r66 16r99 16rFF
+ 16r66 16r99 16rCC
+ 16r66 16r99 16r99
+ 16r66 16r99 16r66
+ 16r66 16r99 16r33
+ 16r66 16r99 16r00
+ 16r66 16r66 16rFF
+ 16r66 16r66 16rCC
+ 16r66 16r66 16r99
+ 16r66 16r66 16r66
+ 16r66 16r66 16r33
+ 16r66 16r66 16r00
+ 16r66 16r33 16rFF
+ 16r66 16r33 16rCC
+ 16r66 16r33 16r99
+ 16r66 16r33 16r66
+ 16r66 16r33 16r33
+ 16r66 16r33 16r00
+ 16r66 16r00 16rFF
+ 16r66 16r00 16rCC
+ 16r66 16r00 16r99
+ 16r66 16r00 16r66
+ 16r66 16r00 16r33
+ 16r66 16r00 16r00
+ 16r33 16rFF 16rFF
+ 16r33 16rFF 16rCC
+ 16r33 16rFF 16r99
+ 16r33 16rFF 16r66
+ 16r33 16rFF 16r33
+ 16r33 16rFF 16r00
+ 16r33 16rCC 16rFF
+ 16r33 16rCC 16rCC
+ 16r33 16rCC 16r99
+ 16r33 16rCC 16r66
+ 16r33 16rCC 16r33
+ 16r33 16rCC 16r00
+ 16r33 16r99 16rFF
+ 16r33 16r99 16rCC
+ 16r33 16r99 16r99
+ 16r33 16r99 16r66
+ 16r33 16r99 16r33
+ 16r33 16r99 16r00
+ 16r33 16r66 16rFF
+ 16r33 16r66 16rCC
+ 16r33 16r66 16r99
+ 16r33 16r66 16r66
+ 16r33 16r66 16r33
+ 16r33 16r66 16r00
+ 16r33 16r33 16rFF
+ 16r33 16r33 16rCC
+ 16r33 16r33 16r99
+ 16r33 16r33 16r66
+ 16r33 16r33 16r33
+ 16r33 16r33 16r00
+ 16r33 16r00 16rFF
+ 16r33 16r00 16rCC
+ 16r33 16r00 16r99
+ 16r33 16r00 16r66
+ 16r33 16r00 16r33
+ 16r33 16r00 16r00
+ 16r00 16rFF 16rFF
+ 16r00 16rFF 16rCC
+ 16r00 16rFF 16r99
+ 16r00 16rFF 16r66
+ 16r00 16rFF 16r33
+ 16r00 16rFF 16r00
+ 16r00 16rCC 16rFF
+ 16r00 16rCC 16rCC
+ 16r00 16rCC 16r99
+ 16r00 16rCC 16r66
+ 16r00 16rCC 16r33
+ 16r00 16rCC 16r00
+ 16r00 16r99 16rFF
+ 16r00 16r99 16rCC
+ 16r00 16r99 16r99
+ 16r00 16r99 16r66
+ 16r00 16r99 16r33
+ 16r00 16r99 16r00
+ 16r00 16r66 16rFF
+ 16r00 16r66 16rCC
+ 16r00 16r66 16r99
+ 16r00 16r66 16r66
+ 16r00 16r66 16r33
+ 16r00 16r66 16r00
+ 16r00 16r33 16rFF
+ 16r00 16r33 16rCC
+ 16r00 16r33 16r99
+ 16r00 16r33 16r66
+ 16r00 16r33 16r33
+ 16r00 16r33 16r00
+ 16r00 16r00 16rFF
+ 16r00 16r00 16rCC
+ 16r00 16r00 16r99
+ 16r00 16r00 16r66
+ 16r00 16r00 16r33
+ 16rEE 16r00 16r00
+ 16rDD 16r00 16r00
+ 16rBB 16r00 16r00
+ 16rAA 16r00 16r00
+ 16r88 16r00 16r00
+ 16r77 16r00 16r00
+ 16r55 16r00 16r00
+ 16r44 16r00 16r00
+ 16r22 16r00 16r00
+ 16r11 16r00 16r00
+ 16r00 16rEE 16r00
+ 16r00 16rDD 16r00
+ 16r00 16rBB 16r00
+ 16r00 16rAA 16r00
+ 16r00 16r88 16r00
+ 16r00 16r77 16r00
+ 16r00 16r55 16r00
+ 16r00 16r44 16r00
+ 16r00 16r22 16r00
+ 16r00 16r11 16r00
+ 16r00 16r00 16rEE
+ 16r00 16r00 16rDD
+ 16r00 16r00 16rBB
+ 16r00 16r00 16rAA
+ 16r00 16r00 16r88
+ 16r00 16r00 16r77
+ 16r00 16r00 16r55
+ 16r00 16r00 16r44
+ 16r00 16r00 16r22
+ 16r00 16r00 16r11
+ 16rEE 16rEE 16rEE
+ 16rDD 16rDD 16rDD
+ 16rBB 16rBB 16rBB
+ 16rAA 16rAA 16rAA
+ 16r88 16r88 16r88
+ 16r77 16r77 16r77
+ 16r55 16r55 16r55
+ 16r44 16r44 16r44
+ 16r22 16r22 16r22
+ 16r11 16r11 16r11
+ 16r00 16r00 16r00)
!
makeImage
@@ -629,7 +627,7 @@
pixelData := (ByteArray new:256) replaceBytesWith:bytes; yourself.
img := Depth8Image width:16 height:16 fromArray:pixelData.
img photometric:#palette.
- img colorMap:(self colormap8 collect:[:triple | Color redByte:triple first greenByte:triple second blueByte:triple third]).
+ img colorMap:(Colormap rgbBytesVector:self colormap8).
^ img
"
@@ -745,11 +743,11 @@
!MacOSXIconReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/MacOSXIconReader.st,v 1.3 2013-05-06 18:25:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/MacOSXIconReader.st,v 1.4 2013-05-06 18:28:14 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview2/MacOSXIconReader.st,v 1.3 2013-05-06 18:25:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/MacOSXIconReader.st,v 1.4 2013-05-06 18:28:14 cg Exp $'
! !