0023072: Eliminate compiler warnings (level 3) on Windows / MSVC++

diff --git a/src/AIS/AIS_InteractiveContext.cdl b/src/AIS/AIS_InteractiveContext.cdl
index bab1ae8..5dbf80b 100755 (executable)
--- a/src/AIS/AIS_InteractiveContext.cdl
+++ b/src/AIS/AIS_InteractiveContext.cdl
@@ -761,8 +761,8 @@ is
     SetPolygonOffsets ( me : mutable;
                anObj        : InteractiveObject from AIS;
                aMode        : Integer from Standard;
     SetPolygonOffsets ( me : mutable;
                anObj        : InteractiveObject from AIS;
                aMode        : Integer from Standard;

-               aFactor      : Real from Standard = 1.0;
-               aUnits       : Real from Standard = 0.0;
+               aFactor      : ShortReal from Standard = 1.0;
+               aUnits       : ShortReal from Standard = 0.0;

        updateviewer : Boolean from Standard = Standard_True ) is static;
     ---Purpose: Sets up polygon offsets for the given AIS_InteractiveObject.
     --          It simply calls anObj->SetPolygonOffsets() 
        updateviewer : Boolean from Standard = Standard_True ) is static;
     ---Purpose: Sets up polygon offsets for the given AIS_InteractiveObject.
     --          It simply calls anObj->SetPolygonOffsets() 


@@ -779,8 +779,8 @@ is
     PolygonOffsets ( me;
                anObj   : InteractiveObject from AIS;
                aMode   : out Integer from Standard;
     PolygonOffsets ( me;
                anObj   : InteractiveObject from AIS;
                aMode   : out Integer from Standard;

-               aFactor : out Real from Standard;
-               aUnits  : out Real from Standard ) is static;
+               aFactor : out ShortReal from Standard;
+               aUnits  : out ShortReal from Standard ) is static;

     ---Level: Public
     ---Purpose: Retrieves current polygon offsets settings for <anObj>.
     ---Category: Inquire methods
     ---Level: Public
     ---Purpose: Retrieves current polygon offsets settings for <anObj>.
     ---Category: Inquire methods

