Refactored crop

kthakore · May 27, 2011 · 035d5e4 · 035d5e4
1 parent 6641563
commit 035d5e4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/lib/WebGUI/Graphics.pm b/lib/WebGUI/Graphics.pm
@@ -142,13 +142,33 @@ sub cropRefactor {
 
         my $image = GD::Image->new($filename) || die "Couldn't read image for resizing: " . $!;
 
-        my $crop_img = GD::Image->new( $width, $height );
+        my $crop_img = GD::Image->new( $width, $height);
 
         $self->session->log->info("Resizing $filename to w:$width h:$height x:$x y:$y");
 
-        $crop_img->copy( $image, $x, $y, 0, 0, $width, $height );
-
-        my $error = write_gd( $filename, $crop_img->gd );
+        $crop_img->copy( $image, 0, 0, $x, $y, $width, $height );
+
+		my $ext = $self->getFileExtension( $filename );
+
+
+		my $error; 
+		if( $ext =~ 'png') 	
+        {
+			$self->session->log->info("Exporting png croped");
+			$error = write_gd( $filename, $crop_img->png );
+		}
+		elsif( $ext =~ /jpeg|jpg/ )
+		{	
+			 $error = write_gd( $filename, $crop_img->jpeg );
+		}
+		elsif( $ext =~ 'gif' )
+		{
+			$error = write_gd( $filename, $crop_img->gif );
+		}
+		elsif( $ext =~ 'bmp' )
+		{
+			$error = write_gd( $filename, $crop_img->wbmp );
+		}
 
         if ($error) {
             $self->session->log->error( "Couldn't resize image: " . $error );

diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm
@@ -1466,7 +1466,7 @@ sub crop {
 
 =cut 
 
-	return WebGUI::Graphics::cropRefactor( $self, $self->getPath($filename), $x, $y);
+	return WebGUI::Graphics::cropRefactor( $self, $self->getPath($filename), $width, $height, $x, $y);
 
 }