#902 @3

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 997b8bd6cd8712ae8ed927118ece78ac65cc2ca7..385cb8ac69a7c066232425925891d64b995facd8 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -490,11 +490,19 @@ class wsDocument extends cubeMetier {
                $jpegfile = $this->out . $prefix . $page . '.jpg';
 
                if (file_exists($tmp)) {
-                       $pnmtojpeg = new cubeCommandLine('pnmtojpeg', $jpegfile, false);
-                       $pnmtojpeg->setArg('-quality ' . $quality);
-                       $pnmtojpeg->setArg(null, $tmp);
-                       $pnmtojpeg->execute();
-                       $this->addToLog($pnmtojpeg, false, $page);
+                       //                      $pnmtojpeg = new cubeCommandLine('pnmtojpeg', $jpegfile, false);
+                       //                      $pnmtojpeg->setArg('-quality ' . $quality);
+                       //                      $pnmtojpeg->setArg(null, $tmp);
+                       //                      $pnmtojpeg->execute();
+                       //                      $this->addToLog($pnmtojpeg, false, $page);
+
+
+                       $cjpeg = new cubeCommandLine('cjpeg', null, true);
+                       $cjpeg->setArg('-quality ' . ($quality + 6));
+                       $cjpeg->setArg('-outfile ' . $jpegfile);
+                       $cjpeg->setArg(null, $tmp);
+                       $cjpeg->execute();
+                       $this->addToLog($cjpeg, false, $page);
 
                        unlink($tmp);
                }
@@ -593,7 +601,7 @@ class wsDocument extends cubeMetier {
                $pdftocairo->setArg('f', $page);
                $pdftocairo->setArg('l', $page);
                $pdftocairo->setArg(null, '-svg');
-               $pdftocairo->setArg(null, '-cropbox');
+               //$pdftocairo->setArg(null, '-cropbox');
                $pdftocairo->setArg(null, $this->cropped);
                $pdftocairo->setArg(null, $svgFile);
                $pdftocairo->execute();