(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 7ea4890fbed8b0b7d7bd4b8947be2be9ce607dc7..f131539b68e5fcbea78b13e116b8c5c3bdc6f879 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -135,7 +135,7 @@ html{height:100%}' . "\n";
                $dao = new wsDAOBook($core->con);\r
                header('Content-type: text/plain');\r
                ob_clean();\r
-               echo $dao->compile(2963, 3, true);\r
+               echo $dao->compile(2963, 3, false);\r
                exit;\r
        }\r
 \r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 946e2c80427edfcb78a441887edb6a9a5d34fe5e..5299dd0e3764a04f97a94042d41582eb459a66f2 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -277,7 +277,7 @@ class wsDocument extends cubeMetier {
                if ($force || $this) {\r
                        $this->makeMiniShot($page);\r
                        $this->makeSWFFiles($page, 150, 90, true, 1800, 1);\r
-                       $this->makeAS3($page);\r
+                       // $this->makeAS3($page);\r
                }\r
        }\r
 \r
@@ -477,7 +477,7 @@ class wsDocument extends cubeMetier {
                // Pour les fichiers croppés, on utilise la méthode flatten qui ne prends\r
                // pas en compte les objets hors de la box\r
                if ($this->isCropped()) {\r
-                       $method = max($method, self::FLATTEN);\r
+                       // $method = max($method, self::FLATTEN);\r
                }\r
 \r
                $out = $this->pdf2swf($page, $resolution, $quality, $storeAllChars, $method);\r
@@ -646,8 +646,10 @@ disablelinks                Disable links.
                        $pdf2swf->setArg('stop');\r
                        // $pdf2swf->setManualArg('-v');\r
                        $pdf2swf->setArg('T', 9);\r
+                       $pdf2swf->setArg('set reordertags', '0');\r
                        if ($storeAllChars) {\r
                                $pdf2swf->setArg('fonts');\r
+                               $pdf2swf->setArg('set storeallcharacters');\r
                        }\r
                        if (DEV) {\r
                                $pdf2swf->setArg('F', 'C:/Windows/Fonts');\r
@@ -671,7 +673,7 @@ disablelinks                Disable links.
 \r
        protected function makeAS3($page)\r
        {\r
-               /*$swffile = $this->out . 'p' . $page . '.swf';\r
+               $swffile = $this->out . 'p' . $page . '.swf';\r
 \r
                $swfcombine = new cubeCommandLine('swfcombine');\r
                $swfcombine->setPath(CONVERTER_PATH);\r
@@ -683,7 +685,7 @@ disablelinks                Disable links.
                $swfcombine->setArg(null, ROOT . '/swf/as3Container.swf');\r
                $swfcombine->setManualArg('content=' . $swffile);\r
                $swfcombine->execute();\r
-               $this->addToLog($swfcombine);*/\r
+               $this->addToLog($swfcombine);\r
        }\r
 \r
        protected function pdf2swfBarbare($page, $resolution = 150, $quality = 85, $method = 4)\r