From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 22 Aug 2011 17:28:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bfba078ac5c9563acf97388933b37792d0d5c2e5;p=cubeextranet.git

---

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index cc2c0e57c..5253e48a8 100644
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/LayoutStripper.java</file>
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java</file>
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/operator/ShowTextGlyph.java</file>
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/operator/ShowText.java</file>
+    </open-files>
 </project-private>
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 483641aaf..f1c9835c7 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -248,14 +248,18 @@ class wsDocument extends cubeMetier {
 			return;
 		}
 		$this->manualcut = false;
-		if ($first == $last && round($first[0] * 2) == round($second[0])) {
+		if (self::compareSizes($last, $first) && cubeMath::compare($first[0] * 2, $second[0], 0.9)) {
 			$this->autocut = '1-23-4';
 		}
-		if (round($first[0] * 2) == round($second[0]) && $last == $second) {
+		if (cubeMath::compare($first[0] * 2, $second[0], 0.9) && self::compareSizes($last, $second)) {
 			$this->autocut = '1-23';
 		}
 	}
 
+	public static function compareSizes($x, $y, $tolerance=0.9) {
+		return cubeMath::compare($x[0], $y[0], $tolerance) && cubeMath::compare($x[1], $y[1], $tolerance);
+	}
+
 	public function parseInfos($data) {
 		// This function get general infos (pages sizes, boxes, number sections and
 		// bookmarks