--- loncom/homework/randomlylabel.pm	2002/12/16 14:41:15	1.4
+++ loncom/homework/randomlylabel.pm	2003/02/26 18:49:58	1.6
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.4 2002/12/16 14:41:15 matthew Exp $
+# $Id: randomlylabel.pm,v 1.6 2003/02/26 18:49:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,7 +39,7 @@ use GD;
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
     my $image;
-    if ($imgsrc !~ /\.(png|jpg|jpeg)$/) {
+    if ($imgsrc !~ /\.(png|jpg|jpeg)$/i) {
 	my $conv_image = Image::Magick->new;
 	my $current_figure = $conv_image->Read('filename'=>$imgsrc);
 	$conv_image->Set('magick'=>'png');
@@ -47,6 +47,7 @@ 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) {
@@ -62,10 +63,10 @@ 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);
@@ -81,6 +82,7 @@ sub handler {
 		       $ENV{"form.LB$i"},$black);
     }
     $r->print($image->png);
+    &Apache::lonnet::delenv('imagerequest\.'.$token);
     return OK;
 }