diff --git a/src/AIS/AIS_InteractiveContext_3.cxx b/src/AIS/AIS_InteractiveContext_3.cxx
index 1d89688..ec3ff60 100755 (executable)
--- a/src/AIS/AIS_InteractiveContext_3.cxx
+++ b/src/AIS/AIS_InteractiveContext_3.cxx
@@ -56,8 +56,8 @@ void AIS_InteractiveContext::DisplayFromCollector(const Handle(AIS_InteractiveOb
 void AIS_InteractiveContext::SetPolygonOffsets(
                              const Handle(AIS_InteractiveObject)& anObj,
                              const Standard_Integer               aMode,
 void AIS_InteractiveContext::SetPolygonOffsets(
                              const Handle(AIS_InteractiveObject)& anObj,
                              const Standard_Integer               aMode,

-                             const Standard_Real                  aFactor,
-                             const Standard_Real                  aUnits,
+                             const Standard_ShortReal             aFactor,
+                             const Standard_ShortReal             aUnits,

                              const Standard_Boolean               updateviewer) 
 {
   if ( anObj.IsNull() )
                              const Standard_Boolean               updateviewer) 
 {
   if ( anObj.IsNull() )


@@ -94,8 +94,8 @@ Standard_Boolean AIS_InteractiveContext::HasPolygonOffsets(const Handle(AIS_Inte
 void AIS_InteractiveContext::PolygonOffsets(
                              const Handle(AIS_InteractiveObject)& anObj,
                              Standard_Integer&                    aMode,
 void AIS_InteractiveContext::PolygonOffsets(
                              const Handle(AIS_InteractiveObject)& anObj,
                              Standard_Integer&                    aMode,

-                             Standard_Real&                       aFactor,
-                             Standard_Real&                       aUnits) const 
+                             Standard_ShortReal&                  aFactor,
+                             Standard_ShortReal&                  aUnits) const 

 {
   if ( HasPolygonOffsets( anObj ) )
     anObj->PolygonOffsets( aMode, aFactor, aUnits );
 {
   if ( HasPolygonOffsets( anObj ) )
     anObj->PolygonOffsets( aMode, aFactor, aUnits );

diff --git a/src/AIS/AIS_InteractiveObject.cdl b/src/AIS/AIS_InteractiveObject.cdl
index 18a4573..e1b98ad 100755 (executable)
--- a/src/AIS/AIS_InteractiveObject.cdl
+++ b/src/AIS/AIS_InteractiveObject.cdl
@@ -616,8 +616,8 @@ is
     -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
     SetPolygonOffsets ( me : mutable;
                 aMode   : Integer from Standard;
     -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
     SetPolygonOffsets ( me : mutable;
                 aMode   : Integer from Standard;

-                aFactor : Real from Standard = 1.0;
-                aUnits  : Real from Standard = 0.0 ) is virtual;
+                aFactor : ShortReal from Standard = 1.0;
+                aUnits  : ShortReal from Standard = 0.0 ) is virtual;

        ---Level: Public
        ---Purpose: Sets up polygon offsets for this object.
        --          It modifies all existing presentations of <anObj> (if any),
        ---Level: Public
        ---Purpose: Sets up polygon offsets for this object.
        --          It modifies all existing presentations of <anObj> (if any),


@@ -655,8 +655,8 @@ is
 
     PolygonOffsets ( me;
                 aMode   : out Integer from Standard;
 
     PolygonOffsets ( me;
                 aMode   : out Integer from Standard;

-                aFactor : out Real from Standard;
-                aUnits  : out Real from Standard ) is virtual;
+                aFactor : out ShortReal from Standard;
+                aUnits  : out ShortReal from Standard ) is virtual;

        ---Level: Public
        ---Purpose: Retrieves current polygon offsets settings from <myDrawer>.
        ---Category: Inquire methods
        ---Level: Public
        ---Purpose: Retrieves current polygon offsets settings from <myDrawer>.
        ---Category: Inquire methods

diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx
index f86fc46..80438e0 100755 (executable)
--- a/src/AIS/AIS_InteractiveObject.cxx
+++ b/src/AIS/AIS_InteractiveObject.cxx
@@ -749,9 +749,9 @@ void AIS_InteractiveObject::SetAspect(const Handle(Prs3d_BasicAspect)& anAspect,
 //function : SetPolygonOffsets 
 //purpose  : 
 //======================================================================= 
 //function : SetPolygonOffsets 
 //purpose  : 
 //======================================================================= 

-void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer aMode,
-                                              const Standard_Real    aFactor,
-                                              const Standard_Real    aUnits) 
+void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer    aMode,
+                                              const Standard_ShortReal  aFactor,
+                                              const Standard_ShortReal  aUnits) 

 {
   if ( !HasPolygonOffsets() )
     myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
 {
   if ( !HasPolygonOffsets() )
     myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());


@@ -806,9 +806,9 @@ Standard_Boolean AIS_InteractiveObject::HasPolygonOffsets() const
 //function : PolygonOffsets 
 //purpose  : 
 //=======================================================================
 //function : PolygonOffsets 
 //purpose  : 
 //=======================================================================

-void AIS_InteractiveObject::PolygonOffsets(Standard_Integer& aMode,
-                                           Standard_Real&    aFactor,
-                                           Standard_Real&    aUnits) const 
+void AIS_InteractiveObject::PolygonOffsets(Standard_Integer&    aMode,
+                                           Standard_ShortReal&  aFactor,
+                                           Standard_ShortReal&  aUnits) const 

 {
   if( HasPolygonOffsets() )
     myDrawer->ShadingAspect()->Aspect()->PolygonOffsets( aMode, aFactor, aUnits );
 {
   if( HasPolygonOffsets() )
     myDrawer->ShadingAspect()->Aspect()->PolygonOffsets( aMode, aFactor, aUnits );

diff --git a/src/AIS/AIS_TexturedShape.cxx b/src/AIS/AIS_TexturedShape.cxx
index d1d4e2f..86c96c9 100755 (executable)
--- a/src/AIS/AIS_TexturedShape.cxx
+++ b/src/AIS/AIS_TexturedShape.cxx
@@ -333,7 +333,7 @@ void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*t
         if (HasPolygonOffsets())
         {
           Standard_Integer aMode;
         if (HasPolygonOffsets())
         {
           Standard_Integer aMode;

-          Standard_Real aFactor, aUnits;
+          Standard_ShortReal aFactor, aUnits;

           PolygonOffsets(aMode, aFactor, aUnits);
           myAspect->SetPolygonOffsets(aMode, aFactor, aUnits);
         }
           PolygonOffsets(aMode, aFactor, aUnits);
           myAspect->SetPolygonOffsets(aMode, aFactor, aUnits);
         }

diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
index 31db642..b3c02d8 100755 (executable)
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
@@ -210,7 +210,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
   mySections.Clear();
   myPAtt.Init();
   Handle(TDF_Data) aData = new TDF_Data();
   mySections.Clear();
   myPAtt.Init();
   Handle(TDF_Data) aData = new TDF_Data();

-  Standard_Integer aDocumentPos = -1;
+  streampos aDocumentPos = -1;

 
   // 2b. Read the TOC of Sections
   if (aFileVer >= 3) {
 
   // 2b. Read the TOC of Sections
   if (aFileVer >= 3) {


@@ -274,7 +274,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read
   } // end of reading Sections or shape section
 
   // Return to read of the Document structure
   } // end of reading Sections or shape section
 
   // Return to read of the Document structure

-  anIS.seekg((streampos) aDocumentPos);
+  anIS.seekg(aDocumentPos);

 
   // read the header (tag) of the root label
   Standard_Integer aTag;
 
   // read the header (tag) of the root label
   Standard_Integer aTag;

diff --git a/src/BinTools/BinTools_ShapeSet.cxx b/src/BinTools/BinTools_ShapeSet.cxx
index ef57d98..95f2550 100755 (executable)
--- a/src/BinTools/BinTools_ShapeSet.cxx
+++ b/src/BinTools/BinTools_ShapeSet.cxx
@@ -386,7 +386,7 @@ void  BinTools_ShapeSet::Read(Standard_IStream& IS)
     IS.getline(vers,100,'\n');
     // BUC60769 PTV 18.10.2000: remove possible '\r' at the end of the line
     
     IS.getline(vers,100,'\n');
     // BUC60769 PTV 18.10.2000: remove possible '\r' at the end of the line
     

-    for (Standard_Integer lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 
+    for (Standard_Size lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 

       vers[lv] = '\0';
     
   } while ( ! IS.fail() && strcmp(vers,Version_1) && strcmp(vers,Version_2) &&
       vers[lv] = '\0';
     
   } while ( ! IS.fail() && strcmp(vers,Version_1) && strcmp(vers,Version_2) &&


@@ -805,7 +805,7 @@ void  BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T,
            if (val > 0 && val <= 3) 
              BinTools::GetReal(IS, p1); 
          } else {
            if (val > 0 && val <= 3) 
              BinTools::GetReal(IS, p1); 
          } else {

-           Standard_Integer aPos = IS.tellg();
+        streampos aPos = IS.tellg();

            BinTools::GetReal(IS, p1);      
            val = (Standard_Integer)IS.get();//case {0|1|2|3}
 #ifdef MDTV_DEB
            BinTools::GetReal(IS, p1);      
            val = (Standard_Integer)IS.get();//case {0|1|2|3}
 #ifdef MDTV_DEB

diff --git a/src/CGM/cgmobin.c b/src/CGM/cgmobin.c
index 7079667..d651ac3 100755 (executable)
--- a/src/CGM/cgmobin.c
+++ b/src/CGM/cgmobin.c
@@ -196,7 +196,7 @@ CGMObin(FILE *stream, Code c, Long *pi, Float *pr, char *str)
             {
                register Long *pt = pi, i, k;
                Long red, green, blue, nc, ncol;
             {
                register Long *pt = pi, i, k;
                Long red, green, blue, nc, ncol;

-               unsigned short run, packed;
+               Long run, packed;

                Long last, lastred, lastgreen, lastblue;
                static Long nx, ny;
                static Prec lprec;
                Long last, lastred, lastgreen, lastblue;
                static Long nx, ny;
                static Prec lprec;

diff --git a/src/DDF/DDF_IOStream.cxx b/src/DDF/DDF_IOStream.cxx
index 3ba8b6a..cf491a2 100755 (executable)
--- a/src/DDF/DDF_IOStream.cxx
+++ b/src/DDF/DDF_IOStream.cxx
@@ -635,7 +635,7 @@ Storage_Error DDF_IOStream::BeginReadInfoSection()
 {
   Storage_Error s;
   TCollection_AsciiString l;
 {
   Storage_Error s;
   TCollection_AsciiString l;

-  Standard_Integer        len = strlen(DDF_IOStream::MagicNumber());
+  Standard_Integer        len = (Standard_Integer) strlen(DDF_IOStream::MagicNumber());

 
   // Added because of Draw:
   // It don't go to next line after reading its own header line information!
 
   // Added because of Draw:
   // It don't go to next line after reading its own header line information!


@@ -1336,7 +1336,7 @@ Storage_Error DDF_IOStream::IsGoodFileType(istream* anIStream)
 
   if (s == Storage_VSOk) {
     TCollection_AsciiString l;
 
   if (s == Storage_VSOk) {
     TCollection_AsciiString l;

-    Standard_Integer        len = strlen(DDF_IOStream::MagicNumber());
+    Standard_Integer        len = (Standard_Integer) strlen(DDF_IOStream::MagicNumber());

 
     f.ReadChar(l,len);
 
 
     f.ReadChar(l,len);
 

diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx
index e26e405..56f475b 100755 (executable)
--- a/src/Draw/Draw_Interpretor.cxx
+++ b/src/Draw/Draw_Interpretor.cxx
@@ -375,7 +375,7 @@ void Draw_Interpretor::Add(const Standard_CString n,
   if (myInterp==NULL) Init();
 
   CData* C = new CData(f,this);
   if (myInterp==NULL) Init();
 
   CData* C = new CData(f,this);

-  Standard_Integer length, num_slashes,  ii,  jj,  kk;
+  Standard_Size length, num_slashes,  ii,  jj,  kk;

   Tcl_CreateCommand(myInterp,pN,CommandCmd, (ClientData) C, CommandDelete);
 
   // add the help
   Tcl_CreateCommand(myInterp,pN,CommandCmd, (ClientData) C, CommandDelete);
 
   // add the help


@@ -691,4 +691,4 @@ Standard_Boolean Draw_Interpretor::GetDoEcho () const
 Standard_SStream& Draw_Interpretor::Log ()
 {
   return myLog;
 Standard_SStream& Draw_Interpretor::Log ()
 {
   return myLog;

-}
\ No newline at end of file
+}

diff --git a/src/DrawTrSurf/DrawTrSurf.cxx b/src/DrawTrSurf/DrawTrSurf.cxx
index 732d428..47d6878 100755 (executable)
--- a/src/DrawTrSurf/DrawTrSurf.cxx
+++ b/src/DrawTrSurf/DrawTrSurf.cxx
@@ -1769,7 +1769,7 @@ static void pntsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);

-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);

 #endif
   gp_Pnt P = N->Point();
   if (N->Is3D()) {
 #endif
   gp_Pnt P = N->Point();
   if (N->Is3D()) {


@@ -1831,7 +1831,7 @@ static void triasave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);

-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);

 #endif
   Poly::Write(T->Triangulation(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
 #endif
   Poly::Write(T->Triangulation(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)


@@ -1872,7 +1872,7 @@ static void poly3dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);

-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);

 #endif
   Poly::Write(T->Polygon3D(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
 #endif
   Poly::Write(T->Polygon3D(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)


@@ -1912,7 +1912,7 @@ static void poly2dsave(const Handle(Draw_Drawable3D)&d, ostream& OS)
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);
   OS.precision(15);
 #else
   long form = OS.setf(ios::scientific);

-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);

 #endif
   Poly::Write(T->Polygon2D(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)
 #endif
   Poly::Write(T->Polygon2D(),OS);
 #if defined(HAVE_IOS) && !defined(__sgi) && !defined(IRIX)

diff --git a/src/DrawTrSurf/DrawTrSurf_Point.cxx b/src/DrawTrSurf/DrawTrSurf_Point.cxx
index 2e3d244..08f9324 100755 (executable)
--- a/src/DrawTrSurf/DrawTrSurf_Point.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Point.cxx
@@ -197,7 +197,7 @@ void DrawTrSurf_Point::Dump(Standard_OStream& S) const
   S.precision(15);
 #else
   long form = S.setf(ios::scientific);
   S.precision(15);
 #else
   long form = S.setf(ios::scientific);

-  int  prec = S.precision(15);
+  std::streamsize prec = S.precision(15);

 #endif
   if (is3D)
     S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <<endl;
 #endif
   if (is3D)
     S << "Point : " << myPoint.X() << ", " << myPoint.Y() << ", " << myPoint.Z() <<endl;

diff --git a/src/GeomTools/GeomTools_Curve2dSet.cxx b/src/GeomTools/GeomTools_Curve2dSet.cxx
index cef9218..5737f1f 100755 (executable)
--- a/src/GeomTools/GeomTools_Curve2dSet.cxx
+++ b/src/GeomTools/GeomTools_Curve2dSet.cxx
@@ -502,7 +502,7 @@ void  GeomTools_Curve2dSet::Dump(Standard_OStream& OS)const
 
 void  GeomTools_Curve2dSet::Write(Standard_OStream& OS)const 
 {
 
 void  GeomTools_Curve2dSet::Write(Standard_OStream& OS)const 
 {

-  int  prec = OS.precision(17);
+  std::streamsize prec = OS.precision(17);

 
   Standard_Integer i, nbsurf = myMap.Extent();
   OS << "Curve2ds "<< nbsurf << "\n";
 
   Standard_Integer i, nbsurf = myMap.Extent();
   OS << "Curve2ds "<< nbsurf << "\n";

diff --git a/src/GeomTools/GeomTools_CurveSet.cxx b/src/GeomTools/GeomTools_CurveSet.cxx
index d9027ec..ffebaf4 100755 (executable)
--- a/src/GeomTools/GeomTools_CurveSet.cxx
+++ b/src/GeomTools/GeomTools_CurveSet.cxx
@@ -519,7 +519,7 @@ void  GeomTools_CurveSet::Dump(Standard_OStream& OS)const
 
 void  GeomTools_CurveSet::Write(Standard_OStream& OS)const 
 {
 
 void  GeomTools_CurveSet::Write(Standard_OStream& OS)const 
 {

-  int  prec = OS.precision(17);
+  std::streamsize  prec = OS.precision(17);

 
   Standard_Integer i, nbcurve = myMap.Extent();
   OS << "Curves "<< nbcurve << "\n";
 
   Standard_Integer i, nbcurve = myMap.Extent();
   OS << "Curves "<< nbcurve << "\n";

diff --git a/src/GeomTools/GeomTools_SurfaceSet.cxx b/src/GeomTools/GeomTools_SurfaceSet.cxx
index fa3701d..ec321c2 100755 (executable)
--- a/src/GeomTools/GeomTools_SurfaceSet.cxx
+++ b/src/GeomTools/GeomTools_SurfaceSet.cxx
@@ -639,7 +639,7 @@ void  GeomTools_SurfaceSet::Dump(Standard_OStream& OS)const
 
 void  GeomTools_SurfaceSet::Write(Standard_OStream& OS)const 
 {
 
 void  GeomTools_SurfaceSet::Write(Standard_OStream& OS)const 
 {

-  int  prec = OS.precision(17);
+  std::streamsize  prec = OS.precision(17);

 
   Standard_Integer i, nbsurf = myMap.Extent();
   OS << "Surfaces "<< nbsurf << "\n";
 
   Standard_Integer i, nbsurf = myMap.Extent();
   OS << "Surfaces "<< nbsurf << "\n";

diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
index a9bdfc1..040aba5 100755 (executable)
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
@@ -203,8 +203,8 @@ is
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         SetPolygonOffsets ( me : mutable;
                             aMode   : Integer from Standard;
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         SetPolygonOffsets ( me : mutable;
                             aMode   : Integer from Standard;

-                            aFactor : Real from Standard = 1.0;
-                            aUnits  : Real from Standard = 0.0 );
+                            aFactor : ShortReal from Standard = 1.0;
+                            aUnits  : ShortReal from Standard = 0.0 );

         ---Level: Public
         ---Purpose: Sets up OpenGL polygon offsets mechanism.
         --          <aMode> parameter can contain various combinations of 
         ---Level: Public
         ---Purpose: Sets up OpenGL polygon offsets mechanism.
         --          <aMode> parameter can contain various combinations of 


@@ -291,8 +291,8 @@ is
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         PolygonOffsets ( me;
                          aMode   : out Integer from Standard;
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         PolygonOffsets ( me;
                          aMode   : out Integer from Standard;

-                         aFactor : out Real from Standard;
-                         aUnits  : out Real from Standard );
+                         aFactor : out ShortReal from Standard;
+                         aUnits  : out ShortReal from Standard );

         ---Level: Public
         ---Purpose: Returns current polygon offsets settings.
         ---Category: Inquire methods    
         ---Level: Public
         ---Purpose: Returns current polygon offsets settings.
         ---Category: Inquire methods    


@@ -342,7 +342,7 @@ fields
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         -- polygon offsets
         MyPolygonOffsetMode     :       Integer from Standard;
         -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
         -- polygon offsets
         MyPolygonOffsetMode     :       Integer from Standard;

-        MyPolygonOffsetFactor   :       Real from Standard;
-        MyPolygonOffsetUnits    :       Real from Standard;
+        MyPolygonOffsetFactor   :       ShortReal from Standard;
+        MyPolygonOffsetUnits    :       ShortReal from Standard;

 
 end AspectFillArea3d;
 
 end AspectFillArea3d;

diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx b/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
index c4877bc..2e959c3 100755 (executable)
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
@@ -247,17 +247,17 @@ Aspect_TypeOfDegenerateModel Graphic3d_AspectFillArea3d::DegenerateModel(
 }
 
 // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
 }
 
 // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 

-void Graphic3d_AspectFillArea3d::SetPolygonOffsets(const Standard_Integer aMode,
-                                                   const Standard_Real    aFactor,
-                                                   const Standard_Real    aUnits) {
+void Graphic3d_AspectFillArea3d::SetPolygonOffsets(const Standard_Integer    aMode,
+                                                   const Standard_ShortReal  aFactor,
+                                                   const Standard_ShortReal  aUnits) {

   MyPolygonOffsetMode   = ( aMode & Aspect_POM_Mask );
   MyPolygonOffsetFactor = aFactor;
   MyPolygonOffsetUnits  = aUnits;
 }
 
   MyPolygonOffsetMode   = ( aMode & Aspect_POM_Mask );
   MyPolygonOffsetFactor = aFactor;
   MyPolygonOffsetUnits  = aUnits;
 }
 

-void Graphic3d_AspectFillArea3d::PolygonOffsets(Standard_Integer& aMode,
-                                                Standard_Real&    aFactor,
-                                                Standard_Real&    aUnits) const {
+void Graphic3d_AspectFillArea3d::PolygonOffsets(Standard_Integer&    aMode,
+                                                Standard_ShortReal&  aFactor,
+                                                Standard_ShortReal&  aUnits) const {

   aMode   = MyPolygonOffsetMode;
   aFactor = MyPolygonOffsetFactor;
   aUnits  = MyPolygonOffsetUnits;
   aMode   = MyPolygonOffsetMode;
   aFactor = MyPolygonOffsetFactor;
   aUnits  = MyPolygonOffsetUnits;

diff --git a/src/Graphic3d/Graphic3d_Group_8.cxx b/src/Graphic3d/Graphic3d_Group_8.cxx
index 3dc269c..423e5c3 100755 (executable)
--- a/src/Graphic3d/Graphic3d_Group_8.cxx
+++ b/src/Graphic3d/Graphic3d_Group_8.cxx
@@ -278,7 +278,7 @@ void Graphic3d_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectFil
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
   Standard_Integer aPolyMode;
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
   Standard_Integer aPolyMode;

-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;

   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCGroup.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCGroup.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;


@@ -362,7 +362,7 @@ void Graphic3d_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectTex
   MyCGroup.ContextText.ColorSubTitle.g    = float (Gs);
   MyCGroup.ContextText.ColorSubTitle.b    = float (Bs);
   MyCGroup.ContextText.TextZoomable   = ATextZoomable;   
   MyCGroup.ContextText.ColorSubTitle.g    = float (Gs);
   MyCGroup.ContextText.ColorSubTitle.b    = float (Bs);
   MyCGroup.ContextText.TextZoomable   = ATextZoomable;   

-  MyCGroup.ContextText.TextAngle    = ATextAngle;   
+  MyCGroup.ContextText.TextAngle    = float (ATextAngle);   

   MyCGroup.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
   MyCGroup.ContextText.IsDef      = 1;
   MyCGroup.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
   MyCGroup.ContextText.IsDef      = 1;


@@ -598,7 +598,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectFillArea
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
   Standard_Integer aPolyMode;
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
   Standard_Integer aPolyMode;

-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;

   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCGroup.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCGroup.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCGroup.ContextFillArea.PolygonOffsetFactor = aPolyFactor;


@@ -682,7 +682,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectText3d)&
   MyCGroup.ContextText.ColorSubTitle.g    = float (Gs);
   MyCGroup.ContextText.ColorSubTitle.b    = float (Bs);
   MyCGroup.ContextText.TextZoomable   = ATextZoomable;  
   MyCGroup.ContextText.ColorSubTitle.g    = float (Gs);
   MyCGroup.ContextText.ColorSubTitle.b    = float (Bs);
   MyCGroup.ContextText.TextZoomable   = ATextZoomable;  

-  MyCGroup.ContextText.TextAngle    = ATextAngle;   
+  MyCGroup.ContextText.TextAngle    = float (ATextAngle);   

   MyCGroup.ContextText.TextFontAspect   = (int)ATextFontAspect;   
   MyCGroup.ContextText.IsDef              = 1;
 
   MyCGroup.ContextText.TextFontAspect   = (int)ATextFontAspect;   
   MyCGroup.ContextText.IsDef              = 1;
 

diff --git a/src/Graphic3d/Graphic3d_Structure.cxx b/src/Graphic3d/Graphic3d_Structure.cxx
index f3e3f8e..615e1f1 100755 (executable)
--- a/src/Graphic3d/Graphic3d_Structure.cxx
+++ b/src/Graphic3d/Graphic3d_Structure.cxx
@@ -1262,7 +1262,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectFill
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
   Standard_Integer aPolyMode;
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
   Standard_Integer aPolyMode;

-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;

   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCStructure.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
   CTX->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCStructure.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;


@@ -1319,7 +1319,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectText
   MyCStructure.ContextText.ColorSubTitle.g  = float (Gs);
   MyCStructure.ContextText.ColorSubTitle.b  = float (Bs);
   MyCStructure.ContextText.TextZoomable     = ATextZoomable;
   MyCStructure.ContextText.ColorSubTitle.g  = float (Gs);
   MyCStructure.ContextText.ColorSubTitle.b  = float (Bs);
   MyCStructure.ContextText.TextZoomable     = ATextZoomable;

-  MyCStructure.ContextText.TextAngle        = ATextAngle;
+  MyCStructure.ContextText.TextAngle        = float (ATextAngle);

   MyCStructure.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
   MyCStructure.ContextText.IsDef          = 1;
   MyCStructure.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
   MyCStructure.ContextText.IsDef          = 1;


@@ -1783,9 +1783,9 @@ void Graphic3d_Structure::SetTransformPersistence( const Graphic3d_TransModeFlag
   if (IsDeleted ()) return;
 
   MyCStructure.TransformPersistence.Flag = AFlag;
   if (IsDeleted ()) return;
 
   MyCStructure.TransformPersistence.Flag = AFlag;

-  MyCStructure.TransformPersistence.Point.x = APoint.X();
-  MyCStructure.TransformPersistence.Point.y = APoint.Y();
-  MyCStructure.TransformPersistence.Point.z = APoint.Z();
+  MyCStructure.TransformPersistence.Point.x = float (APoint.X());
+  MyCStructure.TransformPersistence.Point.y = float (APoint.Y());
+  MyCStructure.TransformPersistence.Point.z = float (APoint.Z());

   //MyStructureManager->Update ();
   //Update();
   MyGraphicDriver->ContextStructure( MyCStructure );
   //MyStructureManager->Update ();
   //Update();
   MyGraphicDriver->ContextStructure( MyCStructure );


@@ -2157,7 +2157,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
   MyCStructure.ContextText.ColorSubTitle.g  = float (Gs);
   MyCStructure.ContextText.ColorSubTitle.b  = float (Bs);
   MyCStructure.ContextText.TextZoomable     = ATextZoomable;
   MyCStructure.ContextText.ColorSubTitle.g  = float (Gs);
   MyCStructure.ContextText.ColorSubTitle.b  = float (Bs);
   MyCStructure.ContextText.TextZoomable     = ATextZoomable;

-  MyCStructure.ContextText.TextAngle        = ATextAngle;
+  MyCStructure.ContextText.TextAngle        = float (ATextAngle);

   MyCStructure.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
 
   MyCStructure.ContextText.TextFontAspect   = (int)ATextFontAspect;
 
 


@@ -2339,7 +2339,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
   Standard_Integer aPolyMode;
 
   // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
   Standard_Integer aPolyMode;

-  Standard_Real    aPolyFactor, aPolyUnits;
+  Standard_ShortReal    aPolyFactor, aPolyUnits;

   CTXF->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCStructure.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;
   CTXF->PolygonOffsets(aPolyMode, aPolyFactor, aPolyUnits);
   MyCStructure.ContextFillArea.PolygonOffsetMode   = aPolyMode;
   MyCStructure.ContextFillArea.PolygonOffsetFactor = aPolyFactor;

diff --git a/src/IFSelect/IFSelect_Editor.cxx b/src/IFSelect/IFSelect_Editor.cxx
index 435666f..f389a3d 100755 (executable)
--- a/src/IFSelect/IFSelect_Editor.cxx
+++ b/src/IFSelect/IFSelect_Editor.cxx
@@ -41,9 +41,9 @@ IFSelect_Editor::IFSelect_Editor (const Standard_Integer nbval)
   Standard_Integer lng = shn.Length();
   if (lng > 0) thenames->SetItem (shortname,num);
   if (lng > themaxsh) themaxsh = lng;
   Standard_Integer lng = shn.Length();
   if (lng > 0) thenames->SetItem (shortname,num);
   if (lng > themaxsh) themaxsh = lng;

-  lng = strlen (typval->Name());
+  lng = (Standard_Integer) strlen (typval->Name());

   if (lng > themaxco) themaxco = lng;
   if (lng > themaxco) themaxco = lng;

-  lng = strlen (typval->Label());
+  lng = (Standard_Integer) strlen (typval->Label());

   if (lng > themaxla) themaxla = lng;
 
   thenames->SetItem (typval->Name(),num);
   if (lng > themaxla) themaxla = lng;
 
   thenames->SetItem (typval->Name(),num);

diff --git a/src/Interface/Interface_MSG.cxx b/src/Interface/Interface_MSG.cxx
index 6f643c7..1dc99bd 100755 (executable)
--- a/src/Interface/Interface_MSG.cxx
+++ b/src/Interface/Interface_MSG.cxx
@@ -43,7 +43,7 @@ static Standard_Boolean theraise  = Standard_False;
 
 static char blank[] =
 "                                                                            ";
 
 static char blank[] =
 "                                                                            ";

-static Standard_Integer maxblank = strlen(blank);
+static Standard_Integer maxblank = (Standard_Integer) strlen(blank);

 
 
 Interface_MSG::Interface_MSG (const Standard_CString key)
 
 
 Interface_MSG::Interface_MSG (const Standard_CString key)


@@ -59,7 +59,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), i1);
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), i1);

-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];

   strcpy (theval,mess);
 }
 
   strcpy (theval,mess);
 }
 


@@ -70,7 +70,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), i1,i2);
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), i1,i2);

-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];

   strcpy (theval,mess);
 }
 
   strcpy (theval,mess);
 }
 


@@ -82,7 +82,7 @@ Interface_MSG::Interface_MSG
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey),
           (intervals < 0 ? r1 : Interface_MSG::Intervalled(r1,intervals)) );
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey),
           (intervals < 0 ? r1 : Interface_MSG::Intervalled(r1,intervals)) );

-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];

   strcpy (theval,mess);
 }
 
   strcpy (theval,mess);
 }
 


@@ -93,7 +93,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), str);
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), str);

-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];

   strcpy (theval,mess);
 }
 
   strcpy (theval,mess);
 }
 


