From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 7 Nov 2016 16:59:21 +0000 (+0000)
Subject: #902 @3
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c8938996fce17726638a609388a3981efe1998e4;p=cubeextranet.git

#902 @3
---

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 997b8bd6c..385cb8ac6 100644
--- 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();