[BACK]Return to imageresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/imageresponse.pm between versions 1.33 and 1.34

version 1.33, 2003/08/01 14:22:07 version 1.34, 2003/08/01 15:50:43
Line 31 Line 31
 #currently  #currently
   
 package Apache::imageresponse;  package Apache::imageresponse;
   use Apache::randomlylabel;
 use strict;  use strict;
 use Image::Magick;  use Image::Magick;
 use GD;  use GD;
Line 314  sub start_image { Line 315  sub start_image {
   return $result;    return $result;
 }  }
   
 sub get_image {  
     my ($imgsrc,$set_trans)=@_;  
     my $image;  
     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');  
  my @blobs=$conv_image->ImageToBlob();  
  undef $conv_image;  
  $image = GD::Image->new($blobs[0]);  
     } else {  
  GD::Image->trueColor(1);  
  $image = GD::Image->new($imgsrc);  
     }  
     if ($set_trans && defined($image)) {  
  my $white=$image->colorExact(255,255,255);  
  if ($white != -1) { $image->transparent($white); }  
     }  
     return $image;  
 }  
   
 sub end_image {  sub end_image {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;    my $result;
Line 348  sub end_image { Line 328  sub end_image {
     my $y=$ENV{"form.HWVAL_$id:$temp.y"};      my $y=$ENV{"form.HWVAL_$id:$temp.y"};
     if (defined ($x) && defined ($y)) {      if (defined ($x) && defined ($y)) {
  &Apache::lonxml::debug("x and y defined as $x,$y");   &Apache::lonxml::debug("x and y defined as $x,$y");
  my $currentImage = &get_image('/home/httpd/html'.$image,1);   my $currentImage = &Apache::randomlylabel::get_image('/home/httpd/html'.$image,1);
  if (! defined($currentImage)) {   if (! defined($currentImage)) {
     &Apache::lonnet::logthis('Unable to create image object for '.$image);      &Apache::lonnet::logthis('Unable to create image object for '.$image);
     return '';      return '';
Removed from v.1.33  
changed lines
  Added in v.1.34

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>