--- a/Form.st	Fri Mar 07 21:25:31 1997 +0100
+++ b/Form.st	Fri Mar 07 21:26:22 1997 +0100
@@ -865,13 +865,9 @@
 colorMap:anArrayOrColorMap
     "set the receivers colormap"
 
-    (anArrayOrColorMap isKindOf:Colormap) ifFalse:[
-        localColorMap := Colormap fromColors:anArrayOrColorMap
-    ] ifTrue:[
-        localColorMap := anArrayOrColorMap
-    ]
+    localColorMap := anArrayOrColorMap
 
-    "Modified: 6.3.1997 / 15:47:35 / cg"
+    "Modified: 7.3.1997 / 21:26:11 / cg"
 !
 
 depth
@@ -1715,6 +1711,6 @@
 !Form class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.71 1997-03-06 14:47:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Form.st,v 1.72 1997-03-07 20:26:22 cg Exp $'
 ! !
 Form initialize!

--- a/Image.st	Fri Mar 07 21:25:31 1997 +0100
+++ b/Image.st	Fri Mar 07 21:26:22 1997 +0100
@@ -1668,9 +1668,6 @@
 
     colorMap := aColorMap.
     colorMap notNil ifTrue:[
-        (aColorMap isKindOf:Colormap) ifFalse:[
-            colorMap := Colormap fromColors:aColorMap
-        ].
         photometric := #palette.
     ] ifFalse:[
         (photometric == #palette) ifTrue:[
@@ -1682,7 +1679,7 @@
     ]
 
     "Modified: 31.8.1995 / 03:05:59 / claus"
-    "Modified: 6.3.1997 / 15:24:48 / cg"
+    "Modified: 7.3.1997 / 21:24:23 / cg"
 !
 
 container:aVisualContainer
@@ -9160,6 +9157,6 @@
 !Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.152 1997-03-06 14:26:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.153 1997-03-07 20:25:27 cg Exp $'
 ! !
 Image initialize!