From 2fe4f8f37b6f0c388be91f6ebfbb9107daf55832 Mon Sep 17 00:00:00 2001
From: abv <abv@opencascade.com>
Date: Fri, 6 Feb 2015 06:34:42 +0300
Subject: [PATCH] Fix compiler warning and adjust test cases for integration to
 master

---
 src/BOPAlgo/BOPAlgo_WireSplitter.cxx |  2 +-
 tests/bugs/fclasses/bug25635_1       | 12 ++++++------
 tests/bugs/stlvrml/bug25740          |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/BOPAlgo/BOPAlgo_WireSplitter.cxx b/src/BOPAlgo/BOPAlgo_WireSplitter.cxx
index 16f5323a2b..c01423e88f 100644
--- a/src/BOPAlgo/BOPAlgo_WireSplitter.cxx
+++ b/src/BOPAlgo/BOPAlgo_WireSplitter.cxx
@@ -299,7 +299,7 @@ public:
   {
     //
     BOPAlgo_WireSplitterFunctor aWSF(aF, aVCB);
-    Standard_Size aNbVCB = aVCB.Extent();
+    Standard_Integer aNbVCB = aVCB.Extent();
     //
     OSD_Parallel::For(0, aNbVCB, aWSF, !bRunParallel);
   }
diff --git a/tests/bugs/fclasses/bug25635_1 b/tests/bugs/fclasses/bug25635_1
index 2ade8169d3..db42b001ba 100755
--- a/tests/bugs/fclasses/bug25635_1
+++ b/tests/bugs/fclasses/bug25635_1
@@ -11,13 +11,13 @@ ellipse c2 4 0 2 1
 
 set info [2dextrema c1 c2]
 
-set tol_abs 1.e-4
+set tol_abs 1.e-5
 set tol_rel 0.01
 
 #-1
 regexp "dist 1: +(\[-0-9.+eE\]+)" ${info} full dist_1
 
-set expected_dist_1 7.9e-09
+set expected_dist_1 0.
 checkreal "Distance" ${dist_1} ${expected_dist_1} ${tol_abs} ${tol_rel}
 
 #-2
@@ -30,17 +30,17 @@ regexp { *Axis *:([-0-9.+eE]+), *([-0-9.+eE]+) } ${dump_list} full AxisX AxisY
 set expected_Parameter1 0.
 checkreal "Parameter1" ${Parameter1} ${expected_Parameter1} ${tol_abs} ${tol_rel}
 
-set expected_Parameter2 7.94518140168066e-09
+set expected_Parameter2 0.
 checkreal "Parameter2" ${Parameter2} ${expected_Parameter2} ${tol_abs} ${tol_rel}
 
-set expected_OriginX 1.99999999602741
+set expected_OriginX 2.
 checkreal "OriginX" ${OriginX} ${expected_OriginX} ${tol_abs} ${tol_rel}
 
-set expected_OriginY -6.30284903027441e-05 
+set expected_OriginY -6.e-05 
 checkreal "OriginY" ${OriginY} ${expected_OriginY} ${tol_abs} ${tol_rel}
 
 set expected_AxisX 1.
 checkreal "AxisX" ${AxisX} ${expected_AxisX} ${tol_abs} ${tol_rel}
 
-set expected_AxisY -9.65456920683062e-09 
+set expected_AxisY 0.
 checkreal "AxisY" ${AxisY} ${expected_AxisY} ${tol_abs} ${tol_rel}
diff --git a/tests/bugs/stlvrml/bug25740 b/tests/bugs/stlvrml/bug25740
index 5acbcd7de9..f5d5c9b72d 100644
--- a/tests/bugs/stlvrml/bug25740
+++ b/tests/bugs/stlvrml/bug25740
@@ -15,7 +15,7 @@ incmesh p 0.1
 
 explode p e
 
-writevrml p_3 ${aFile} 1 1
+writevrml p_3 ${aFile} 2 2
 
 set status 1
 if { ![file exists ${aFile}] } {
@@ -32,7 +32,7 @@ set fd0 [ open ${aFile} r ]
 set filecontent [ read ${fd0} ]
 close $fd0
 
-if { ![regexp {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,-1} ${filecontent} full] } {
+if { ![regexp {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,\n\s+16,17,18,19,20,21,22,23,24,25,26,27,28, -1} ${filecontent} full] } {
   set status 0 
 }