Merge from V6_main_20120808 08Aug12

[plugins/ghs3dprlplugin.git] / src / GHS3DPRLPlugin / GHS3DPRLPlugin_Hypothesis.cxx

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
index 8f29b51162a26fc7070e26c972b61bb4fa19a6e0..04bb483be83c38ecb0bab673fbe8ccda1c0b0228 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
@@ -1,27 +1,28 @@
-//  Copyright (C) 2007-2008 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // ---
 // File   : GHS3DPRLPlugin_Hypothesis.cxx
 // Author : Christian VAN WAMBEKE (CEA) (from Hexotic plugin Lioka RAZAFINDRAZAKA)
 // ---
-
-#include <GHS3DPRLPlugin_Hypothesis.hxx>
+//
+#include "GHS3DPRLPlugin_Hypothesis.hxx"
 #include <utilities.h>
 
 //=============================================================================
@@ -61,7 +62,7 @@ static std::string cutOrReplaceBlancs(std::string theIn)
 
   for (int i = 0, j = 0; i < len; i++)
   {
-    ushort ucs = (ushort)(str1[i]);
+    unsigned short ucs = (unsigned short)(str1[i]);
     if ((9 <= ucs && ucs <= 13) || ucs == 32)
     {
       if (!del)