(no commit message)

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 777e21259443128dd18ac81ef82c91c7481d3cc0..55effc796766aefe6fd64d224135b9e68cb49a12 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -41,7 +41,6 @@ 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
@@ -49,7 +48,7 @@ class wsDocument extends cubeMetier {
 \r
        const MAX = 5;\r
 \r
-       public static $methods = array(NORMAL, FLATTEN, TEXTS_AS_SHAPES, POLYTOBITMAP, BITMAP, BARBARE_PNM, BARBARE_GS);\r
+       public static $methods = array(NORMAL, FLATTEN, POLYTOBITMAP, BITMAP, BARBARE_PNM, BARBARE_GS);\r
 \r
        const PNM_FILL = 2;\r
 \r
@@ -764,7 +763,7 @@ disablelinks                Disable links.
                        unlink($this->out . $prefix . $page . '.swf');\r
                }\r
 \r
-               if ($method < self::BARBARE_PNM) {\r
+               if (!in_array($method, array(self::BARBARE_PNM, self::BARBARE_GS))) {\r
                        $pdf2swf = new cubeCommandLine('pdf2swf', null, true);\r
                        $pdf2swf->setPath(CONVERTER_PATH);\r
 \r
@@ -776,9 +775,6 @@ 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