From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 17 Sep 2010 16:31:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d8a1e038fec00bd4a6c7cc6253fcc7a98162fe96;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 7ea4890fb..f131539b6 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -135,7 +135,7 @@ html{height:100%}' . "\n";
 		$dao = new wsDAOBook($core->con);
 		header('Content-type: text/plain');
 		ob_clean();
-		echo $dao->compile(2963, 3, true);
+		echo $dao->compile(2963, 3, false);
 		exit;
 	}
 
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 946e2c804..5299dd0e3 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -277,7 +277,7 @@ class wsDocument extends cubeMetier {
 		if ($force || $this) {
 			$this->makeMiniShot($page);
 			$this->makeSWFFiles($page, 150, 90, true, 1800, 1);
-			$this->makeAS3($page);
+			// $this->makeAS3($page);
 		}
 	}
 
@@ -477,7 +477,7 @@ class wsDocument extends cubeMetier {
 		// Pour les fichiers croppés, on utilise la méthode flatten qui ne prends
 		// pas en compte les objets hors de la box
 		if ($this->isCropped()) {
-			$method = max($method, self::FLATTEN);
+			// $method = max($method, self::FLATTEN);
 		}
 
 		$out = $this->pdf2swf($page, $resolution, $quality, $storeAllChars, $method);
@@ -646,8 +646,10 @@ disablelinks                Disable links.
 			$pdf2swf->setArg('stop');
 			// $pdf2swf->setManualArg('-v');
 			$pdf2swf->setArg('T', 9);
+			$pdf2swf->setArg('set reordertags', '0');
 			if ($storeAllChars) {
 				$pdf2swf->setArg('fonts');
+				$pdf2swf->setArg('set storeallcharacters');
 			}
 			if (DEV) {
 				$pdf2swf->setArg('F', 'C:/Windows/Fonts');
@@ -671,7 +673,7 @@ disablelinks                Disable links.
 
 	protected function makeAS3($page)
 	{
-		/*$swffile = $this->out . 'p' . $page . '.swf';
+		$swffile = $this->out . 'p' . $page . '.swf';
 
 		$swfcombine = new cubeCommandLine('swfcombine');
 		$swfcombine->setPath(CONVERTER_PATH);
@@ -683,7 +685,7 @@ disablelinks                Disable links.
 		$swfcombine->setArg(null, ROOT . '/swf/as3Container.swf');
 		$swfcombine->setManualArg('content=' . $swffile);
 		$swfcombine->execute();
-		$this->addToLog($swfcombine);*/
+		$this->addToLog($swfcombine);
 	}
 
 	protected function pdf2swfBarbare($page, $resolution = 150, $quality = 85, $method = 4)