(no commit message)

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 5307b4b508335dbec223adacc3d823cbfffb4dc2..777e21259443128dd18ac81ef82c91c7481d3cc0 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -41,12 +41,16 @@ class wsDocument extends cubeMetier {
 \r
        const NORMAL = 0;\r
        const FLATTEN = 1;\r
+       const TEXTS_AS_SHAPES = 1.5;\r
        const POLY2BITMAP = 2;\r
        const BITMAP = 3;\r
        const BARBARE_PNM = 4;\r
        const BARBARE_GS = 5;\r
+\r
        const MAX = 5;\r
 \r
+       public static $methods = array(NORMAL, FLATTEN, TEXTS_AS_SHAPES, POLYTOBITMAP, BITMAP, BARBARE_PNM, BARBARE_GS);\r
+\r
        const PNM_FILL = 2;\r
 \r
        protected static $resolution2multiply = array(72 => 2, 100 => 2, 150 => 3, 200 => 3, 300 => 3, 450 => 4, 600 => 5);\r
@@ -619,7 +623,9 @@ class wsDocument extends cubeMetier {
                                if ($method == self::MAX) {\r
                                        return;\r
                                }\r
-                               return $this->makeSWFFiles($page, $resolution, $quality, $storeAllChars, $maxObjects, $method + 1);\r
+                               $index = array_search($method, self::$methods) + 1;\r
+                               $nextMethod = self::$methods[$index];\r
+                               return $this->makeSWFFiles($page, $resolution, $quality, $storeAllChars, $maxObjects, $nextMethod);\r
                        }\r
                }\r
        }\r
@@ -770,6 +776,9 @@ disablelinks                Disable links.
                        } elseif ($method == self::FLATTEN) {\r
                                $pdf2swf->setArg('flatten');\r
                                $multiply = 1;\r
+                       } elseif ($method == self::TEXTS_AS_SHAPES) {\r
+                               $pdf2swf->setArg('--shapes');\r
+                               $multiply = 1;\r
                        } elseif ($method == self::POLY2BITMAP) {\r
                                // Raster graphics, keep texts\r
                                $pdf2swf->setArg('set poly2bitmap');\r