wait #3966 @1

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 20ae31f7a67801a7054d93abeec84e2ef406813d..82ac6761b00375d7404a8073f899519af2abbafa 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -369,7 +369,7 @@ class wsFlash extends cubeFlashGateway
         $docs = array();
         $defaultNum = array();
         foreach ($pages as $page => $info) {
-            $book->getFile($page, 'jpg', 150, true, true);
+            $book->getFile($page, 'swf', 150);
             $file = WS_DOCS . '/' . $info['document_id'] . '/p' . $info['document_page'] . '.jpg';
             if (!file_exists($file)) {
                 $info['resolution'] = 150;

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 21981f9a91458a18781d244d89f0e6c810690c25..828838a95396eab4c94c912b260ac8d7f8dee19c 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -391,6 +391,8 @@ class wsDocument extends cubeMetier
         }
         if ($format === 'svg') {
             $version = 'html';
+        } else if ($format === 'swf') {
+            $version = '';
         }
 
         if ($resolution === 'thumb') {
@@ -418,11 +420,13 @@ class wsDocument extends cubeMetier
                 $file = $dir . $prefix . $page . '-' . $resolution . '.' . $format;
                 $alt = $dir . $prefix . $resolution . '-' . $page . '.' . $format;
             }
+        } else if ($format === 'swf') {
+            $file = $dir . 'p' . $page . '.' . $format;
         }
 
         $do = false;
         if (!file_exists($file)) {
-            if (isset($alt) && file_exists($alt) && filesize($alt)>$minsize) {
+            if (isset($alt) && file_exists($alt) && filesize($alt) > $minsize) {
                 rename($alt, $file);
                 $do = false;
             } else {
@@ -464,6 +468,8 @@ class wsDocument extends cubeMetier
                 $rr = $version === 'html' ? $this->getResolutionRatio() : $this->getMobileFirstRatio();
                 wsPDFConvert::makeShotPNM($this->getSplittedPDFPage($page), $file, 1, '', $resolution * $rr, 85, 4, $withText, null, null, $format);
             }
+        } else if ($format === 'swf') {
+            wsPDFConvert::makeSWF($this->getSplittedPDFPage($page), $file, 1, $resolution, 80);
         }
         unlink($lock);
     }
@@ -497,7 +503,7 @@ class wsDocument extends cubeMetier
             // Thumb for composition panel
             $this->makeMiniShot($page);
             // Image for link editor
-            $this->getFile($page, 'jpg', 150, true, true);
+            $this->getFile($page,'swf');
             // Make SVG base file
             $this->makeSVGFile($page, false);
         }

diff --git a/inc/ws/Util/class.ws.pdf.convert.php b/inc/ws/Util/class.ws.pdf.convert.php
index c88871bd9adc7542401675e4cff8c5d7ddfc14a7..03f763fa626fd4528a0eb5489e172da82a53840d 100644 (file)
--- a/inc/ws/Util/class.ws.pdf.convert.php
+++ b/inc/ws/Util/class.ws.pdf.convert.php
@@ -26,6 +26,29 @@ class wsPDFConvert
         self::makeShot($in, $out, $page, $prefix, null, $quality, $antialiasing, $method, -1, $h, $format);\r
     }\r
 \r
+    public static function makeSWF($in, $out, $page, $resolution = 150, $quality = 90)\r
+    {\r
+\r
+        $pdf2swf = new CubeIT_CommandLine('/usr/local/swftools/latest/bin/pdf2swf', null, true);\r
+        $pdf2swf->setPath(CONVERTER_PATH);\r
+        $pdf2swf->setArg('p', $page);\r
+        $pdf2swf->setArg('set poly2bitmap');\r
+        $pdf2swf->setArg('set multiply', 1);\r
+        $pdf2swf->setArg('T', 10);\r
+        $pdf2swf->setArg('set reordertags', '0');\r
+        $pdf2swf->setArg('fonts');\r
+        $pdf2swf->setArg('set storeallcharacters');\r
+        $pdf2swf->setArg('set subpixels', $resolution / 72);\r
+        $pdf2swf->setArg('set jpegquality', $quality);\r
+        $pdf2swf->setArg('set disablelinks');\r
+        $pdf2swf->setArg('set dots');\r
+        $pdf2swf->setArg(null, $in);\r
+        $pdf2swf->setArg('output', $out);\r
+        $pdf2swf->execute();\r
+        $pdf2swf->debug();\r
+    }\r
+\r
+\r
     public static function makeBaseSVGFile($in, $out, $page)\r
     {\r
         $pdftocairo = new CubeIT_CommandLine('pdftocairo');\r
@@ -40,7 +63,8 @@ class wsPDFConvert
         $pdftocairo->execute();\r
     }\r
 \r
-    public static function makeTextSVGFile($in,$out){\r
+    public static function makeTextSVGFile($in, $out)\r
+    {\r
         $svg = new DOMDocument();\r
         $svg->preserveWhiteSpace = false;\r
         $svg->load($in, LIBXML_PARSEHUGE);\r