--- class.t3lib_stdgraphic.php.old 2006-09-11 07:18:01.000000000 +0000 +++ class.t3lib_stdgraphic.php 2006-11-02 22:09:46.630844250 +0000 @@ -822,11 +822,11 @@ $this->map.=''; } @@ -2191,25 +2191,23 @@ 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; - } + $command = '-crop '. + $data['0']. + 'x'.$data['1']. + '+'.(intval(($data['0']-$data['origW'])/2)+round((intval(($data['0']-$data['origW'])/2)/100)*$data['cropH'])). + '+'.(intval(($data['1']-$data['origH'])/2)+round((intval(($data['1']-$data['origH'])/2)/100)*$data['cropV'])). + ' '.$params; + $this->imageMagickExec($crsOutput, $crsOutput, $command); + $command = '-crop '. + ($data['0']-intval(($data['0']-$data['origW'])/2)-round((intval(($data['0']-$data['origW'])/2)/100)*$data['cropH'])). + 'x'.($data['1']-intval(($data['1']-$data['origH'])/2)-round((intval(($data['1']-$data['origH'])/2)/100)*$data['cropV'])). + '-'.(intval(($data['0']-$data['origW'])/2)-round((intval(($data['0']-$data['origW'])/2)/100)*$data['cropH'])). + '-'.(intval(($data['1']-$data['origH'])/2)-round((intval(($data['1']-$data['origH'])/2)/100)*$data['cropV'])). + ' '.$params; + $this->imageMagickExec($crsOutput, $crsOutput, $command); + $output = $crsOutput; + $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);