TYPO3 Core

Sometimes it's nice to put a smaller image on top of another. This version let's place the smaller image via IM geometry:

function combineExec($input,$overlay,$mask,$output,$geometry='') {
if (!$this->NO_IMAGE_MAGICK) {
if ($geometry) {
$geometry = '-geometry '.$geometry;
}
$cmd = $this->imageMagickPath.$this->combineScript.' compose over '.$geometry.' -quality '.intval($gfxConf['im_jpg_quality']).' '.$this>wrapFileName($input).' '.$this->wrapFileName($overlay).' '.$this->wrapFileName($mask).' '.$this->wrapFileName($output);
$this->IM_commands[] = Array ($output,$cmd);

$ret = exec($cmd);
    t3lib_div::fixPermissions($this->wrapFileName($output));        // Change the permissions of the file

return $ret;
  }
}

(issue imported from #M1139)