(no commit message)

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 55effc796766aefe6fd64d224135b9e68cb49a12..07c1fadebf7360d180f07996f5a2eaf183e70047 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -48,8 +48,6 @@ class wsDocument extends cubeMetier {
 \r
        const MAX = 5;\r
 \r
-       public static $methods = array(NORMAL, FLATTEN, 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
@@ -280,8 +278,10 @@ class wsDocument extends cubeMetier {
                                $this->generalInfos['page'][$m[1]][strtolower($m[2])] = new wsBox($m[3], $m[4], $m[5], $m[6]);\r
                        } elseif (preg_match('|Page ([0-9]+) size: ([0-9.]*) pts x ([0-9.]*) pts|iu', $line, $m)) {\r
                                $this->generalInfos['page'][$m[1]]['size'] = array($m[2], $m[3]);\r
-                               $this->generalInfos['size'][0] = max($this->generalInfos['size'][0], $m[2]);\r
-                               $this->generalInfos['size'][1] = max($this->generalInfos['size'][1], $m[3]);\r
+                               if ($m[1] == 1) {\r
+                                       $this->generalInfos['size'][0] = $m[2];\r
+                                       $this->generalInfos['size'][1] = $m[3];\r
+                               }\r
                        } elseif ($k == 'BookmarkTitle') {\r
                                $this->bookmarks[$bookmark_id] = array('titre' => str_replace('
', '', trim($v)));\r
                        } elseif ($k == 'BookmarkLevel') {\r
@@ -622,8 +622,7 @@ class wsDocument extends cubeMetier {
                                if ($method == self::MAX) {\r
                                        return;\r
                                }\r
-                               $index = array_search($method, self::$methods) + 1;\r
-                               $nextMethod = self::$methods[$index];\r
+                               $nextMethod = $method + 1;\r
                                return $this->makeSWFFiles($page, $resolution, $quality, $storeAllChars, $maxObjects, $nextMethod);\r
                        }\r
                }\r