Added support for imagemagick and the jpg_quality setting

Ignore-this: 4288b6329527a4069e0fd485e3cdbfdf

darcs-hash:20090608200830-7ad00-2fdc8009e320eeef2ee3194591bde7774d8d394f.gz

Author: splitbrain

tiles.php

@@ -45,7 +45,11 @@
 
     // (re)generate
     if( ($data['cachet'] < $data['mtime']) || ($data['cachet'] < $data['selft']) ){
-        tile_gd($data);
+        if($conf['im_convert']){
+            tile_im($data);
+        }else{
+            tile_gd($data);
+        }
     }
 
     // send
@@ -61,6 +65,8 @@
 
 
 function tile_gd($d){
+    global $conf;
+
     $img = null;
     if(preg_match('/\.jpe?g$/',$d['file'])){
         $img   = @imagecreatefromjpeg($d['file']);
@@ -77,10 +83,33 @@ function tile_gd($d){
     $scale = image_scale($crop,abs($d['brx'] - $d['tlx']),abs($d['bry'] - $d['tly']),$d['ts'],$d['ts']);
     imagedestroy($crop);
 
-    imagejpeg($scale,$d['cache']);
+    imagejpeg($scale,$d['cache'],$conf['jpg_quality']);
     imagedestroy($scale);
+
+    if($conf['fperm']) chmod($d['cache'], $conf['fperm']);
 }
 
+function tile_im($d){
+    global $conf;
+
+    $cmd  = $conf['im_convert'];
+    $cmd .= ' '.escapeshellarg($d['file']);
+    $cmd .= ' -crop '.abs($d['brx'] - $d['tlx']).'x'.abs($d['bry'] - $d['tly']).'!+'.$d['tlx'].'+'.$d['tly'];
+
+    $cmd .= ' -resize '.$d['ts'].'x'.$d['ts'].'!';
+
+    $cmd .= ' -quality '.$conf['jpg_quality'];
+    $cmd .= ' '.escapeshellarg($d['cache']);
+
+    #dbg($cmd); exit;
+
+    @exec($cmd,$out,$retval);
+    if ($retval == 0) return true;
+    gfx_error('generic');
+}
+
+
+
 function image_scale($image,$x,$y,$w,$h){
     $scale=imagecreatetruecolor($w,$h);
     imagecopyresampled($scale,$image,0,0,0,0,$w,$h,$x,$y);