(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 6d65acfea4ff3c8e2cc9e86630672642e7ccfece..925a29aea322b8d8d292a3418421258af49b5d78 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -11,6 +11,7 @@ class wsFlash extends cubeFlashGateway {
 \r
        public function uploadDocument()\r
        {\r
+               cubePHP::neverStop();\r
                global $core;\r
                if (!isset($_SESSION['conversionSession'])) {\r
                        $_SESSION['conversionSession'] = array();\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index e6ce17541e83240eac0fb53376f19765dcd93de3..ca7ab657d0646b3d1ed5e35f63eb4c5f8a187e31 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -149,11 +149,11 @@ html{height:100%}' . "\n";
        public static function testAS()\r
        {\r
                global $core;\r
-\r
+               //cubePHP::neverStop();\r
                $dao = new wsDAOBook($core->con);\r
                header('Content-type: text/plain');\r
                ob_clean();\r
-               echo $dao->compile(2963, 3, false);\r
+               echo $dao->compile(2964, 3, false);\r
                exit;\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index bd87e5dd494ff5eddbb8e932a1b64f4440516ee0..5dc616adb0de36ea7e81a9322d442adca23a0dcf 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -472,7 +472,7 @@ class wsDAOBook extends extranetDAO {
                $daoTheme = new wsDAOTheme($this->con);\r
                $theme = $daoTheme->getThemeOfBook($book_id);\r
 \r
-               $this->makeTextsIndexes($book_id, $index, $textes);\r
+               //$this->makeTextsIndexes($book_id, $index, $textes);\r
 \r
                $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/' . $book_id, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flexLight = new cubeFlexCompiler('FluidbookDatasLight', ROOT . '/books/datasCompiler/' . $book_id, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 5299dd0e3764a04f97a94042d41582eb459a66f2..22f26b524aa3bde24278c2298b9a8ceaac088db0 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -273,7 +273,7 @@ class wsDocument extends cubeMetier {
 \r
        public function processOnePage($page, $force = true)\r
        {\r
-               $this->makeRealShot($page);\r
+               // $this->makeRealShot($page);\r
                if ($force || $this) {\r
                        $this->makeMiniShot($page);\r
                        $this->makeSWFFiles($page, 150, 90, true, 1800, 1);\r
@@ -394,17 +394,19 @@ class wsDocument extends cubeMetier {
                $gs->setArg('-dBATCH');\r
                $gs->setArg('-dNOPAUSE');\r
                $gs->setArg('-dNOPROMPT');\r
+               // Antialias\r
+               $gs->setArg('-dDOINTERPOLATE');\r
+               $gs->setArg('-dTextAlphaBits=' . $antialiasing);\r
+               $gs->setArg('-dGraphicsAlphaBits=' . $antialiasing);\r
+               // Device\r
                $gs->setArg('-sDEVICE=jpeg');\r
                // Dispotion & colors\r
                $gs->setArg('-dUseCIEColor');\r
                $gs->setArg('-dAutoRotatePages=/None');\r
+               $gs->setArg('-dUseCropBox');\r
                // Resolution & Quality\r
                $gs->setArg('-r' . round($resolution));\r
                $gs->setArg('-dJPEGQ=' . $quality);\r
-               // Antialias\r
-               $gs->setArg('-dDOINTERPOLATE');\r
-               $gs->setArg('-dTextAlphaBits=' . $antialiasing);\r
-               $gs->setArg('-dGraphicsAlphaBits=' . $antialiasing);\r
                // Performances\r
                $gs->setArg('-dNumRenderingThreads=4');\r
                // Page range\r