--- loncom/homework/randomlylabel.pm	2003/01/23 18:26:10	1.5
+++ loncom/homework/randomlylabel.pm	2003/05/13 19:08:31	1.9
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.5 2003/01/23 18:26:10 www Exp $
+# $Id: randomlylabel.pm,v 1.9 2003/05/13 19:08:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,9 +47,10 @@ sub get_image {
 	undef $conv_image;
 	$image = GD::Image->new($blobs[0]);
     } else {
+	GD::Image->trueColor(1);
 	$image = GD::Image->new($imgsrc);
     }
-    if ($set_trans) {
+    if ($set_trans && defined($image)) {
 	my $white=$image->colorExact(255,255,255);
 	if ($white != -1) { $image->transparent($white); }
     }
@@ -62,17 +63,25 @@ sub handler {
     my (undef,$token) = split(/=/,$ENV{'QUERY_STRING'});
     &Apache::loncommon::get_unprocessed_cgi(
                &Apache::lonnet::unescape($ENV{'imagerequest.'.$token}));
-    &Apache::lonnet::delenv('imagerequest\.'.$token);
     my $image=&get_image($ENV{"form.BGIMG"},0);
     if (! defined($image)) {
-        &Apache::lonnet::logthis('Unable to create image object for '.$ENV{"form.BGIMG"});
+        &Apache::lonnet::logthis('Unable to create image object for '.
+				 $ENV{"form.BGIMG"});
         return OK;
     }
     #binmode(STDOUT);
-    my $black = $image->colorAllocate(0,0,0);
+    my $black;
+    if (!($black=$image->colorResolve(0,0,0))) {
+	$black = $image->colorClosestHWB(0,0,0);
+    }
     for(my $i=0;$i<$ENV{"form.ICOUNT"};$i++) {
 	my $subimage=&get_image($ENV{"form.IMG$i"},1);
-	$image->copy($subimage,$ENV{"form.X$i"},$ENV{"form.Y$i"},
+	if (!defined($subimage)) {
+            &Apache::lonnet::logthis('Unable to create image object for '.
+                                 $ENV{"form.BGIMG"});
+            next;
+        }
+	$image->copy($subimage,$ENV{"form.IX$i"},$ENV{"form.IY$i"},
 		     0,0,$subimage->getBounds());
     }
     my $height=GD::Font->Giant->height;