(no commit message)

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 17c0d2548ec65f278b89dbdcecb73e7685ec8523..56fd31e331abb057e506bbdb736aa842c29a5453 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -935,4 +935,36 @@ class commonTools {
                return $res;
        }
 
+       public function rasterize() {
+               $type = isset($_GET['type']) ? $_GET['type'] : 'png';
+               $intype = CubeIT_Files::getExtension($src);
+
+               $src = cubeFiles::tempnam() . '.' . $intype;
+               $dest = cubeFiles::tempnam() . '.' . $type;
+
+               copy($_GET['src'], $src);
+               $scale = isset($_GET['scale']) ? $_GET['scale'] : 1;
+
+               $cl = new CubeIT_CommandLine('convert');
+               if ($intype == 'svg') {
+                       $cl->setManualArg('-background none');
+               } else if ($intype == 'pdf') {
+                       $cl->setManualArg('-density ' . (round(75 * $scale)));
+                       $cl->setManualArg('-background white');
+               }
+
+               if ($intype == 'pdf') {
+                       $cl->setArg(null, $src . '[0]');
+               } else {
+                       $cl->setArg(null, $src);
+               }
+               $cl->setArg(null, $dest);
+               $cl->execute();
+
+               echo file_get_contents($dest);
+
+               unlink($src);
+               unlink($dest);
+       }
+
 }

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 507c1d9c8865542c78973acf8d9b2a9609f50520..483eec857874638632d33bc244b9db4aab687eef 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -878,25 +878,4 @@ class wsServices extends cubeFlashGateway {
                }
        }
 
-       public function rasterizeSVG() {
-               $src = cubeFiles::tempnam() . '.svg';
-               $dest = cubeFiles::tempnam() . '.png';
-
-               copy($_GET['svg'], $src);
-
-               $cl = new CubeIT_CommandLine_Imagemagick();
-               $cl->setManualArg('-background none');
-               $cl->setSrc($src);
-               $cl->setDest($dest);
-               $cl->execute();
-
-               header('Content-type: image/png');
-               echo file_get_contents($dest);
-
-               unlink($src);
-               unlink($dest);
-       }
-
 }
-
-?>
\ No newline at end of file