--- class.t3lib_stdgraphic.php.old	2006-09-11 07:18:01.000000000 +0000
+++ class.t3lib_stdgraphic.php	2006-11-02 22:52:55.959987500 +0000
@@ -822,11 +822,11 @@
 
 		$this->map.='<area'.
 				' shape="poly"'.
-				' coords="'.implode(',',$cords).'"'.
-				' href="'.htmlspecialchars($conf['url']).'"'.
-				($conf['target'] ? ' target="'.htmlspecialchars($conf['target']).'"' : '').
+				' coords="'.implode(',',$cords).'" '.
+				' href="'.htmlspecialchars($conf['url']).'" '.
+				($conf['target'] ? ' target="'.htmlspecialchars($conf['target']).'" ' : '').
 				$JS.
-				(strlen($conf['titleText']) ? ' title="'.htmlspecialchars($conf['titleText']).'"' : '').
+				(strlen($conf['titleText']) ? ' title="'.htmlspecialchars($conf['titleText']).'" ' : '').
 				' alt="'.htmlspecialchars($conf['altText']).'" />';
 	}
 
@@ -2189,27 +2189,15 @@
 					// Cropscaling:
 				if ($data['crs'])	{
 					if ($this->dontCheckForExistingTempFile || !$this->file_exists_typo3temp_file($output, $imagefile))	{
-						$crsOutput = str_replace('pics/', 'pics/crs-', $output);
-						$this->imageMagickExec($imagefile.$frame, $crsOutput, $command);
-						$gifCreator = t3lib_div::makeInstance('tslib_gifbuilder');
-						$gifCreator->init();
-						if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib'] !== 0)	{
-							if (!$data['origW']) { $data['origW'] = $data[0]; }
-							if (!$data['origH']) { $data['origH'] = $data[1]; }
-							$ofX = intval(($data['origW'] - $data[0]) * ($data['cropH']+100)/200);
-							$ofY = intval(($data['origH'] - $data[1]) * ($data['cropV']+100)/200);
-							$tmpParm = Array('XY' => intval($data['origW']).','.intval($data['origH']),
-									'10' => 'IMAGE',
-									'10.' => array('file'=> $crsOutput, 'offset'=> $ofX.','.$ofY),
-							);
-							$gifCreator->start($tmpParm, array());
-							$newoutput = $gifCreator->gifBuild();
-							if (!copy($newoutput,$output)) {
-								$output = $newoutput;
-							}
-						} else {
-							$output = $crsOutput;
-						}
+						$this->imageMagickExec($imagefile.$frame, $output, $command);
+						if(!$data['origW']) $data['origW']=$data[0];
+						if(!$data['origH']) $data['origH']=$data[1];
+						$ofX = intval(($info[0] - $data['origW'])/2*(($data['cropH']+100)/200));
+						$ofY = intval(($info[1] - $data['origH'])/2*(($data['cropV']+100)/200));
+						$command = '-crop '.$data['origW'].'x'.$data['origH'].'+'.$ofX.'+'.$ofY;
+						$this->imageMagickExec($output, $output, $command);
+						$info=$this->getImageDimensions($output);
+						$data = $this->getImageScale($info,$w,$h,$options);
 					}
 				} elseif ($this->dontCheckForExistingTempFile || !$this->file_exists_typo3temp_file($output,$imagefile)) {
 					$this->imageMagickExec($imagefile.$frame,$output,$command);