@@ -105,7 +105,7 @@ Interface_MSG::Interface_MSG
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), val, str);
 {
   char mess[300];
   sprintf (mess, Interface_MSG::Translated(thekey), val, str);

-  theval = new char (strlen (mess)+1 );
+  theval = new char[strlen (mess) + 1];

   strcpy (theval,mess);
 }
 
   strcpy (theval,mess);
 }
 


@@ -444,7 +444,7 @@ Standard_CString  Interface_MSG::Blanks (const Standard_Integer val,
 Standard_CString  Interface_MSG::Blanks (const Standard_CString val,
                                          const Standard_Integer max)
 {
 Standard_CString  Interface_MSG::Blanks (const Standard_CString val,
                                          const Standard_Integer max)
 {

-  Standard_Integer lng = strlen(val);
+  Standard_Integer lng = (Standard_Integer) strlen(val);

   if (lng > maxblank || lng > max) return "";
   return &blank [maxblank - max + lng];
 }
   if (lng > maxblank || lng > max) return "";
   return &blank [maxblank - max + lng];
 }


@@ -464,7 +464,7 @@ void  Interface_MSG::Print (Standard_OStream& S, const Standard_CString val,
                             const Standard_Integer just)
 {
   if (max > maxblank)  {  Print(S,val,maxblank,just);  return;  }
                             const Standard_Integer just)
 {
   if (max > maxblank)  {  Print(S,val,maxblank,just);  return;  }

-  Standard_Integer lng = strlen (val);
+  Standard_Integer lng = (Standard_Integer) strlen (val);

   if (lng > max)  {  S << val;  return;  }
   Standard_Integer m1 = (max-lng) /2;
   Standard_Integer m2 = max-lng - m1;
   if (lng > max)  {  S << val;  return;  }
   Standard_Integer m1 = (max-lng) /2;
   Standard_Integer m2 = max-lng - m1;

diff --git a/src/LDOM/LDOMBasicString.cxx b/src/LDOM/LDOMBasicString.cxx
index f423b69..8991092 100755 (executable)
--- a/src/LDOM/LDOMBasicString.cxx
+++ b/src/LDOM/LDOMBasicString.cxx
@@ -37,7 +37,7 @@ LDOMBasicString::LDOMBasicString (const char * aValue)
     myVal.ptr = NULL;
   } else {
     myType = LDOM_AsciiFree;
     myVal.ptr = NULL;
   } else {
     myType = LDOM_AsciiFree;

-    Standard_Integer aLen = strlen (aValue) + 1;
+    Standard_Size aLen = strlen (aValue) + 1;

     myVal.ptr = new char [aLen];
     memcpy (myVal.ptr, aValue, aLen);
   }
     myVal.ptr = new char [aLen];
     memcpy (myVal.ptr, aValue, aLen);
   }


