(no commit message)

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index f30a700ce21352d31248fd7c3bab61b6d13528ad..a0a00b846317c968f9386e52faa2a8c2b601a2d4 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -44,6 +44,8 @@ class wsDocument extends cubeMetier {
        const BARBARE_PNM = 4;\r
        const BARBARE_GS = 5;\r
 \r
+       const PNM_FILL = 6;\r
+\r
        protected static $resolution2multiply = array(72 => 2, 100 => 2, 150 => 3, 200 => 3, 300 => 3, 450 => 4, 600 => 5);\r
        // Number section styles\r
        protected static\r
@@ -452,7 +454,7 @@ class wsDocument extends cubeMetier {
                $startpage = is_null($page)?1:$page;\r
 \r
                for($i = $startpage;true;$i++) {\r
-                       $ppmfile = $this->out . 'ppm-' . cubeMath::fill($i, 6) . '.ppm';\r
+                       $ppmfile = $this->out . 'ppm-' . cubeMath::fill($i, PNM_FILL) . '.ppm';\r
                        $jpegfile = $this->out . $prefix . $i . '.jpg';\r
                        if (!file_exists($ppmfile)) {\r
                                break;\r
@@ -713,17 +715,18 @@ disablelinks                Disable links.
        protected function pdf2swfBarbare($page, $resolution = 150, $quality = 85, $method = 4)\r
        {\r
                // Fabrique les images\r
-               if ($method == BARBARE_PNM) {\r
+               if ($method == self::BARBARE_PNM) {\r
                        $this->makeShot($page, 'barbare', $resolution, $quality, 4, 'PNM');\r
-               } elseif ($method == BARBARE_GS) {\r
+               } elseif ($method == self::BARBARE_GS) {\r
                        $this->makeShot($page, 'barbare', $resolution, $quality, 4, 'GS');\r
                }\r
                // A partir des images, on crée les swf\r
                $jpeg2swf = new cubeCommandLine('jpeg2swf');\r
                $jpeg2swf->setPath(CONVERTER_PATH);\r
-               $jpeg2swf->setArg('q', $quality);\r
-               $jpeg2swf->setArg('o', $this->out . 'p' . $page . '.swf');\r
-               $jpeg2swf->setArg('f');\r
+               $jpeg2swf->setArg('--quality', $quality);\r
+               $jpeg2swf->setArg('--output', $this->out . 'p' . $page . '.swf');\r
+               $jpeg2swf->setArg('--fit-to-movie');\r
+               $jpeg3swf->setArg('--flashversion', 9);\r
                $jpeg2swf->setArg(null, $this->out . 'barbare' . $page . '.jpg');\r
                $jpeg2swf->execute();\r
                $this->addToLog($jpeg2swf, true, $page);\r