--- loncom/homework/randomlylabel.pm	2003/02/27 21:30:55	1.7
+++ loncom/homework/randomlylabel.pm	2003/11/10 23:29:27	1.10
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.7 2003/02/27 21:30:55 albertel Exp $
+# $Id: randomlylabel.pm,v 1.10 2003/11/10 23:29:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@ sub get_image {
 	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); }
     }
@@ -70,10 +70,18 @@ sub handler {
         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;
@@ -81,6 +89,23 @@ sub handler {
 	$image->string(gdGiantFont,$ENV{"form.X$i"},$ENV{"form.Y$i"}-$height,
 		       $ENV{"form.LB$i"},$black);
     }
+    for(my $i=0;$i<$ENV{"form.LINECOUNT"};$i++) {
+	my $x1=$ENV{"form.LINEX1$i"};
+	my $y1=$ENV{"form.LINEY1$i"};
+	my $x2=$ENV{"form.LINEX2$i"};
+	my $y2=$ENV{"form.LINEY2$i"};
+	my $width=$ENV{"form.LINEW$i"};
+	my $color=$ENV{"form.LINEC$i"};
+	my (undef,$red,undef,$green,undef,$blue)=split(/(..)/,$color);
+	$red=hex($red);$green=hex($green);$blue=hex($blue);
+	my $imcolor;
+	if (!($imcolor = $image->colorResolve($red,$green,$blue))) {
+	    $imcolor = $image->colorClosestHWB($red,$green,$blue);
+	}
+	$image->setThickness($width);
+       	$image->line($x1,$y1,$x2,$y2,$imcolor);
+    }
+    $image->setThickness(1);
     $r->print($image->png);
     return OK;
 }