@@ -56,7 +56,7 @@ LDOMBasicString::LDOMBasicString (const char                     * aValue,
     myVal.ptr = NULL;
   } else {
     myType = LDOM_AsciiDoc;
     myVal.ptr = NULL;
   } else {
     myType = LDOM_AsciiDoc;

-    Standard_Integer aLen = strlen (aValue) + 1;
+    Standard_Integer aLen = (Standard_Integer) strlen (aValue) + 1;

     myVal.ptr = aDoc -> Allocate (aLen);
     memcpy (myVal.ptr, aValue, aLen);
   }
     myVal.ptr = aDoc -> Allocate (aLen);
     memcpy (myVal.ptr, aValue, aLen);
   }


@@ -93,7 +93,7 @@ LDOMBasicString::LDOMBasicString (const LDOMBasicString& anOther)
   switch (myType) {
   case LDOM_AsciiFree:
     if (anOther.myVal.ptr) {
   switch (myType) {
   case LDOM_AsciiFree:
     if (anOther.myVal.ptr) {

-      Standard_Integer aLen = strlen ((const char *)anOther.myVal.ptr) + 1;
+      Standard_Size aLen = strlen ((const char *)anOther.myVal.ptr) + 1;

       myVal.ptr = new char [aLen];
       memcpy (myVal.ptr, anOther.myVal.ptr, aLen);
       break;
       myVal.ptr = new char [aLen];
       memcpy (myVal.ptr, anOther.myVal.ptr, aLen);
       break;


@@ -149,7 +149,7 @@ LDOMBasicString& LDOMBasicString::operator = (const LDOMBasicString& anOther)
   switch (myType) {
   case LDOM_AsciiFree:
     if (anOther.myVal.ptr) {
   switch (myType) {
   case LDOM_AsciiFree:
     if (anOther.myVal.ptr) {

-      Standard_Integer aLen = strlen ((const char *)anOther.myVal.ptr) + 1;
+      Standard_Size aLen = strlen ((const char *)anOther.myVal.ptr) + 1;

       myVal.ptr = new char [aLen];
       memcpy (myVal.ptr, anOther.myVal.ptr, aLen);
       break;
       myVal.ptr = new char [aLen];
       memcpy (myVal.ptr, anOther.myVal.ptr, aLen);
       break;


@@ -269,7 +269,7 @@ LDOMBasicString::operator TCollection_ExtendedString () const
 
     // convert Unicode to Extended String
     ptr += 2;
 
     // convert Unicode to Extended String
     ptr += 2;

-    Standard_Integer aLength = (strlen(ptr) / 4), j = 0;
+    Standard_Size aLength = (strlen(ptr) / 4), j = 0;

     Standard_ExtCharacter * aResult = new Standard_ExtCharacter[aLength--];
     while (aLength--) {
       ptr += 4;
     Standard_ExtCharacter * aResult = new Standard_ExtCharacter[aLength--];
     while (aLength--) {
       ptr += 4;

diff --git a/src/LDOM/LDOM_XmlReader.cxx b/src/LDOM/LDOM_XmlReader.cxx
index 87986fd..b009073 100755 (executable)
--- a/src/LDOM/LDOM_XmlReader.cxx
+++ b/src/LDOM/LDOM_XmlReader.cxx
@@ -138,7 +138,7 @@ LDOM_XmlReader::RecordType LDOM_XmlReader::ReadRecord
 
       // Read the full buffer and reset start and end buffer pointers
         myPtr    = &myBuffer[0];
 
       // Read the full buffer and reset start and end buffer pointers
         myPtr    = &myBuffer[0];

-        Standard_Integer aNBytes;
+        Standard_Size aNBytes;

         if (myFileDes != FILE_NONVALUE)
           aNBytes = read (myFileDes, &myBuffer[aBytesRest],
                           XML_BUFFER_SIZE - aBytesRest);
         if (myFileDes != FILE_NONVALUE)
           aNBytes = read (myFileDes, &myBuffer[aBytesRest],
                           XML_BUFFER_SIZE - aBytesRest);

diff --git a/src/LDOM/LDOM_XmlWriter.cxx b/src/LDOM/LDOM_XmlWriter.cxx
index 8470984..9d6e854 100755 (executable)
--- a/src/LDOM/LDOM_XmlWriter.cxx
+++ b/src/LDOM/LDOM_XmlWriter.cxx
@@ -232,7 +232,7 @@ inline LDOM_XmlWriter& LDOM_XmlWriter::operator <<
     {
       const char * str = aString.GetString();
       if (str) {
     {
       const char * str = aString.GetString();
       if (str) {

-        const Standard_Integer aLen = strlen (str);
+        const Standard_Size aLen = strlen (str);

         if (aLen > 0) fwrite (str, aLen, 1, myFile);
       }
     }
         if (aLen > 0) fwrite (str, aLen, 1, myFile);
       }
     }


@@ -259,7 +259,7 @@ inline LDOM_XmlWriter& LDOM_XmlWriter::operator <<
 //=======================================================================
 inline LDOM_XmlWriter& LDOM_XmlWriter::operator << (const LXMLCh * aString)
 {
 //=======================================================================
 inline LDOM_XmlWriter& LDOM_XmlWriter::operator << (const LXMLCh * aString)
 {

-  unsigned int aLength = strlen (aString);
+  Standard_Size aLength = strlen (aString);

   if (aLength > 0) fwrite ((void *) aString, aLength, 1, myFile);
   return * this;
 }
   if (aLength > 0) fwrite ((void *) aString, aLength, 1, myFile);
   return * this;
 }


@@ -288,7 +288,7 @@ void LDOM_XmlWriter::WriteAttribute (const LDOM_Node& theAtt)
   if (aValueStr.Type() == LDOMBasicString::LDOM_Integer) {
     Standard_Integer anIntValue;
     aValueStr.GetInteger (anIntValue);
   if (aValueStr.Type() == LDOMBasicString::LDOM_Integer) {
     Standard_Integer anIntValue;
     aValueStr.GetInteger (anIntValue);

-    aLength = 20 + strlen (aName);
+    aLength = (Standard_Integer) (20 + strlen (aName));

     if (aLength > myABufferLen) {
       if (myABuffer != NULL) delete [] myABuffer;
       myABuffer    = new char [aLength+1];
     if (aLength > myABufferLen) {
       if (myABuffer != NULL) delete [] myABuffer;
       myABuffer    = new char [aLength+1];


@@ -296,7 +296,7 @@ void LDOM_XmlWriter::WriteAttribute (const LDOM_Node& theAtt)
     }
     sprintf (myABuffer, "%c%s%c%c%d%c", chSpace, aName,
              chEqual, chDoubleQuote, anIntValue, chDoubleQuote);
     }
     sprintf (myABuffer, "%c%s%c%c%d%c", chSpace, aName,
              chEqual, chDoubleQuote, anIntValue, chDoubleQuote);

-    aLength = strlen (myABuffer);
+    aLength = (Standard_Integer) strlen (myABuffer);

 
   //    String attribute value
   } else {
 
   //    String attribute value
   } else {


@@ -304,10 +304,10 @@ void LDOM_XmlWriter::WriteAttribute (const LDOM_Node& theAtt)
     char        * encStr;
     if (aValueStr.Type() == LDOMBasicString::LDOM_AsciiDocClear) {
       encStr  = (char *) aValue;
     char        * encStr;
     if (aValueStr.Type() == LDOMBasicString::LDOM_AsciiDocClear) {
       encStr  = (char *) aValue;

-      aLength = 4 + strlen (aValue) + strlen (aName);
+      aLength = (Standard_Integer) (4 + strlen (aValue) + strlen (aName));

     } else {
       encStr = LDOM_CharReference::Encode (aValue, aLength, Standard_True);
     } else {
       encStr = LDOM_CharReference::Encode (aValue, aLength, Standard_True);

-      aLength += 4 + strlen (aName);
+      aLength += (Standard_Integer) (4 + strlen (aName));

     }
     if (aLength > myABufferLen) {
       if (myABuffer != NULL) delete [] myABuffer;
     }
     if (aLength > myABufferLen) {
       if (myABuffer != NULL) delete [] myABuffer;

diff --git a/src/Message/Message_Msg.cxx b/src/Message/Message_Msg.cxx
index 5241398..363f80b 100755 (executable)
--- a/src/Message/Message_Msg.cxx
+++ b/src/Message/Message_Msg.cxx
@@ -169,7 +169,7 @@ Message_Msg& Message_Msg::Arg (const Standard_CString theString)
     return *this;
 
   // print string according to format
     return *this;
 
   // print string according to format

-  char * sStringBuffer = new char [Max (strlen(theString)+1, 1024)];
+  char * sStringBuffer = new char [Max ((Standard_Integer)strlen(theString)+1, 1024)];

   sprintf (sStringBuffer, aFormat.ToCString(), theString);
   TCollection_ExtendedString aStr ( sStringBuffer );
   delete [] sStringBuffer;
   sprintf (sStringBuffer, aFormat.ToCString(), theString);
   TCollection_ExtendedString aStr ( sStringBuffer );
   delete [] sStringBuffer;

diff --git a/src/NCollection/NCollection_BaseVector.cxx b/src/NCollection/NCollection_BaseVector.cxx
index 5deeb2a..783e86e 100755 (executable)
--- a/src/NCollection/NCollection_BaseVector.cxx
+++ b/src/NCollection/NCollection_BaseVector.cxx
@@ -34,7 +34,7 @@ Standard_Integer NCollection_BaseVector::MemBlock::GetIndexV
                    (void * theItem, const size_t theItemSize) const
 {
   const ptrdiff_t anOffset = (char *) theItem - (char *) myData;
                    (void * theItem, const size_t theItemSize) const
 {
   const ptrdiff_t anOffset = (char *) theItem - (char *) myData;

-  const Standard_Integer anIndex = anOffset / theItemSize;
+  const Standard_Integer anIndex = (Standard_Integer) (anOffset / theItemSize);

 #ifdef DEB
   if (anOffset < 0 || anOffset != Standard_Integer (anIndex * theItemSize)
       || anIndex > Standard_Integer (myLength))
 #ifdef DEB
   if (anOffset < 0 || anOffset != Standard_Integer (anIndex * theItemSize)
       || anIndex > Standard_Integer (myLength))

diff --git a/src/NIS/NIS_InteractiveObject.hxx b/src/NIS/NIS_InteractiveObject.hxx
index 176c7e8..edbf147 100755 (executable)
--- a/src/NIS/NIS_InteractiveObject.hxx
+++ b/src/NIS/NIS_InteractiveObject.hxx
@@ -388,7 +388,7 @@ class NIS_InteractiveObject : public Standard_Transient
   // ---------- PRIVATE FIELDS ----------
 
   Handle_NIS_Drawer             myDrawer;
   // ---------- PRIVATE FIELDS ----------
 
   Handle_NIS_Drawer             myDrawer;

-  Standard_Size                 myID;
+  Standard_Integer              myID;

   NIS_Drawer::DrawType          myDrawType      : 3;
   NIS_Drawer::DrawType          myBaseType      : 3;
   Standard_Boolean              myIsHidden      : 1;
   NIS_Drawer::DrawType          myDrawType      : 3;
   NIS_Drawer::DrawType          myBaseType      : 3;
   Standard_Boolean              myIsHidden      : 1;

diff --git a/src/OSD/OSD_Host.cxx b/src/OSD/OSD_Host.cxx
index d3d4182..e9d8e12 100755 (executable)
--- a/src/OSD/OSD_Host.cxx
+++ b/src/OSD/OSD_Host.cxx
@@ -277,7 +277,7 @@ OSD_Host :: OSD_Host () {
 
   if (  !Failed ()  ) {
   
 
   if (  !Failed ()  ) {
   

-   memSize = ms.dwAvailPageFile;
+    memSize = (Standard_Integer) ms.dwAvailPageFile;

 
    if (   WSAStartup (  MAKEWORD( 1, 1 ), &wd  )   ) {
    
 
    if (   WSAStartup (  MAKEWORD( 1, 1 ), &wd  )   ) {
    

diff --git a/src/OSD/OSD_SystemFont.cxx b/src/OSD/OSD_SystemFont.cxx
index 791e368..5accc0c 100755 (executable)
--- a/src/OSD/OSD_SystemFont.cxx
+++ b/src/OSD/OSD_SystemFont.cxx
@@ -71,7 +71,7 @@ MyFontAspect(OSD_FA_Undefined)
       MyFaceSize = -1;
     else
       //TODO catch exeption
       MyFaceSize = -1;
     else
       //TODO catch exeption

-      MyFaceSize =  str.Token( "-", 7 ).RealValue();
+      MyFaceSize =  str.Token( "-", 7 ).IntegerValue();

 
     //detect aspect
     if ( str.Token("-", 3).IsEqual( "bold" ) )
 
     //detect aspect
     if ( str.Token("-", 3).IsEqual( "bold" ) )

diff --git a/src/OpenGl/OpenGl_Display_1.cxx b/src/OpenGl/OpenGl_Display_1.cxx
index 52e2bee..e812396 100644 (file)
--- a/src/OpenGl/OpenGl_Display_1.cxx
+++ b/src/OpenGl/OpenGl_Display_1.cxx
@@ -259,7 +259,7 @@ class MultilineTextRenderer
       myNewStr        (0),
       myStrPtr        (&theStr[0])
   {
       myNewStr        (0),
       myStrPtr        (&theStr[0])
   {

-    const Standard_Integer  aStrLen       = wcslen(theStr); // Length of the original string
+    const Standard_Integer  aStrLen       = (Standard_Integer) wcslen(theStr); // Length of the original string

     Standard_Integer        aNextCRChar   = 0;  // Character after '\r' (Carriage Return)        '\x00\x0D'
     Standard_Integer        aHTNum        = 0;  // Number of       '\t' (Horizontal Tabulation)  '\x00\x09'
     Standard_Integer        aDumpNum      = 0;  // Number of '\a', '\b', '\v' and '\f'
     Standard_Integer        aNextCRChar   = 0;  // Character after '\r' (Carriage Return)        '\x00\x0D'
     Standard_Integer        aHTNum        = 0;  // Number of       '\t' (Horizontal Tabulation)  '\x00\x09'
     Standard_Integer        aDumpNum      = 0;  // Number of '\a', '\b', '\v' and '\f'

diff --git a/src/PCollection/PCollection_HAsciiString.cxx b/src/PCollection/PCollection_HAsciiString.cxx
index 77f1a12..f2fc6fd 100755 (executable)
--- a/src/PCollection/PCollection_HAsciiString.cxx
+++ b/src/PCollection/PCollection_HAsciiString.cxx
@@ -69,7 +69,7 @@ static int realstr(Standard_Real V, Standard_CString F)
 // Create : from a CString
 //-----------------------------------------------------------------------
 PCollection_HAsciiString::PCollection_HAsciiString(const Standard_CString S)
 // Create : from a CString
 //-----------------------------------------------------------------------
 PCollection_HAsciiString::PCollection_HAsciiString(const Standard_CString S)

-                                               : Data(strlen(S))
+                                               : Data((Standard_Integer) strlen(S))

 {
    for( Standard_Integer i = 0 ; i < Data.Length() ; i++) 
                             Data.SetValue(i, S[i]) ;
 {
    for( Standard_Integer i = 0 ; i < Data.Length() ; i++) 
                             Data.SetValue(i, S[i]) ;

diff --git a/src/PCollection/PCollection_HExtendedString.cxx b/src/PCollection/PCollection_HExtendedString.cxx
index ee6c038..fc8e125 100755 (executable)
--- a/src/PCollection/PCollection_HExtendedString.cxx
+++ b/src/PCollection/PCollection_HExtendedString.cxx
@@ -72,7 +72,7 @@ PCollection_HExtendedString::PCollection_HExtendedString
 // Create : from a CString
 //-----------------------------------------------------------------------
 PCollection_HExtendedString::PCollection_HExtendedString(const Standard_CString S)
 // Create : from a CString
 //-----------------------------------------------------------------------
 PCollection_HExtendedString::PCollection_HExtendedString(const Standard_CString S)

-                                               : Data(strlen(S))
+                                               : Data((Standard_Integer) strlen(S))

 {
    for( Standard_Integer i = 0 ; i < Data.Length() ; i++)  {
          Standard_ExtCharacter val = ToExtCharacter(S[i]);
 {
    for( Standard_Integer i = 0 ; i < Data.Length() ; i++)  {
          Standard_ExtCharacter val = ToExtCharacter(S[i]);

diff --git a/src/Prs2d/Prs2d_Diameter.cxx b/src/Prs2d/Prs2d_Diameter.cxx
index b7b9f70..1749881 100755 (executable)
--- a/src/Prs2d/Prs2d_Diameter.cxx
+++ b/src/Prs2d/Prs2d_Diameter.cxx
@@ -96,9 +96,9 @@ Prs2d_Diameter::Prs2d_Diameter( const Handle(Graphic2d_GraphicObject)& aGO,
    myAppX2 = Standard_ShortReal(X1);
    myAppY2 = Standard_ShortReal(Y1);
    if (myX1>=myX2) 
    myAppX2 = Standard_ShortReal(X1);
    myAppY2 = Standard_ShortReal(Y1);
    if (myX1>=myX2) 

-     myAppX2=myAppX2+(theDist+theRad)/APPENDIXLEN;
+     myAppX2=Standard_ShortReal( myAppX2+(theDist+theRad)/APPENDIXLEN );

    else 
    else 

-     myAppX2=myAppX2-(theDist+theRad)/APPENDIXLEN;
+     myAppX2=Standard_ShortReal( myAppX2-(theDist+theRad)/APPENDIXLEN );

    
    if ( myAppX2 < myMinX ) myMinX = myAppX2;
    if ( myAppY2 < myMinY ) myMinY = myAppY2;
    
    if ( myAppX2 < myMinX ) myMinX = myAppX2;
    if ( myAppY2 < myMinY ) myMinY = myAppY2;

diff --git a/src/StepData/StepData_StepDumper.cxx b/src/StepData/StepData_StepDumper.cxx
index 777d413..af8b393 100755 (executable)
--- a/src/StepData/StepData_StepDumper.cxx
+++ b/src/StepData/StepData_StepDumper.cxx
@@ -159,7 +159,7 @@ Standard_Boolean  StepData_StepDumper::Dump
       for (i = 1; i <= nb; i ++)  {
        if (ids.Value(i) <= 0 || ids.Value(i) == i) continue;
        sprintf (unid,"%d:#%d",i,ids.Value(i));
       for (i = 1; i <= nb; i ++)  {
        if (ids.Value(i) <= 0 || ids.Value(i) == i) continue;
        sprintf (unid,"%d:#%d",i,ids.Value(i));

-       nbc = strlen (unid);  nbr = ((80-nbc) %4) +2;
+       nbc = (Standard_Integer) strlen (unid);  nbr = ((80-nbc) %4) +2;

        nbl +=  nbc;
        if (nbl+nbr0 > 79) { nbl  = nbc;  S<<endl; }
        else               { nbl += nbr0; for (; nbr0 > 0; nbr0 --) S << " "; }
        nbl +=  nbc;
        if (nbl+nbr0 > 79) { nbl  = nbc;  S<<endl; }
        else               { nbl += nbr0; for (; nbr0 > 0; nbr0 --) S << " "; }

diff --git a/src/StepData/StepData_StepWriter.cxx b/src/StepData/StepData_StepWriter.cxx
index 97bc056..05450c3 100755 (executable)
--- a/src/StepData/StepData_StepWriter.cxx
+++ b/src/StepData/StepData_StepWriter.cxx
@@ -510,7 +510,7 @@ void StepData_StepWriter::SendComment(const Handle(TCollection_HAsciiString)& te
 void StepData_StepWriter::SendComment (const Standard_CString text)
 {
   if (!thecomm) Interface_InterfaceMismatch::Raise("StepWriter : Comment");
 void StepData_StepWriter::SendComment (const Standard_CString text)
 {
   if (!thecomm) Interface_InterfaceMismatch::Raise("StepWriter : Comment");

-  AddString(text,strlen(text));
+  AddString(text,(Standard_Integer) strlen(text));

 }
 
 
 }
 
 


@@ -725,7 +725,7 @@ void StepData_StepWriter::OpenSub ()
 void StepData_StepWriter::OpenTypedSub (const Standard_CString subtype)
 {
   AddParam();
 void StepData_StepWriter::OpenTypedSub (const Standard_CString subtype)
 {
   AddParam();

-  if (subtype[0] != '\0') AddString (subtype,strlen(subtype));
+  if (subtype[0] != '\0') AddString (subtype,(Standard_Integer) strlen(subtype));

   AddString(textlist);
   thefirst = Standard_True;
   thelevel ++;
   AddString(textlist);
   thefirst = Standard_True;
   thelevel ++;


@@ -767,7 +767,7 @@ void StepData_StepWriter::Send (const Standard_Integer val)
   char lval[12];
   AddParam();
   sprintf(lval,"%d",val);
   char lval[12];
   AddParam();
   sprintf(lval,"%d",val);

-  AddString(lval,strlen(lval));
+  AddString(lval,(Standard_Integer) strlen(lval));

 }
 
 
 }
 
 


@@ -926,7 +926,7 @@ void StepData_StepWriter::Send (const Handle(Standard_Transient)& val)
     if (thelabmode < 2 || idnum == idtrue) sprintf(lident,"#%d",idnum);
     else sprintf(lident,"%d:#%d",idnum,idtrue);
     AddParam();
     if (thelabmode < 2 || idnum == idtrue) sprintf(lident,"#%d",idnum);
     else sprintf(lident,"%d:#%d",idnum,idtrue);
     AddParam();

-    AddString(lident,strlen(lident));
+    AddString(lident,(Standard_Integer) strlen(lident));

   }
 }
 
   }
 }
 


@@ -979,7 +979,7 @@ void StepData_StepWriter::SendString (const TCollection_AsciiString& val)
 void StepData_StepWriter::SendString (const Standard_CString val)
 {
   AddParam();
 void StepData_StepWriter::SendString (const Standard_CString val)
 {
   AddParam();

-  AddString(val,strlen(val));
+  AddString(val,(Standard_Integer) strlen(val));

 }
 
 //  SendEnum : attention, on envoie un intitule d'Enum ... donc entre .  .
 }
 
 //  SendEnum : attention, on envoie un intitule d'Enum ... donc entre .  .

diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx
index e67fef6..af0afce 100755 (executable)
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Dumper.cxx
@@ -208,7 +208,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom_BSplineCurve)&
   if (periodic) OS<<"periodic, ";
   OS<<"degree "<<degree<<", "<<nbpoles<<" poles, "<<nbknots<<" knots"<<endl;
   
   if (periodic) OS<<"periodic, ";
   OS<<"degree "<<degree<<", "<<nbpoles<<" poles, "<<nbknots<<" knots"<<endl;
   

-  for (i = 1,OS<<"poles : ",l = strlen("poles : ") + 1,n = nbpoles; 
+  //l = strlen("poles : ") + 1
+  for (i = 1,OS<<"poles : ",l = 9,n = nbpoles; 

        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }
        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }


@@ -228,7 +229,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom_BSplineCurve)&
     OS<<endl;
   }
   
     OS<<endl;
   }
   

-  for (i = 1,OS<<"knots : ",l = strlen("knots : ") + 1,n = nbknots;
+  //l = strlen("knots : ") + 1
+  for (i = 1,OS<<"knots : ",l = 9,n = nbknots;

        i<=n;
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }
        i<=n;
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }


@@ -281,7 +283,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom2d_BSplineCurve)&
   if (periodic) OS<<"periodic, ";
   OS<<"degree "<<degree<<", "<<nbpoles<<" poles, "<<nbknots<<" knots"<<endl;
   
   if (periodic) OS<<"periodic, ";
   OS<<"degree "<<degree<<", "<<nbpoles<<" poles, "<<nbknots<<" knots"<<endl;
   

-  for (i = 1,OS<<"poles : ",l = strlen("poles : ") + 1,n = nbpoles; 
+  //l = strlen("poles : ") + 1
+  for (i = 1,OS<<"poles : ",l = 9,n = nbpoles; 

        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }
        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }


@@ -301,7 +304,8 @@ Standard_OStream& TopOpeBRepDS_Dumper::Print(const Handle(Geom2d_BSplineCurve)&
     OS<<endl;
   }
   
     OS<<endl;
   }
   

-  for (i = 1,OS<<"knots : ",l = strlen("knots : ") + 1,n = nbknots; 
+  //l = strlen("knots : ") + 1
+  for (i = 1,OS<<"knots : ",l = 9,n = nbknots; 

        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }
        i<=n; 
        i++) {
     if (!compact)      { if (i == 1) lb = 0; else lb = l; }

diff --git a/src/TopTools/TopTools_LocationSet.cxx b/src/TopTools/TopTools_LocationSet.cxx
index b300cf0..1ba6752 100755 (executable)
--- a/src/TopTools/TopTools_LocationSet.cxx
+++ b/src/TopTools/TopTools_LocationSet.cxx
@@ -178,7 +178,7 @@ void  TopTools_LocationSet::Dump(Standard_OStream& OS) const
 void  TopTools_LocationSet::Write(Standard_OStream& OS) const 
 {
   
 void  TopTools_LocationSet::Write(Standard_OStream& OS) const 
 {
   

-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);

 
   Standard_Integer i, nbLoc = myMap.Extent();
   OS << "Locations " << nbLoc << "\n";
 
   Standard_Integer i, nbLoc = myMap.Extent();
   OS << "Locations " << nbLoc << "\n";

diff --git a/src/TopTools/TopTools_ShapeSet.cxx b/src/TopTools/TopTools_ShapeSet.cxx
index eb18be0..ce66b94 100755 (executable)
--- a/src/TopTools/TopTools_ShapeSet.cxx
+++ b/src/TopTools/TopTools_ShapeSet.cxx
@@ -458,7 +458,7 @@ void  TopTools_ShapeSet::Write(Standard_OStream& OS)
   // on positionne LC_NUMERIC a "C" (point decimal)
   setlocale(LC_NUMERIC, "C") ;
 
   // on positionne LC_NUMERIC a "C" (point decimal)
   setlocale(LC_NUMERIC, "C") ;
 

-  int  prec = OS.precision(15);
+  std::streamsize prec = OS.precision(15);

 
   // write the copyright
   if (myFormatNb == 2)
 
   // write the copyright
   if (myFormatNb == 2)


@@ -642,7 +642,7 @@ void  TopTools_ShapeSet::Read(Standard_IStream& IS)
     //if(pm = strchr(vers,'\r'))
     //  *pm ='\0';
     
     //if(pm = strchr(vers,'\r'))
     //  *pm ='\0';
     

-    for (Standard_Integer lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 
+    for (Standard_Size lv = (strlen(vers)- 1); lv > 1 && (vers[lv] == '\r' || vers[lv] == '\n') ;lv--) 

       vers[lv] = '\0';
     
   } while ( ! IS.fail() && strcmp(vers,Version) && strcmp(vers,Version2) );
       vers[lv] = '\0';
     
   } while ( ! IS.fail() && strcmp(vers,Version) && strcmp(vers,Version2) );

diff --git a/src/Units/Units_Lexicon.cxx b/src/Units/Units_Lexicon.cxx
index fa7d6b0..8ec33ad 100755 (executable)
--- a/src/Units/Units_Lexicon.cxx
+++ b/src/Units/Units_Lexicon.cxx
@@ -59,7 +59,8 @@ void Units_Lexicon::Creates(const Standard_CString afilename)
   char *Oper = oper ;
   char *Coeff = coeff ;
 #endif
   char *Oper = oper ;
   char *Coeff = coeff ;
 #endif

-  Standard_Integer fr,i;
+  Standard_Integer fr;
+  Standard_Size i;

   Standard_Real value;
   Handle(Units_Token) token;
   struct stat buf;
   Standard_Real value;
   Handle(Units_Token) token;
   struct stat buf;


@@ -85,7 +86,7 @@ void Units_Lexicon::Creates(const Standard_CString afilename)
   //for(i=0; i<=255; i++)line[i]=0;
 
   while(file.getline(line,255)) {
   //for(i=0; i<=255; i++)line[i]=0;
 
   while(file.getline(line,255)) {

-    int len = strlen( line ) ;
+    Standard_Size len = strlen( line ) ;

     if(len == 1) continue; //skl - ???
     for ( i = 0 ; i < 30 ; i++ ) {
       if ( i < len )
     if(len == 1) continue; //skl - ???
     for ( i = 0 ; i < 30 ; i++ ) {
       if ( i < len )

diff --git a/src/Units/Units_Sentence.cxx b/src/Units/Units_Sentence.cxx
index 0ff48a9..432d789 100755 (executable)
--- a/src/Units/Units_Sentence.cxx
+++ b/src/Units/Units_Sentence.cxx
@@ -31,8 +31,8 @@ static Handle(Units_Token) CreateTokenForNumber(const Standard_CString str)
 {
   TCollection_AsciiString tstr = str[0];
   Standard_Boolean IsPoint = Standard_False;
 {
   TCollection_AsciiString tstr = str[0];
   Standard_Boolean IsPoint = Standard_False;

-  Standard_Integer len = strlen(str);
-  for(Standard_Integer in=1; in < len; in++) {
+  Standard_Size len = strlen(str);
+  for(Standard_Size in=1; in < len; in++) {

     if( str[in]=='0' || str[in]=='1' || str[in]=='2' || str[in]=='3' || 
         str[in]=='4' || str[in]=='5' || str[in]=='6' || str[in]=='7' || 
         str[in]=='8' || str[in]=='9' ) {
     if( str[in]=='0' || str[in]=='1' || str[in]=='2' || str[in]=='3' || 
         str[in]=='4' || str[in]=='5' || str[in]=='6' || str[in]=='7' || 
         str[in]=='8' || str[in]=='9' ) {

diff --git a/src/Units/Units_UnitsDictionary.cxx b/src/Units/Units_UnitsDictionary.cxx
index 03f884f..1dc82bb 100755 (executable)
--- a/src/Units/Units_UnitsDictionary.cxx
+++ b/src/Units/Units_UnitsDictionary.cxx
@@ -146,7 +146,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
     file.getline(line,255);
     if (!file)
       break;
     file.getline(line,255);
     if (!file)
       break;

-    fr = strlen(line);
+    fr = (Standard_Integer) strlen(line);

     if(fr <= 1)
       continue;
     //if( !file || line[0] == '.') { //skl
     if(fr <= 1)
       continue;
     //if( !file || line[0] == '.') { //skl


@@ -192,7 +192,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
       //if(!file) break; //skl
       file.getline(line,255);
       file.getline(line,255);
       //if(!file) break; //skl
       file.getline(line,255);
       file.getline(line,255);

-      fr = strlen(line);
+      fr = (Standard_Integer) strlen(line);

          
 #if 0 // skl for OCC13438
       //for(i=0; i<80; i++)name[i] = 0;
          
 #if 0 // skl for OCC13438
       //for(i=0; i<80; i++)name[i] = 0;


@@ -277,7 +277,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
            << "Convert" << Convert << endl 
            << "Unit2" << Unit2 << endl ;
 #else
            << "Convert" << Convert << endl 
            << "Unit2" << Unit2 << endl ;
 #else

-      int len = strlen( line ) ;
+      Standard_Integer len = (Standard_Integer) strlen( line ) ;

       for ( i=0 ; i<51 ; i++ ) {
         if ( i<len )
           fr = sscanf(&line[i],"%c",&unite[i]);
       for ( i=0 ; i<51 ; i++ ) {
         if ( i<len )
           fr = sscanf(&line[i],"%c",&unite[i]);


@@ -342,7 +342,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
          
       if(convert[0] == '[') {
         coeff = 1.;
          
       if(convert[0] == '[') {
         coeff = 1.;

-        i = strlen(convert);
+        i = (Standard_Integer) strlen(convert);

         convert[i-1] = 0;
         ismove = Standard_True;
         charnumber = 1;
         convert[i-1] = 0;
         ismove = Standard_True;
         charnumber = 1;


@@ -371,7 +371,7 @@ void Units_UnitsDictionary::Creates(const Standard_CString afilename)
       }
          
       if(convert[charnumber] == '(') {
       }
          
       if(convert[charnumber] == '(') {

-        i = strlen(convert);
+        i = (Standard_Integer) strlen(convert);

         convert[i-1] = 0;
         Units_MathSentence mathsentence(&convert[charnumber+1]);
         if(ismove)
         convert[i-1] = 0;
         Units_MathSentence mathsentence(&convert[charnumber+1]);
         if(ismove)

diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
index f496abc..34d5cee 100755 (executable)
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -4260,12 +4260,12 @@ static Standard_Integer VPolygonOffset(Draw_Interpretor& di,
   }
 
   Standard_Integer aMode;
   }
 
   Standard_Integer aMode;

-  Standard_Real    aFactor, aUnits;
+  Standard_ShortReal    aFactor, aUnits;

   if (argc == 5)
   {
     aMode   = atoi(argv[2]);
   if (argc == 5)
   {
     aMode   = atoi(argv[2]);

-    aFactor = atof(argv[3]);
-    aUnits  = atof(argv[4]);
+    aFactor = (Standard_ShortReal) atof(argv[3]);
+    aUnits  = (Standard_ShortReal) atof(argv[4]);

 
     anInterObj->SetPolygonOffsets(aMode, aFactor, aUnits);
     aContext->UpdateCurrentViewer();
 
     anInterObj->SetPolygonOffsets(aMode, aFactor, aUnits);
     aContext->UpdateCurrentViewer();

diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx
index 66ed70c..5154d1a 100755 (executable)
--- a/src/VrmlData/VrmlData_Geometry.cxx
+++ b/src/VrmlData/VrmlData_Geometry.cxx
@@ -640,7 +640,7 @@ VrmlData_ErrorStatus VrmlData_ArrayVec3d::ReadArray
   if (OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
     // Match the name with the current word in the stream
     if (theName) {
   if (OK(aStatus, VrmlData_Scene::ReadLine(theBuffer))) {
     // Match the name with the current word in the stream
     if (theName) {

-      const Standard_Integer aNameLen = strlen(theName);
+      const Standard_Size aNameLen = strlen(theName);

       if (strncmp (theBuffer.LinePtr, theName, aNameLen))
         aStatus = VrmlData_VrmlFormatError;
       else
       if (strncmp (theBuffer.LinePtr, theName, aNameLen))
         aStatus = VrmlData_VrmlFormatError;
       else

diff --git a/src/VrmlData/VrmlData_Scene.cxx b/src/VrmlData/VrmlData_Scene.cxx
index ee25542..3c568a7 100755 (executable)
--- a/src/VrmlData/VrmlData_Scene.cxx
+++ b/src/VrmlData/VrmlData_Scene.cxx
@@ -839,7 +839,7 @@ VrmlData_ErrorStatus VrmlData_Scene::ReadArrIndex
             aStatus = VrmlData_UnrecoverableError;
           else {
             for (size_t i = 0; i < aNbBlocks; i++)
             aStatus = VrmlData_UnrecoverableError;
           else {
             for (size_t i = 0; i < aNbBlocks; i++)

-              anArray[i] = vecIndice(i);
+              anArray[i] = vecIndice((Standard_Integer)i);

             theNBlocks = aNbBlocks;
             theArray = anArray;
           } 
             theNBlocks = aNbBlocks;
             theArray = anArray;
           } 

diff --git a/src/WNT/WNT_ImageManager.cxx b/src/WNT/WNT_ImageManager.cxx
index 12fbc5a..2b5d505 100755 (executable)
--- a/src/WNT/WNT_ImageManager.cxx
+++ b/src/WNT/WNT_ImageManager.cxx
@@ -391,7 +391,7 @@ Standard_Integer WNT_ImageManager :: StringHashCode (
 
  } u;
 
 
  } u;
 

- n = strlen ( aString );
+ n = (Standard_Integer) strlen ( aString );

 
  if ( n > 0 ) {
 
 
  if ( n > 0 ) {
 

diff --git a/src/XSControl/XSControl_TransferReader.cxx b/src/XSControl/XSControl_TransferReader.cxx
index 7d3e787..fac3f01 100755 (executable)
--- a/src/XSControl/XSControl_TransferReader.cxx
+++ b/src/XSControl/XSControl_TransferReader.cxx
@@ -895,7 +895,7 @@ Standard_Integer XSControl_TransferReader::TransferOne
          <<"      Ident : "<<lab->ToCString()
          <<  Interface_MSG::Blanks(14 - lab->Length())<<"******\n";
     sout << "******    Type : "<<theModel->TypeName(ent,Standard_False)
          <<"      Ident : "<<lab->ToCString()
          <<  Interface_MSG::Blanks(14 - lab->Length())<<"******\n";
     sout << "******    Type : "<<theModel->TypeName(ent,Standard_False)

-        <<  Interface_MSG::Blanks(44 - strlen(theModel->TypeName(ent,Standard_False)))
+        <<  Interface_MSG::Blanks((Standard_Integer) (44 - strlen(theModel->TypeName(ent,Standard_False))))

        <<  "******";
     sout<<"\n*******************************************************************\n";
   }
        <<  "******";
     sout<<"\n*******************************************************************\n";
   }

diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx
index dd0d140..f7a04e6 100755 (executable)
--- a/src/XSDRAW/XSDRAW.cxx
+++ b/src/XSDRAW/XSDRAW.cxx
@@ -241,7 +241,7 @@ void XSDRAW::LoadDraw (Draw_Interpretor& theCommands)
   if (!first || first[0] == '\0') {
     char ligne[80];  ligne[0] = '\0'; char truc;
 //    cin.clear();  cin.get (ligne,79,'\n');
   if (!first || first[0] == '\0') {
     char ligne[80];  ligne[0] = '\0'; char truc;
 //    cin.clear();  cin.get (ligne,79,'\n');

-    cin >> ligne;  int ln = strlen(ligne);
+    cin >> ligne;  Standard_Size ln = strlen(ligne);

     char *ff = &ligne[0], *ss = NULL;
     cin.get(truc);  if (truc != '\n') { cin>>&ligne[ln+1]; ss = &ligne[ln+1]; }
     return  XSDRAW::GetList (ff,ss);
     char *ff = &ligne[0], *ss = NULL;
     cin.get(truc);  if (truc != '\n') { cin>>&ligne[ln+1]; ss = &ligne[ln+1]; }
     return  XSDRAW::GetList (ff,ss);