From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 8 Mar 2011 18:03:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9777527626c117abc1037759b5eee0b2e75a3640;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 5d99a4564..5e52dbc8e 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -372,6 +372,7 @@ class wsDocument extends cubeMetier {
 			$this->addToLog('Processing page #' . $page);
 			$this->makeMiniShot($page);
 			$this->makeSWFFiles($page);
+			$this->makeHTML5Files($page);
 		}
 	}
 
@@ -625,11 +626,23 @@ class wsDocument extends cubeMetier {
 		}
 	}
 
+	public function makeHTML5Files($page)
+	{
+		// First, make swf with polytobitmap to rasterize bitmap & vectors
+		$this->pdf2swf($page, 150, 90, true, self::POLY2BITMAP, 'h');
+		$dump = $this->dumpSWF($page, 'h');
+		// Analyse du dump
+		$fonts = array();
+
+		$lines = explode("\n", $dump);
+		foreach($lines as $line) {
+		}
+	}
+
 	protected function checkObjectsNumber($file, $maxObjects, $page)
 	{
 		$swfdump = new cubeCommandLine('swfdump', null, true);
 		$swfdump->setPath(CONVERTER_PATH);
-		$swfdump->setArg('t');
 		$swfdump->setArg(null, $file);
 		$swfdump->execute();
 		$this->addToLog($swfdump, true, $page);
@@ -641,6 +654,19 @@ class wsDocument extends cubeMetier {
 		return false;
 	}
 
+	protected function dumpSWF($page, $prefix = 'p')
+	{
+		$swfdump = new cubeCommandLine('swfdump', null, true);
+		$swfdump->setPath(CONVERTER_PATH);
+		$swfdump->setArg('t');
+		$swfdump->setArg('p');
+		$swfdump->setArg('F');
+		$swfdump->setArg(null, $this->out . $prefix . $page . '.swf');
+		$swfdump->execute();
+		$this->addToLog($swfdump, true, $page);
+		return $swfdump->output;
+	}
+
 	/**
 	 * wsDocument::pdf2swf()
 	 *
@@ -651,7 +677,7 @@ class wsDocument extends cubeMetier {
 	 * @param integer $method
 	 * @return
 	 */
-	protected function pdf2swf($page , $resolution = 150, $quality = 90, $storeAllChars = true, $method = 0)
+	protected function pdf2swf($page , $resolution = 150, $quality = 90, $storeAllChars = true, $method = 0, $prefix = 'p')
 	{
 		/*
 -h , --help                    Print short help message and exit
@@ -725,8 +751,8 @@ splinequality=<value>       Set the quality of spline convertion to value (0-100
 disablelinks                Disable links.
 	*/
 
-		if (file_exists($this->out . 'p' . $page . '.swf')) {
-			unlink($this->out . 'p' . $page . '.swf');
+		if (file_exists($this->out . $prefix . $page . '.swf')) {
+			unlink($this->out . $prefix . $page . '.swf');
 		}
 
 		if ($method < self::BARBARE_PNM) {
@@ -755,7 +781,7 @@ disablelinks                Disable links.
 
 			$pdf2swf->setArg('stop');
 			// $pdf2swf->setManualArg('-v');
-			$pdf2swf->setArg('T', 9);
+			$pdf2swf->setArg('T', 10);
 			$pdf2swf->setArg('set reordertags', '0');
 			if ($storeAllChars) {
 				$pdf2swf->setArg('fonts');
@@ -770,9 +796,9 @@ disablelinks                Disable links.
 			$pdf2swf->setArg('set jpegquality', $quality);
 			$pdf2swf->setArg('set disablelinks');
 			$pdf2swf->setArg('set dots');
-
+			// $pdf2swf->setManualArg('-vvv');
 			$pdf2swf->setArg(null, $this->cropped);
-			$pdf2swf->setArg('output', $this->out . 'p%.swf');
+			$pdf2swf->setArg('output', $this->out . $prefix . '%.swf');
 			$pdf2swf->execute();
 
 			$this->addToLog($pdf2swf, true, $page);