(no commit message)

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