From ef5ee35ee2566535874907fbcb97c52a183a12ae Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 29 Apr 2011 13:44:42 +0000 Subject: [PATCH] --- inc/ws/Metier/class.ws.document.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 55effc796..07c1fadeb 100644 --- a/inc/ws/Metier/class.ws.document.php +++ b/inc/ws/Metier/class.ws.document.php @@ -48,8 +48,6 @@ class wsDocument extends cubeMetier { const MAX = 5; - public static $methods = array(NORMAL, FLATTEN, POLYTOBITMAP, BITMAP, BARBARE_PNM, BARBARE_GS); - const PNM_FILL = 2; protected static $resolution2multiply = array(72 => 2, 100 => 2, 150 => 3, 200 => 3, 300 => 3, 450 => 4, 600 => 5); @@ -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]); } elseif (preg_match('|Page ([0-9]+) size: ([0-9.]*) pts x ([0-9.]*) pts|iu', $line, $m)) { $this->generalInfos['page'][$m[1]]['size'] = array($m[2], $m[3]); - $this->generalInfos['size'][0] = max($this->generalInfos['size'][0], $m[2]); - $this->generalInfos['size'][1] = max($this->generalInfos['size'][1], $m[3]); + if ($m[1] == 1) { + $this->generalInfos['size'][0] = $m[2]; + $this->generalInfos['size'][1] = $m[3]; + } } elseif ($k == 'BookmarkTitle') { $this->bookmarks[$bookmark_id] = array('titre' => str_replace(' ', '', trim($v))); } elseif ($k == 'BookmarkLevel') { @@ -622,8 +622,7 @@ class wsDocument extends cubeMetier { if ($method == self::MAX) { return; } - $index = array_search($method, self::$methods) + 1; - $nextMethod = self::$methods[$index]; + $nextMethod = $method + 1; return $this->makeSWFFiles($page, $resolution, $quality, $storeAllChars, $maxObjects, $nextMethod); } } -- 2.39.5