0033404: Configuration - Building with Cotire failed on Clang-15

Replaced old including of int defs from C standard into C++(11+) standard

dox/contribution/coding_rules.md

@@ -725,7 +725,7 @@ Another possible problem is the order of initialization of global variables defi
 
 Avoid explicit usage of basic types (*int*, *float*, *double*, etc.), use Open CASCADE Technology types from package *Standard: Standard_Integer, Standard_Real, Standard_ShortReal, Standard_Boolean, Standard_CString* and others or a specific *typedef* instead.
 
-### Use sizeof() to calculate sizes [MANDATORY]
+### Use *sizeof()* to calculate sizes [MANDATORY]
 
 Do not assume sizes of types. Use *sizeof()* instead to calculate sizes.
 
@@ -738,7 +738,7 @@ It is recommended to follow this rule for any plain text files for consistency a
 
 The rules listed in this chapter are important for stability of the programs that use Open CASCADE Technology libraries.
 
-### Use OSD::SetSignal() to catch exceptions
+### Use *OSD::SetSignal()* to catch exceptions
 
 When using Open CASCADE Technology in an application, call *OSD::SetSignal()* function when the application is initialized.
 
@@ -787,7 +787,7 @@ See the following example:
 
 In C++ use *new* and *delete* operators instead of *malloc()* and *free()*. Try not to mix different memory allocation techniques.
 
-### Match new and delete [MANDATORY]
+### Match *new* and *delete* [MANDATORY]
 
 Use the same form of new and delete.
 
@@ -812,7 +812,7 @@ Standard_Integer aTmpVar2 = 0; // OK
 
 Uninitialized variables might be kept only within performance-sensitive code blocks and only when their initialization is guaranteed by subsequent code.
 
-### Do not hide global new
+### Do not hide global *new*
 
 Avoid hiding the global *new* operator.
 

dox/user_guides/draw_test_harness/draw_test_harness.md

@@ -780,7 +780,7 @@ restore theBox
 
 @subsubsection occt_draw_3_3_1 set
 
-#### In DrawTrSurf package:
+#### In *DrawTrSurf* package:
 
 ~~~~{.php}
 void Set(Standard_CString& Name,const gp_Pnt& G) ; 
@@ -797,7 +797,7 @@ void Set(Standard_CString& Name,
 const Handle(Poly_Polygon2D)& P) ; 
 ~~~~
 
-#### In DBRep package:
+#### In *DBRep* package:
 
 ~~~~{.php}
 void Set(const Standard_CString Name, 
@@ -822,13 +822,13 @@ DBRep::Set(char*,B);
 
 @subsubsection occt_draw_3_3_2 get
 
-#### In DrawTrSurf package:
+#### In *DrawTrSurf* package:
  
 ~~~~{.php}
 Handle_Geom_Geometry Get(Standard_CString& Name) ; 
 ~~~~
 
-#### In DBRep package:
+#### In *DBRep* package:
 
 ~~~~{.php}
 TopoDS_Shape Get(Standard_CString& Name, 

src/AIS/AIS_ViewController.cxx

@@ -1047,13 +1047,11 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
                             : 0.0;
       if (double (Abs (aDelta.x())) > aZoomTol)
       {
-        UpdateZoom (Aspect_ScrollDelta (aDelta.x()));
-
-        myUI.Dragging.ToMove  = true;
-        myUI.Dragging.PointTo = thePoint;
-
+        if (UpdateZoom (Aspect_ScrollDelta (aDelta.x())))
+        {
+          toUpdateView = true;
+        }
         myMouseProgressPoint = thePoint;
-        toUpdateView = true;
       }
       break;
     }
@@ -1077,6 +1075,7 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
         }
 
         aDelta.y() = -aDelta.y();
+        myMouseProgressPoint = thePoint;
         if (myUI.Panning.ToPan)
         {
           myUI.Panning.Delta += aDelta;
@@ -1086,12 +1085,6 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
           myUI.Panning.ToPan = true;
           myUI.Panning.Delta = aDelta;
         }
-
-        myUI.Dragging.ToMove  = true;
-        myUI.Dragging.PointTo = thePoint;
-
-        myMouseProgressPoint = thePoint;
-
         toUpdateView = true;
       }
       break;
@@ -3060,8 +3053,6 @@ void AIS_ViewController::handleDynamicHighlight (const Handle(AIS_InteractiveCon
       OnObjectDragged (theCtx, theView, AIS_DragAction_Update);
       myGL.OrbitRotation.ToRotate = false;
       myGL.ViewRotation .ToRotate = false;
-      myGL.Panning      .ToPan = false;
-      myGL.ZoomActions.Clear();
     }
   }
 }

src/BRepOffset/BRepOffset_MakeOffset_1.cxx

@@ -1177,45 +1177,6 @@ void BRepOffset_BuildOffsetFaces::IntersectTrimmedEdges (const Message_ProgressR
   UpdateIntersectedEdges (aLA, aGFE);
 }
 
-namespace
-{
-  //=======================================================================
-  //function : CheckConnectionsOfFace
-  //purpose  : Checks number of connections for theFace with theLF
-  //           Returns true if number of connections more than 1
-  //=======================================================================
-  static Standard_Boolean checkConnectionsOfFace(const TopoDS_Shape& theFace,
-    const TopTools_ListOfShape& theLF)
-  {
-    TopTools_IndexedMapOfShape aShapeVert;
-    for (TopTools_ListOfShape::Iterator aFImIterator(theLF); aFImIterator.More(); aFImIterator.Next())
-    {
-      const TopoDS_Shape& aShape = aFImIterator.Value();
-      if (aShape.IsSame(theFace))
-      {
-        continue;
-      }
-      TopExp::MapShapes(aShape, TopAbs_VERTEX, aShapeVert);
-    }
-    Standard_Integer aNbConnections = 0;
-    TopTools_IndexedMapOfShape aFaceVertices;
-    TopExp::MapShapes(theFace, TopAbs_VERTEX, aFaceVertices);
-    for (TopTools_IndexedMapOfShape::Iterator aVertIter(aFaceVertices); aVertIter.More(); aVertIter.Next())
-    {
-      const TopoDS_Shape& aVert = aVertIter.Value();
-      if (aShapeVert.Contains(aVert))
-      {
-        ++aNbConnections;
-      }
-      if (aNbConnections > 1)
-      {
-        return Standard_True;
-      }
-    }
-    return Standard_False;
-  }
-}
-
 //=======================================================================
 //function : BuildSplitsOfFaces
 //purpose  : Building the splits of offset faces and
@@ -1307,10 +1268,6 @@ void BRepOffset_BuildOffsetFaces::BuildSplitsOfFaces (const Message_ProgressRang
       for (TopTools_ListIteratorOfListOfShape aItLFIm (aLFImages1); aItLFIm.More();)
       {
         Standard_Boolean bAllInv = Standard_True;
-        // Additional check for artificial case 
-        // if current image face consist only of edges from aMapEInv and aMENInv
-        // then recheck current face for the futher processing
-        Standard_Boolean aToReCheckFace = bArtificialCase;
         const TopoDS_Shape& aFIm = aItLFIm.Value();
         TopExp_Explorer aExpE (aFIm, TopAbs_EDGE);
         for (; aExpE.More(); aExpE.Next())
@@ -1321,19 +1278,12 @@ void BRepOffset_BuildOffsetFaces::BuildSplitsOfFaces (const Message_ProgressRang
             bAllInv = Standard_False;
             if (!aMENInv.Contains (aE))
             {
-              aToReCheckFace = Standard_False;
               break;
             }
           }
         }
-        // if current image face is to recheck then check number of connections for this face
-        // with other image faces for current face
-        if (!aExpE.More() && aToReCheckFace)
-        {
-          aToReCheckFace = checkConnectionsOfFace(aFIm, aLFImages1);
-        }
-        // do not delete image face from futher processing if aToReCheckFace is true
-        if (!aExpE.More() && !aToReCheckFace)
+        //
+        if (!aExpE.More())
         {
           if (bAllInv)
           {

src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx

@@ -1292,10 +1292,6 @@ BRepOffsetAPI_ThruSections::Generated(const TopoDS_Shape& S)
     for (; itl.More(); itl.Next())
     {
       Standard_Integer IndOfFace = itl.Value();
-      if (AllFaces.Size() < IndOfFace)
-      {
-        continue;
-      }
       myGenerated.Append(AllFaces(IndOfFace));
     }
 
@@ -1306,10 +1302,6 @@ BRepOffsetAPI_ThruSections::Generated(const TopoDS_Shape& S)
         {
           Standard_Integer IndOfFace = itl.Value();
           IndOfFace += (i-1)*myNbEdgesInSection;
-          if (AllFaces.Size() < IndOfFace)
-          {
-            continue;
-          }
           myGenerated.Append(AllFaces(IndOfFace));
         }
   }

src/BinMXCAFDoc/BinMXCAFDoc_VisMaterialDriver.cxx

@@ -126,68 +126,23 @@ static void readColor (const BinObjMgt_Persistent& theSource,
 static void writeTexture (BinObjMgt_Persistent& theTarget,
                           const Handle(Image_Texture)& theImage)
 {
-  if (theImage.IsNull())
-  {
-    theTarget.PutAsciiString("");
-    return;
-  }
-  if (theImage->DataBuffer().IsNull())
-  {
-    theTarget.PutAsciiString(theImage->FilePath());
-    theTarget.PutBoolean(false);
-    if (theImage->FileOffset() == -1 || theImage->FileLength() == -1)
-    {
-      theTarget.PutBoolean(true);
-      return;
-    }
-    theTarget.PutBoolean(false);
-    theTarget.PutInteger(static_cast<int>(theImage->FileOffset()));
-    theTarget.PutInteger(static_cast<int>(theImage->FileLength()));
-    return;
-  }
-  theTarget.PutAsciiString(theImage->TextureId());
-  theTarget.PutBoolean(true);
-  theTarget.PutInteger(static_cast<int>(theImage->DataBuffer()->Size()));
-  theTarget.PutByteArray((Standard_Byte*)theImage->DataBuffer()->Data(),
-                         static_cast<int>(theImage->DataBuffer()->Size()));
+  theTarget.PutAsciiString (!theImage.IsNull()
+                         && !theImage->FilePath().IsEmpty()
+                         &&  theImage->FileOffset() == -1
+                          ? theImage->FilePath()
+                          : "");
 }
 
 //! Decode texture path.
 static void readTexture (const BinObjMgt_Persistent& theSource,
                          Handle(Image_Texture)& theTexture)
 {
-  TCollection_AsciiString aStr;
-  theSource.GetAsciiString(aStr);
-  if (aStr.IsEmpty())
+  TCollection_AsciiString aPath;
+  theSource.GetAsciiString (aPath);
+  if (!aPath.IsEmpty())
   {
-    return;
+    theTexture = new Image_Texture (aPath);
   }
-  Standard_Boolean anUseBuffer;
-  if (!theSource.GetBoolean(anUseBuffer).IsOK())
-  {
-    theTexture = new Image_Texture(aStr);
-    return;
-  }
-  Standard_Integer anOffset = -1, aLength = -1;
-  if (!anUseBuffer)
-  {
-    Standard_Boolean isOnlyFilePath;
-    theSource.GetBoolean(isOnlyFilePath);
-    if (isOnlyFilePath)
-    {
-      theTexture = new Image_Texture(aStr);
-      return;
-    }
-    theSource.GetInteger(anOffset);
-    theSource.GetInteger(aLength);
-    theTexture = new Image_Texture(aStr, anOffset, aLength);
-    return;
-  }
-  theSource.GetInteger(aLength);
-  Handle(NCollection_Buffer) aBuff =
-    new NCollection_Buffer(NCollection_BaseAllocator::CommonBaseAllocator(), aLength);
-  theSource.GetByteArray(aBuff->ChangeData(), aLength);
-  theTexture = new Image_Texture(aBuff, aStr);
 }
 
 //=======================================================================

src/ChFi2d/ChFi2d_FilletAlgo.cxx

@@ -597,7 +597,7 @@ TopoDS_Edge ChFi2d_FilletAlgo::Result(const gp_Pnt& thePoint, TopoDS_Edge& theEd
   gp_Vec aCircleDir;
   aCircle->D1(aParam1, aPoint1, aCircleDir);
     
-  if ((aCircleDir.Angle(aDir) > M_PI / 2.0) ? !aIsOut : aIsOut)
+  if ((aCircleDir.Angle(aDir) > M_PI / 2.0) ^ aIsOut)
     aStart = aNearest->getParam();
   else
     anEnd = aNearest->getParam();
@@ -619,7 +619,7 @@ TopoDS_Edge ChFi2d_FilletAlgo::Result(const gp_Pnt& thePoint, TopoDS_Edge& theEd
    
   aCircle->D1(aParam2, aPoint2, aCircleDir);
 
-  if ((aCircleDir.Angle(aDir) > M_PI / 2.0) ? aIsOut : !aIsOut)
+  if ((aCircleDir.Angle(aDir) > M_PI / 2.0) ^ (!aIsOut))
     aStart = aNearest->getParam2();
   else
     anEnd = aNearest->getParam2();

src/DE/DE_Wrapper.cxx

@@ -538,6 +538,7 @@ Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath
       {
         theProvider = aNode->BuildProvider();
         aNode->GlobalParameters = GlobalParameters;
+        theProvider->SetNode(aNode);
         return Standard_True;
       }
     }

src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx

@@ -125,7 +125,7 @@ Handle(DE_ConfigurationNode) DEXCAFCascade_ConfigurationNode::Copy() const
 //=======================================================================
 Handle(DE_Provider) DEXCAFCascade_ConfigurationNode::BuildProvider()
 {
-  return new DEXCAFCascade_Provider (this);
+  return new DEXCAFCascade_Provider();
 }
 
 //=======================================================================

src/ExpToCasExe/exptocas.lex

@@ -86,9 +86,7 @@ int ec_error ( const std::string& s, const std::string& text )
 
 %top{
 // Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
-#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
-#include "stdint.h"
-#endif
+#include <Standard_TypeDef.hxx>
 }
 
 %{

src/ExpToCasExe/lex.exptocas.cxx

@@ -1,7 +1,5 @@
 // Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
-#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
-#include "stdint.h"
-#endif
+#include <Standard_TypeDef.hxx>
 
 #define  YY_INT_ALIGNED short int
 

src/GeomFill/GeomFill_SectionPlacement.cxx

@@ -609,7 +609,7 @@ void GeomFill_SectionPlacement::Perform(const Handle(Adaptor3d_Curve)& Path,
 			    myAdpSection.LastParameter(),
 			    Path->Resolution(Tol/100), 
 			    myAdpSection.Resolution(Tol/100));
-	  if (Ext.IsDone() && !Ext.IsParallel()) {
+	  if (Ext.IsDone()) {
 	    Extrema_POnCurv P1, P2;
 	    for (ii=1; ii<=Ext.NbExt(); ii++) {
 	      distaux = sqrt (Ext.SquareDistance(ii));

src/IGESControl/IGESControl_ActorWrite.cxx

@@ -73,7 +73,7 @@ Handle(Transfer_Binder)  IGESControl_ActorWrite::Transfer
     shape = XSAlgo::AlgoContainer()->ProcessShape( shape, Tol, maxTol, 
                                                    "write.iges.resource.name", 
                                                    "write.iges.sequence", info,
-                                                   theProgress, false, TopAbs_EDGE);
+                                                   theProgress );
 //  modified by NIZHNY-EAP Tue Aug 29 11:17:01 2000 ___END___
 
     BRepToIGES_BREntity   BR0; BR0.SetModel(modl);  BR0.SetTransferProcess(FP);

src/IGESControl/IGESControl_Writer.cxx

@@ -92,7 +92,7 @@ Standard_Boolean IGESControl_Writer::AddShape (const TopoDS_Shape& theShape,
   TopoDS_Shape Shape = XSAlgo::AlgoContainer()->ProcessShape( theShape, Tol, maxTol, 
                                                               "write.iges.resource.name", 
                                                               "write.iges.sequence", info,
-                                                              aPS.Next(), false, TopAbs_EDGE);
+                                                              aPS.Next());
   if (!aPS.More())
     return Standard_False;
 

src/IGESToBRep/IGESToBRep_Actor.cxx

@@ -198,7 +198,7 @@ Handle(Transfer_Binder) IGESToBRep_Actor::Transfer
                                                   "read.iges.resource.name",
                                                   "read.iges.sequence",
                                                   info, mymodel->ReShape(),
-                                                  aPS.Next(), false, TopAbs_EDGE);
+                                                  aPS.Next());
     XSAlgo::AlgoContainer()->MergeTransferInfo(TP, info, nbTPitems);
   }
 

src/IGESToBRep/IGESToBRep_Reader.cxx

@@ -552,7 +552,7 @@ Standard_Boolean  IGESToBRep_Reader::Transfer(const Standard_Integer num,
     shape = XSAlgo::AlgoContainer()->ProcessShape( shape, eps*CAS.GetUnitFactor(), CAS.GetMaxTol(),
                                                    "read.iges.resource.name", 
                                                    "read.iges.sequence", info,
-                                                   aPS.Next(), false, TopAbs_EDGE);
+                                                   aPS.Next() );
     if (aPS.UserBreak())
       return Standard_False;
 

src/Image/Image_AlienPixMap.cxx

@@ -135,10 +135,6 @@ namespace
     Image_FreeImageStream (std::istream& theStream)
     : myIStream (&theStream), myOStream (NULL), myInitPos (theStream.tellg()) {}
 
-    //! Construct wrapper over output stream.
-    Image_FreeImageStream (std::ostream& theStream)
-    : myIStream (NULL), myOStream (&theStream), myInitPos (theStream.tellp()) {}
-
     //! Get io object.
     FreeImageIO GetFiIO() const
     {
@@ -147,15 +143,12 @@ namespace
       if (myIStream != NULL)
       {
         anIo.read_proc = readProc;
-        anIo.seek_proc = seekProcIn;
-        anIo.tell_proc = tellProcIn;
+        anIo.seek_proc = seekProc;
+        anIo.tell_proc = tellProc;
       }
       if (myOStream != NULL)
       {
         anIo.write_proc = writeProc;
-        // seek and tell are also used for saving in some formats (.tif for example)
-        anIo.seek_proc = seekProcOut;
-        anIo.tell_proc = tellProcOut;
       }
       return anIo;
     }
@@ -190,7 +183,7 @@ namespace
     }
 
     //! Simulate fseek().
-    static int DLL_CALLCONV seekProcIn (fi_handle theHandle, long theOffset, int theOrigin)
+    static int DLL_CALLCONV seekProc (fi_handle theHandle, long theOffset, int theOrigin)
     {
       Image_FreeImageStream* aThis = (Image_FreeImageStream* )theHandle;
       if (aThis->myIStream == NULL)
@@ -223,53 +216,13 @@ namespace
       return isSeekDone ? 0 : -1;
     }
 
-    static int DLL_CALLCONV seekProcOut (fi_handle theHandle, long theOffset, int theOrigin)
-    {
-      Image_FreeImageStream* aThis = (Image_FreeImageStream* )theHandle;
-      if (aThis->myOStream == NULL)
-      {
-        return -1;
-      }
-
-      bool isSeekDone = false;
-      switch (theOrigin)
-      {
-      case SEEK_SET:
-        if (aThis->myOStream->seekp ((std::streamoff )aThis->myInitPos + theOffset, std::ios::beg))
-        {
-          isSeekDone = true;
-        }
-        break;
-      case SEEK_CUR:
-        if (aThis->myOStream->seekp (theOffset, std::ios::cur))
-        {
-          isSeekDone = true;
-        }
-        break;
-      case SEEK_END:
-        if (aThis->myOStream->seekp (theOffset, std::ios::end))
-        {
-          isSeekDone = true;
-        }
-        break;
-      }
-      return isSeekDone ? 0 : -1;
-    }
-
     //! Simulate ftell().
-    static long DLL_CALLCONV tellProcIn (fi_handle theHandle)
+    static long DLL_CALLCONV tellProc (fi_handle theHandle)
     {
       Image_FreeImageStream* aThis = (Image_FreeImageStream* )theHandle;
       const long aPos = aThis->myIStream != NULL ? (long )(aThis->myIStream->tellg() - aThis->myInitPos) : 0;
       return aPos;
     }
-
-    static long DLL_CALLCONV tellProcOut (fi_handle theHandle)
-    {
-      Image_FreeImageStream* aThis = (Image_FreeImageStream* )theHandle;
-      const long aPos = aThis->myOStream != NULL ? (long )(aThis->myOStream->tellp() - aThis->myInitPos) : 0;
-      return aPos;
-    }
   private:
     std::istream*  myIStream;
     std::ostream*  myOStream;
@@ -285,37 +238,6 @@ namespace
     return aGuid;
   }
 
-  //! Returns GUID of image format from file name
-  static GUID getFileFormatFromName (const TCollection_AsciiString& theFileName)
-  {
-    TCollection_AsciiString aFileNameLower = theFileName;
-    aFileNameLower.LowerCase();
-    GUID aFileFormat = getNullGuid();
-    if (aFileNameLower.EndsWith (".bmp"))
-    {
-      aFileFormat = GUID_ContainerFormatBmp;
-    }
-    else if (aFileNameLower.EndsWith (".png"))
-    {
-      aFileFormat = GUID_ContainerFormatPng;
-    }
-    else if (aFileNameLower.EndsWith (".jpg")
-          || aFileNameLower.EndsWith (".jpeg"))
-    {
-      aFileFormat = GUID_ContainerFormatJpeg;
-    }
-    else if (aFileNameLower.EndsWith (".tiff")
-          || aFileNameLower.EndsWith (".tif"))
-    {
-      aFileFormat = GUID_ContainerFormatTiff;
-    }
-    else if (aFileNameLower.EndsWith (".gif"))
-    {
-      aFileFormat = GUID_ContainerFormatGif;
-    }
-    return aFileFormat;
-  }
-
   //! Sentry over IUnknown pointer.
   template<class T> class Image_ComPtr
   {
@@ -424,11 +346,7 @@ namespace
 // purpose  :
 // =======================================================================
 Image_AlienPixMap::Image_AlienPixMap()
-#ifdef HAVE_WINCODEC
-: myPalette (NULL)
-#else
 : myLibImage (NULL)
-#endif
 {
   SetTopDown (false);
 }
@@ -587,12 +505,6 @@ void Image_AlienPixMap::Clear()
     FreeImage_Unload (myLibImage);
     myLibImage = NULL;
   }
-#elif defined(HAVE_WINCODEC)
-  if (myPalette != NULL)
-  {
-    myPalette->Release();
-    myPalette = NULL;
-  }
 #elif defined(__EMSCRIPTEN__)
   if (myLibImage != NULL)
   {
@@ -623,7 +535,7 @@ bool Image_AlienPixMap::IsTopDownDefault()
 // =======================================================================
 #ifdef HAVE_FREEIMAGE
 bool Image_AlienPixMap::Load (const Standard_Byte* theData,
-                              const Standard_Size theLength,
+                              Standard_Size theLength,
                               const TCollection_AsciiString& theImagePath)
 {
   Clear();
@@ -793,7 +705,7 @@ bool Image_AlienPixMap::Load (std::istream& theStream,
 
 #elif defined(HAVE_WINCODEC)
 bool Image_AlienPixMap::Load (const Standard_Byte* theData,
-                              const Standard_Size theLength,
+                              Standard_Size theLength,
                               const TCollection_AsciiString& theFileName)
 {
   Clear();
@@ -839,7 +751,7 @@ bool Image_AlienPixMap::Load (const Standard_Byte* theData,
    || aFrameCount < 1
    || aWicDecoder->GetFrame (0, &aWicFrameDecode.ChangePtr()) != S_OK
    || aWicFrameDecode->GetSize (&aFrameSizeX, &aFrameSizeY) != S_OK
-   || aWicFrameDecode->GetPixelFormat (&aWicPixelFormat) != S_OK)
+   || aWicFrameDecode->GetPixelFormat (&aWicPixelFormat))
   {
     Message::SendFail ("Error: cannot get WIC Image Frame");
     return false;
@@ -856,6 +768,7 @@ bool Image_AlienPixMap::Load (const Standard_Byte* theData,
       Message::SendFail ("Error: cannot convert WIC Image Frame to RGB format");
       return false;
     }
+    aWicFrameDecode.Nullify();
   }
 
   if (!Image_PixMap::InitTrash (aPixelFormat, aFrameSizeX, aFrameSizeY))
@@ -864,37 +777,17 @@ bool Image_AlienPixMap::Load (const Standard_Byte* theData,
     return false;
   }
 
-  TCollection_AsciiString aFileNameLower = theFileName;
-  aFileNameLower.LowerCase();
-  if (aFileNameLower.EndsWith (".gif")
-   && (aWicImgFactory->CreatePalette (&myPalette) != S_OK
-    || aWicFrameDecode->CopyPalette (myPalette) != S_OK))
-  {
-    Message::SendFail ("Error: cannot get palette for GIF image");
-    return false;
-  }
-
   IWICBitmapSource* aWicSrc = aWicFrameDecode.get();
   if(!aWicConvertedFrame.IsNull())
   {
     aWicSrc = aWicConvertedFrame.get();
   }
-
-  IWICBitmapFlipRotator* aRotator;
-  bool isTopDown = true;
-  if (aWicImgFactory->CreateBitmapFlipRotator (&aRotator) == S_OK
-   && aRotator->Initialize (aWicSrc, WICBitmapTransformFlipVertical) == S_OK)
-  {
-    isTopDown = false;
-    aWicSrc = aRotator;
-  }
-
   if (aWicSrc->CopyPixels (NULL, (UINT )SizeRowBytes(), (UINT )SizeBytes(), ChangeData()) != S_OK)
   {
     Message::SendFail ("Error: cannot copy pixels from WIC Image");
     return false;
   }
-  SetTopDown (isTopDown);
+  SetTopDown (true);
   return true;
 }
 bool Image_AlienPixMap::Load (std::istream& theStream,
@@ -931,7 +824,7 @@ bool Image_AlienPixMap::Load (std::istream& ,
   return false;
 }
 bool Image_AlienPixMap::Load (const Standard_Byte* theData,
-                              const Standard_Size theLength,
+                              Standard_Size theLength,
                               const TCollection_AsciiString& theImagePath)
 {
   Clear();
@@ -964,7 +857,7 @@ bool Image_AlienPixMap::Load (std::istream& ,
   return false;
 }
 bool Image_AlienPixMap::Load (const Standard_Byte* ,
-                              const Standard_Size ,
+                              Standard_Size ,
                               const TCollection_AsciiString& )
 {
   Clear();
@@ -1014,52 +907,11 @@ bool Image_AlienPixMap::savePPM (const TCollection_AsciiString& theFileName) con
   return true;
 }
 
-// =======================================================================
-// function : convertData
-// purpose  :
-// =======================================================================
-#ifdef HAVE_WINCODEC
-static bool convertData (const Image_AlienPixMap& theSrcPixMapData,
-                         const WICPixelFormatGUID& theFormat,
-                         IWICImagingFactory& theWicImgFactory,
-                         Image_PixMapData& theDstPixMapData)
-{
-  const UINT aSizeRowBytes = (UINT)theSrcPixMapData.SizeRowBytes();
-  const UINT aSizeBytes = (UINT)theSrcPixMapData.SizeBytes();
-
-  Image_ComPtr<IWICBitmap> anSrcImg;
-  Image_ComPtr<IWICFormatConverter> aWicFormatConverter;
-  HRESULT anHResult = theWicImgFactory.CreateBitmapFromMemory ((UINT)theSrcPixMapData.SizeX(), (UINT)theSrcPixMapData.SizeY(),
-                                                               convertToWicFormat (theSrcPixMapData.Format()),
-                                                               aSizeRowBytes, aSizeBytes,
-                                                               (BYTE*)theSrcPixMapData.Data(), &anSrcImg.ChangePtr());
-  if (anHResult != S_OK
-   || theWicImgFactory.CreateFormatConverter (&aWicFormatConverter.ChangePtr()) != S_OK
-   || aWicFormatConverter->Initialize (anSrcImg.get(), theFormat, WICBitmapDitherTypeNone, theSrcPixMapData.GetPalette(), 0.0f, WICBitmapPaletteTypeCustom) != S_OK)
-  {
-    Message::SendFail ("Error: cannot convert WIC Image Frame to required format");
-    return false;
-  }
-
-  theDstPixMapData.Init (Image_PixMap::DefaultAllocator(), 1, theSrcPixMapData.SizeXYZ(), aSizeRowBytes, NULL);
-
-  if (aWicFormatConverter->CopyPixels (NULL, aSizeRowBytes, aSizeBytes, theDstPixMapData.ChangeData()) != S_OK)
-  {
-    Message::SendFail ("Error: cannot copy pixels from WIC Image");
-    return false;
-  }
-
-  return true;
-}
-#endif
-
 // =======================================================================
 // function : Save
 // purpose  :
 // =======================================================================
-bool Image_AlienPixMap::Save (Standard_Byte* theBuffer,
-                              const Standard_Size theLength,
-                              const TCollection_AsciiString& theFileName)
+bool Image_AlienPixMap::Save (const TCollection_AsciiString& theFileName)
 {
 #ifdef HAVE_FREEIMAGE
   if (myLibImage == NULL)
@@ -1087,399 +939,10 @@ bool Image_AlienPixMap::Save (Standard_Byte* theBuffer,
     SetTopDown (false);
   }
 
-  FIBITMAP* anImageToDump = getImageToDump (anImageFormat);
-
-  if (anImageToDump == NULL)
-  {
-    return false;
-  }
-
-  bool isSaved = false;
-  if (theBuffer != NULL)
-  {
-    // a memory buffer wrapped by FreeImage is read only (images can be loaded but not be saved)
-    // so we call FreeImage_OpenMemory() with default arguments and just memcpy in requsted buffer.
-    FIMEMORY* aFiMem = FreeImage_OpenMemory();
-    isSaved = (FreeImage_SaveToMemory (anImageFormat, anImageToDump, aFiMem) != FALSE);
-    BYTE* aData = NULL;
-    DWORD aSize;
-    FreeImage_AcquireMemory (aFiMem, &aData, &aSize);
-    if (aSize > theLength)
-    {
-      Message::SendFail ("Error: memory buffer too small for storing image");
-      return false;
-    }
-    memcpy (theBuffer, aData, aSize);
-    FreeImage_CloseMemory (aFiMem);
-  }
-  else
-  {
-#ifdef _WIN32
-    isSaved = (FreeImage_SaveU (anImageFormat, anImageToDump, aFileNameW.ToWideString ()) != FALSE);
-#else
-    isSaved = (FreeImage_Save (anImageFormat, anImageToDump, theFileName.ToCString ()) != FALSE);
-#endif
-  }
-  if (anImageToDump != myLibImage)
-  {
-    FreeImage_Unload (anImageToDump);
-  }
-  return isSaved;
-
-#elif defined(HAVE_WINCODEC)
-
-  TCollection_AsciiString aFileNameLower = theFileName;
-  aFileNameLower.LowerCase();
-  if (aFileNameLower.EndsWith (".ppm"))
-  {
-    return savePPM (theFileName);
-  }
-
-  GUID aFileFormat = getFileFormatFromName (theFileName);
-  if (aFileFormat == getNullGuid())
-  {
-    Message::SendFail ("Error: unsupported image format");
-    return false;
-  }
-
-  Image_ComPtr<IWICImagingFactory> aWicImgFactory;
-  CoInitializeEx (NULL, COINIT_MULTITHREADED);
-  if (CoCreateInstance (CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&aWicImgFactory.ChangePtr())) != S_OK)
-  {
-    Message::SendFail ("Error: cannot initialize WIC Imaging Factory");
-    return false;
-  }
-
-  WICPixelFormatGUID aWicPixelFormat = convertToWicFormat (myImgFormat);
-  if (aWicPixelFormat == getNullGuid())
-  {
-    Message::SendFail ("Error: unsupported pixel format");
-    return false;
-  }
-
-  Image_PixMapData* aPixMapData = &myData;
-  Image_PixMapData aConvertedData;
-  if (aFileFormat == GUID_ContainerFormatGif)
-  {
-    aWicPixelFormat = GUID_WICPixelFormat8bppIndexed;
-    convertData (*this, aWicPixelFormat, *aWicImgFactory, aConvertedData);
-    aPixMapData = &aConvertedData;
-  }
-
-  Image_ComPtr<IWICStream> aWicStream;
-  Image_ComPtr<IWICBitmapEncoder> aWicEncoder;
-  const TCollection_ExtendedString aFileNameW (theFileName);
-  if (theBuffer != NULL)
-  {
-    if (aWicImgFactory->CreateStream (&aWicStream.ChangePtr()) != S_OK
-     || aWicStream->InitializeFromMemory (theBuffer,(DWORD )theLength) != S_OK)
-    {
-      Message::SendFail ("Error: cannot create WIC Memory Stream");
-      return false;
-    }
-  }
-  else
-  {
-    if (aWicImgFactory->CreateStream (&aWicStream.ChangePtr()) != S_OK
-     || aWicStream->InitializeFromFilename (aFileNameW.ToWideString(), GENERIC_WRITE) != S_OK)
-    {
-      Message::SendFail ("Error: cannot create WIC File Stream");
-      return false;
-    }
-  }
-  if (aWicImgFactory->CreateEncoder (aFileFormat, NULL, &aWicEncoder.ChangePtr()) != S_OK
-   || aWicEncoder->Initialize (aWicStream.get(), WICBitmapEncoderNoCache) != S_OK)
-  {
-    Message::SendFail ("Error: cannot create WIC Encoder");
-    return false;
-  }
-
-  WICPixelFormatGUID aWicPixelFormatRes = aWicPixelFormat;
-  Image_ComPtr<IWICBitmapFrameEncode> aWicFrameEncode;
-  if (aWicEncoder->CreateNewFrame (&aWicFrameEncode.ChangePtr(), NULL) != S_OK
-   || aWicFrameEncode->Initialize (NULL) != S_OK
-   || aWicFrameEncode->SetSize ((UINT )SizeX(), (UINT )SizeY()) != S_OK
-   || aWicFrameEncode->SetPixelFormat (&aWicPixelFormatRes) != S_OK)
-  {
-    Message::SendFail ("Error: cannot create WIC Frame");
-    return false;
-  }
-
-  if (aFileFormat == GUID_ContainerFormatGif
-   && (myPalette == NULL
-    || aWicFrameEncode->SetPalette (myPalette) != S_OK))
-  {
-    Message::SendFail ("Error: cannot set palette");
-    return false;
-  }
-
-  if (aWicPixelFormatRes != aWicPixelFormat)
-  {
-    Message::SendFail ("Error: pixel format is unsupported by image format");
-    return false;
-  }
-
-  if (IsTopDown())
-  {
-    if (aWicFrameEncode->WritePixels ((UINT )SizeY(), (UINT )SizeRowBytes(), (UINT )SizeBytes(), (BYTE* )aPixMapData->Data()) != S_OK)
-    {
-      Message::SendFail ("Error: cannot write pixels to WIC Frame");
-      return false;
-    }
-  }
-  else
-  {
-    for (Standard_Size aRow = 0; aRow < SizeY(); ++aRow)
-    {
-      if (aWicFrameEncode->WritePixels (1, (UINT )SizeRowBytes(), (UINT )SizeRowBytes(), (BYTE* )aPixMapData->Row (aRow)) != S_OK)
-      {
-        Message::SendFail ("Error: cannot write pixels to WIC Frame");
-        return false;
-      }
-    }
-  }
-  if (aWicFrameEncode->Commit() != S_OK
-   || aWicEncoder->Commit() != S_OK)
-  {
-    Message::SendFail ("Error: cannot commit data to WIC Frame");
-    return false;
-  }
-  if (aWicStream->Commit (STGC_DEFAULT) != S_OK)
-  {
-    //Message::Send ("Error: cannot commit data to WIC File Stream", Message_Fail);
-    //return false;
-  }
-  return true;
-#else
-  if (theBuffer != NULL)
-  {
-    Message::SendFail ("Error: no image library available");
-    return false;
-  }
-  const Standard_Integer aLen = theFileName.Length();
-  if ((aLen >= 4) && (theFileName.Value (aLen - 3) == '.')
-      && strcasecmp( theFileName.ToCString() + aLen - 3, "ppm") == 0 )
-  {
-    return savePPM (theFileName);
-  }
-  Message::SendTrace ("Image_PixMap, no image library available! Image saved in PPM format");
-  return savePPM (theFileName);
-#endif
-}
-
-bool Image_AlienPixMap::Save (std::ostream& theStream, const TCollection_AsciiString& theExtension)
-{
-#ifdef HAVE_FREEIMAGE
-  if (myLibImage == NULL)
-  {
-    return false;
-  }
-
-#ifdef _WIN32
-  const TCollection_ExtendedString anExtW (theExtension.ToCString(), Standard_True);
-  FREE_IMAGE_FORMAT anImageFormat = FreeImage_GetFIFFromFilenameU (anExtW.ToWideString());
-#else
-  FREE_IMAGE_FORMAT anImageFormat = FreeImage_GetFIFFromFilename (theExtension.ToCString());
-#endif
-  if (anImageFormat == FIF_UNKNOWN)
-  {
-#ifdef OCCT_DEBUG
-    std::cerr << "Image_PixMap, image format doesn't supported!\n";
-#endif
-    return false;
-  }
-
-  if (IsTopDown())
-  {
-    FreeImage_FlipVertical (myLibImage);
-    SetTopDown (false);
-  }
-
-  FIBITMAP* anImageToDump = getImageToDump (anImageFormat);
-
-  if (anImageToDump == NULL)
-  {
-    return false;
-  }
-
-  bool isSaved = false;
-  Image_FreeImageStream aStream (theStream);
-  FreeImageIO anIO = aStream.GetFiIO();
-
-  isSaved = (FreeImage_SaveToHandle(anImageFormat, anImageToDump, &anIO, &aStream) != FALSE);
-
-  if (anImageToDump != myLibImage)
-  {
-    FreeImage_Unload (anImageToDump);
-  }
-  return isSaved;
-#elif defined(HAVE_WINCODEC)
-  GUID aFileFormat = getFileFormatFromName (theExtension);
-  if (aFileFormat == getNullGuid())
-  {
-    Message::SendFail ("Error: unsupported image format");
-    return false;
-  }
-
-  Image_ComPtr<IWICImagingFactory> aWicImgFactory;
-  CoInitializeEx (NULL, COINIT_MULTITHREADED);
-  if (CoCreateInstance (CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&aWicImgFactory.ChangePtr())) != S_OK)
-  {
-    Message::SendFail ("Error: cannot initialize WIC Imaging Factory");
-    return false;
-  }
-
-  WICPixelFormatGUID aWicPixelFormat = convertToWicFormat (myImgFormat);
-  if (aWicPixelFormat == getNullGuid())
-  {
-    Message::SendFail ("Error: unsupported pixel format");
-    return false;
-  }
-
-  Image_PixMapData* aPixMapData = &myData;
-  Image_PixMapData aConvertedData;
-  if (aFileFormat == GUID_ContainerFormatGif)
-  {
-    aWicPixelFormat = GUID_WICPixelFormat8bppIndexed;
-    convertData (*this, aWicPixelFormat, *aWicImgFactory, aConvertedData);
-    aPixMapData = &aConvertedData;
-  }
-
-  Image_ComPtr<IStream> aStream;
-  Image_ComPtr<IWICBitmapEncoder> aWicEncoder;
-
-  if (CreateStreamOnHGlobal (NULL, Standard_True, &aStream.ChangePtr()) != S_OK)
-  {
-    Message::SendFail ("Error: cannot create Stream on global");
-    return false;
-  }
-
-  if (aWicImgFactory->CreateEncoder (aFileFormat, NULL, &aWicEncoder.ChangePtr()) != S_OK
-   || aWicEncoder->Initialize (aStream.get(), WICBitmapEncoderNoCache) != S_OK)
-  {
-    Message::SendFail ("Error: cannot create WIC Encoder");
-    return false;
-  }
-
-  WICPixelFormatGUID aWicPixelFormatRes = aWicPixelFormat;
-  Image_ComPtr<IWICBitmapFrameEncode> aWicFrameEncode;
-  if (aWicEncoder->CreateNewFrame (&aWicFrameEncode.ChangePtr(), NULL) != S_OK
-   || aWicFrameEncode->Initialize (NULL) != S_OK
-   || aWicFrameEncode->SetSize ((UINT )SizeX(), (UINT )SizeY()) != S_OK
-   || aWicFrameEncode->SetPixelFormat (&aWicPixelFormatRes) != S_OK)
-  {
-    Message::SendFail ("Error: cannot create WIC Frame");
-    return false;
-  }
-
-  if (aFileFormat == GUID_ContainerFormatGif
-   && (myPalette == NULL
-    || aWicFrameEncode->SetPalette (myPalette) != S_OK))
-  {
-    Message::SendFail ("Error: cannot set palette");
-    return false;
-  }
-
-  if (aWicPixelFormatRes != aWicPixelFormat)
-  {
-    Message::SendFail ("Error: pixel format is unsupported by image format");
-    return false;
-  }
-
-  if (IsTopDown())
-  {
-    if (aWicFrameEncode->WritePixels ((UINT )SizeY(), (UINT )SizeRowBytes(), (UINT )SizeBytes(), (BYTE* )aPixMapData->Data()) != S_OK)
-    {
-      Message::SendFail ("Error: cannot write pixels to WIC Frame");
-      return false;
-    }
-  }
-  else
-  {
-    for (Standard_Size aRow = 0; aRow < SizeY(); ++aRow)
-    {
-      if (aWicFrameEncode->WritePixels (1, (UINT )SizeRowBytes(), (UINT )SizeRowBytes(), (BYTE* )aPixMapData->Row (aRow)) != S_OK)
-      {
-        Message::SendFail ("Error: cannot write pixels to WIC Frame");
-        return false;
-      }
-    }
-  }
-  if (aWicFrameEncode->Commit() != S_OK
-   || aWicEncoder->Commit() != S_OK)
-  {
-    Message::SendFail ("Error: cannot commit data to WIC Frame");
-    return false;
-  }
-  if (aStream->Commit (STGC_DEFAULT) != S_OK)
-  {
-    //Message::Send ("Error: cannot commit data to Stream", Message_Fail);
-    //return false;
-  }
-
-  // WIC doesn't have the way to encode image directly in std::ostream
-  // so we use a workaround to transfer data from IStream to std::ostream
-  STATSTG aStat;
-  if (aStream->Stat (&aStat, STATFLAG_NONAME) != S_OK)
-  {
-    Message::SendFail ("Error: cannot get stat from stream");
-    return false;
-  }
-  HGLOBAL aMem;
-  if (GetHGlobalFromStream (aStream.get(), &aMem) != S_OK)
-  {
-    Message::SendFail ("Error: cannot get global from stream");
-    return false;
-  }
-
-  LPVOID aData = GlobalLock (aMem);
-  if (aData == NULL)
-  {
-    Message::SendFail ("Error: cannot lock global");
-    return false;
-  }
-  if (!theStream.write ((const char* )aData, aStat.cbSize.QuadPart))
-  {
-    Message::SendFail ("Error: cannot write data to ostream");
-    return false;
-  }
-  if (GlobalUnlock (aMem) == 0 && GetLastError() != NO_ERROR)
-  {
-    Message::SendFail ("Error: cannot unlock global");
-    return false;
-  }
-  return true;
-#else
-  Message::SendFail ("Error: no image library available");
-  return false;
-#endif
-}
-
-// =======================================================================
-// function : AdjustGamma
-// purpose  :
-// =======================================================================
-bool Image_AlienPixMap::AdjustGamma (const Standard_Real theGammaCorr)
-{
-#ifdef HAVE_FREEIMAGE
-  return FreeImage_AdjustGamma (myLibImage, theGammaCorr) != FALSE;
-#else
-  (void )theGammaCorr;
-  return false;
-#endif
-}
-
-#ifdef HAVE_FREEIMAGE
-// =======================================================================
-// function : GetImageToDump
-// purpose  :
-// =======================================================================
-FIBITMAP* Image_AlienPixMap::getImageToDump (const Standard_Integer theFormat)
-{
-  FIBITMAP* anImageToDump = myLibImage;
   // FreeImage doesn't provide flexible format conversion API
   // so we should perform multiple conversions in some cases!
-  switch (theFormat)
+  FIBITMAP* anImageToDump = myLibImage;
+  switch (anImageFormat)
   {
     case FIF_PNG:
     case FIF_BMP:
@@ -1510,7 +973,7 @@ FIBITMAP* Image_AlienPixMap::getImageToDump (const Standard_Integer theFormat)
         aTmpBitmap = FreeImage_ConvertToType (myLibImage, FIT_BITMAP);
         if (aTmpBitmap == NULL)
         {
-          return NULL;
+          return false;
         }
       }
 
@@ -1523,7 +986,7 @@ FIBITMAP* Image_AlienPixMap::getImageToDump (const Standard_Integer theFormat)
         }
         if (aTmpBitmap24 == NULL)
         {
-          return NULL;
+          return false;
         }
         aTmpBitmap = aTmpBitmap24;
       }
@@ -1568,7 +1031,7 @@ FIBITMAP* Image_AlienPixMap::getImageToDump (const Standard_Integer theFormat)
         anImageToDump = FreeImage_ConvertToType (myLibImage, FIT_BITMAP);
         if (anImageToDump == NULL)
         {
-          return NULL;
+          return false;
         }
       }
 
@@ -1581,13 +1044,170 @@ FIBITMAP* Image_AlienPixMap::getImageToDump (const Standard_Integer theFormat)
         }
         if (aTmpBitmap24 == NULL)
         {
-          return NULL;
+          return false;
         }
         anImageToDump = aTmpBitmap24;
       }
       break;
     }
   }
-  return anImageToDump;
-}
+
+  if (anImageToDump == NULL)
+  {
+    return false;
+  }
+
+#ifdef _WIN32
+  bool isSaved = (FreeImage_SaveU (anImageFormat, anImageToDump, aFileNameW.ToWideString()) != FALSE);
+#else
+  bool isSaved = (FreeImage_Save  (anImageFormat, anImageToDump, theFileName.ToCString()) != FALSE);
 #endif
+  if (anImageToDump != myLibImage)
+  {
+    FreeImage_Unload (anImageToDump);
+  }
+  return isSaved;
+
+#elif defined(HAVE_WINCODEC)
+
+  TCollection_AsciiString aFileNameLower = theFileName;
+  aFileNameLower.LowerCase();
+  GUID aFileFormat = getNullGuid();
+  if (aFileNameLower.EndsWith (".ppm"))
+  {
+    return savePPM (theFileName);
+  }
+  else if (aFileNameLower.EndsWith (".bmp"))
+  {
+    aFileFormat = GUID_ContainerFormatBmp;
+  }
+  else if (aFileNameLower.EndsWith (".png"))
+  {
+    aFileFormat = GUID_ContainerFormatPng;
+  }
+  else if (aFileNameLower.EndsWith (".jpg")
+        || aFileNameLower.EndsWith (".jpeg"))
+  {
+    aFileFormat = GUID_ContainerFormatJpeg;
+  }
+  else if (aFileNameLower.EndsWith (".tiff")
+        || aFileNameLower.EndsWith (".tif"))
+  {
+    aFileFormat = GUID_ContainerFormatTiff;
+  }
+  else if (aFileNameLower.EndsWith (".gif"))
+  {
+    aFileFormat = GUID_ContainerFormatGif;
+  }
+
+  if (aFileFormat == getNullGuid())
+  {
+    Message::SendFail ("Error: unsupported image format");
+    return false;
+  }
+
+  Image_ComPtr<IWICImagingFactory> aWicImgFactory;
+  CoInitializeEx (NULL, COINIT_MULTITHREADED);
+  if (CoCreateInstance (CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&aWicImgFactory.ChangePtr())) != S_OK)
+  {
+    Message::SendFail ("Error: cannot initialize WIC Imaging Factory");
+    return false;
+  }
+
+  Image_ComPtr<IWICStream> aWicFileStream;
+  Image_ComPtr<IWICBitmapEncoder> aWicEncoder;
+  const TCollection_ExtendedString aFileNameW (theFileName);
+  if (aWicImgFactory->CreateStream (&aWicFileStream.ChangePtr()) != S_OK
+   || aWicFileStream->InitializeFromFilename (aFileNameW.ToWideString(), GENERIC_WRITE) != S_OK)
+  {
+    Message::SendFail ("Error: cannot create WIC File Stream");
+    return false;
+  }
+  if (aWicImgFactory->CreateEncoder (aFileFormat, NULL, &aWicEncoder.ChangePtr()) != S_OK
+   || aWicEncoder->Initialize (aWicFileStream.get(), WICBitmapEncoderNoCache) != S_OK)
+  {
+    Message::SendFail ("Error: cannot create WIC Encoder");
+    return false;
+  }
+
+  const WICPixelFormatGUID aWicPixelFormat = convertToWicFormat (myImgFormat);
+  if (aWicPixelFormat == getNullGuid())
+  {
+    Message::SendFail ("Error: unsupported pixel format");
+    return false;
+  }
+
+  WICPixelFormatGUID aWicPixelFormatRes = aWicPixelFormat;
+  Image_ComPtr<IWICBitmapFrameEncode> aWicFrameEncode;
+  if (aWicEncoder->CreateNewFrame (&aWicFrameEncode.ChangePtr(), NULL) != S_OK
+   || aWicFrameEncode->Initialize (NULL) != S_OK
+   || aWicFrameEncode->SetSize ((UINT )SizeX(), (UINT )SizeY()) != S_OK
+   || aWicFrameEncode->SetPixelFormat (&aWicPixelFormatRes) != S_OK)
+  {
+    Message::SendFail ("Error: cannot create WIC Frame");
+    return false;
+  }
+
+  if (aWicPixelFormatRes != aWicPixelFormat)
+  {
+    Message::SendFail ("Error: pixel format is unsupported by image format");
+    return false;
+  }
+
+  if (IsTopDown())
+  {
+    if (aWicFrameEncode->WritePixels ((UINT )SizeY(), (UINT )SizeRowBytes(), (UINT )SizeBytes(), (BYTE* )Data()) != S_OK)
+    {
+      Message::SendFail ("Error: cannot write pixels to WIC Frame");
+      return false;
+    }
+  }
+  else
+  {
+    for (Standard_Size aRow = 0; aRow < SizeY(); ++aRow)
+    {
+      if (aWicFrameEncode->WritePixels (1, (UINT )SizeRowBytes(), (UINT )SizeRowBytes(), (BYTE* )Row (aRow)) != S_OK)
+      {
+        Message::SendFail ("Error: cannot write pixels to WIC Frame");
+        return false;
+      }
+    }
+  }
+
+  if (aWicFrameEncode->Commit() != S_OK
+   || aWicEncoder->Commit() != S_OK)
+  {
+    Message::SendFail ("Error: cannot commit data to WIC Frame");
+    return false;
+  }
+  if (aWicFileStream->Commit (STGC_DEFAULT) != S_OK)
+  {
+    //Message::Send ("Error: cannot commit data to WIC File Stream", Message_Fail);
+    //return false;
+  }
+  return true;
+#else
+  const Standard_Integer aLen = theFileName.Length();
+  if ((aLen >= 4) && (theFileName.Value (aLen - 3) == '.')
+      && strcasecmp( theFileName.ToCString() + aLen - 3, "ppm") == 0 )
+  {
+    return savePPM (theFileName);
+  }
+  Message::SendTrace ("Image_PixMap, no image library available! Image saved in PPM format");
+  return savePPM (theFileName);
+#endif
+}
+
+// =======================================================================
+// function : AdjustGamma
+// purpose  :
+// =======================================================================
+bool Image_AlienPixMap::AdjustGamma (const Standard_Real theGammaCorr)
+{
+#ifdef HAVE_FREEIMAGE
+  return FreeImage_AdjustGamma (myLibImage, theGammaCorr) != FALSE;
+#else
+  (void )theGammaCorr;
+  return false;
+#endif
+}

src/Image/Image_AlienPixMap.hxx

@@ -19,7 +19,6 @@
 #include <Image_PixMap.hxx>
 
 class TCollection_AsciiString;
-struct IWICPalette;
 struct FIBITMAP;
 
 //! Image class that support file reading/writing operations using auxiliary image library.
@@ -58,41 +57,21 @@ public:
                              const TCollection_AsciiString& theFileName);
 
   //! Read image data from memory buffer.
-  //! @param[in] theData     memory pointer to read from;
-  //!                        when NULL, function will attempt to open theFileName file
-  //! @param[in] theLength   memory buffer length
-  //! @param[in] theFileName optional file name
+  //! @param theData     memory pointer to read from;
+  //!                    when NULL, function will attempt to open theFileName file
+  //! @param theLength   memory buffer length
+  //! @param theFileName optional file name
   Standard_EXPORT bool Load (const Standard_Byte* theData,
-                             const Standard_Size theLength,
+                             Standard_Size theLength,
                              const TCollection_AsciiString& theFileName);
 
-  //! Write image data to file.
-  //! @param[in] theFileName file name to save
-  bool Save (const TCollection_AsciiString& theFileName)
-  {
-    return Save (NULL, 0, theFileName);
-  }
-
-  //! Write image data to stream.
-  //! @param[out] theStream   stream where to write
-  //! @param[in] theExtension image format
-  Standard_EXPORT bool Save (std::ostream& theStream,
-                             const TCollection_AsciiString& theExtension);
-
-  //! Write image data to file or memory buffer using file extension to determine format.
-  //! @param[out] theBuffer  buffer pointer where to write
-  //!                        when NULL, function write image data to theFileName file
-  //! @param[in] theLength   memory buffer length
-  //! @param[in] theFileName file name to save;
-  //!                        when theBuffer isn't NULL used only to determine format
-  Standard_EXPORT bool Save (Standard_Byte* theBuffer,
-                             const Standard_Size theLength,
-                             const TCollection_AsciiString& theFileName);
+  //! Write image data to file using file extension to determine compression format.
+  Standard_EXPORT bool Save (const TCollection_AsciiString& theFileName);
 
   //! Initialize image plane with required dimensions.
-  //! @param[in] thePixelFormat  if specified pixel format doesn't supported by image library
-  //!                            than nearest supported will be used instead!
-  //! @param[in] theSizeRowBytes may be ignored by this class and required alignment will be used instead!
+  //! thePixelFormat - if specified pixel format doesn't supported by image library
+  //!                  than nearest supported will be used instead!
+  //! theSizeRowBytes - may be ignored by this class and required alignment will be used instead!
   Standard_EXPORT virtual bool InitTrash (Image_Format        thePixelFormat,
                                           const Standard_Size theSizeX,
                                           const Standard_Size theSizeY,
@@ -105,13 +84,12 @@ public:
   Standard_EXPORT virtual void Clear() Standard_OVERRIDE;
 
   //! Performs gamma correction on image.
-  //! @param[in] theGamma - gamma value to use; a value of 1.0 leaves the image alone
+  //! theGamma - gamma value to use; a value of 1.0 leaves the image alone
   Standard_EXPORT bool AdjustGamma (const Standard_Real theGammaCorr);
 
-#if !defined(HAVE_FREEIMAGE) && defined(_WIN32)
-  //! Returns image palette.
-  IWICPalette* GetPalette() const { return myPalette; }
-#endif
+private:
+
+  FIBITMAP* myLibImage;
 
 private:
 
@@ -130,13 +108,6 @@ private:
   //! Built-in PPM export
   Standard_EXPORT bool savePPM (const TCollection_AsciiString& theFileName) const;
 
-  FIBITMAP* getImageToDump (const Standard_Integer theFormat);
-
-private:
-
-  FIBITMAP* myLibImage;
-  IWICPalette* myPalette;
-
 };
 
 DEFINE_STANDARD_HANDLE(Image_AlienPixMap, Image_PixMap)

src/Image/Image_Texture.cxx

@@ -420,38 +420,3 @@ void Image_Texture::DumpJson (Standard_OStream& theOStream, Standard_Integer the
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myOffset)
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myLength)
 }
-
-// ================================================================
-// Function : WriteToBuffer
-// Purpose  :
-// ================================================================
-void Image_Texture::WriteToBuffer()
-{
-  if (this == nullptr || myImagePath.IsEmpty())
-  {
-    return;
-  }
-
-  const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
-  std::shared_ptr<std::istream> aFileIn = aFileSystem->OpenIStream(myImagePath, std::ios::in | std::ios::binary);
-  if (aFileIn.get() == nullptr)
-  {
-    Message::SendFail(TCollection_AsciiString("Error: Unable to open file ") + myImagePath + "!");
-    return;
-  }
-
-  int64_t aLength = myLength;
-  if (myOffset == -1 && myLength == -1)
-  {
-    aFileIn->seekg(0, std::ios::end);
-    aLength = aFileIn->tellg();
-    aFileIn->seekg(0, std::ios::beg);
-  }
-  else
-  {
-    aFileIn->seekg(myOffset);
-  }
-  myBuffer = new NCollection_Buffer(NCollection_BaseAllocator::CommonBaseAllocator(), aLength);
-  aFileIn->read((char*)myBuffer->ChangeData(), aLength);
-  myImagePath.Clear();
-}

src/Image/Image_Texture.hxx

@@ -103,10 +103,6 @@ public: //! @name hasher interface
   //! Dumps the content of me into the stream
   Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
 
-  //! Write texture to buffer, if file path, offset and length are known
-  //! This function is use only when user has turn on parameter by XSetUseTextureBuffer function
-  Standard_EXPORT void WriteToBuffer();
-
 protected:
 
   //! Read image from normal image file.

src/IntTools/IntTools_SurfaceRangeLocalizeData.cxx

@@ -224,7 +224,7 @@ const gp_Pnt &IntTools_SurfaceRangeLocalizeData::GetPointInFrame
   Standard_Integer aFrmUInd = theUIndex + myUIndMin - 1;
   Standard_Integer aFrmVInd = theVIndex + myVIndMin - 1;
 
-  if (myGridPoints.IsNull() || aFrmUInd > myUIndMax || aFrmVInd > myVIndMax)
+  if (aFrmUInd > myUIndMax || aFrmVInd > myVIndMax)
     return gp::Origin();
 
   return myGridPoints->Value(aFrmUInd, aFrmVInd);
@@ -235,7 +235,7 @@ Standard_Real IntTools_SurfaceRangeLocalizeData::GetUParamInFrame
 {
   Standard_Integer aFrmInd = theIndex + myUIndMin - 1;
 
-  if (myUParams.IsNull() || aFrmInd > myUIndMax)
+  if (aFrmInd > myUIndMax)
     return Precision::Infinite();
 
   return myUParams->Value(aFrmInd);
@@ -246,7 +246,7 @@ Standard_Real IntTools_SurfaceRangeLocalizeData::GetVParamInFrame
 {
   Standard_Integer aFrmInd = theIndex + myVIndMin - 1;
 
-  if (myVParams.IsNull() || aFrmInd > myVIndMax)
+  if (aFrmInd > myVIndMax)
     return Precision::Infinite();
 
   return myVParams->Value(aFrmInd);

src/QABugs/QABugs_1.cxx

@@ -387,11 +387,11 @@ static Standard_Integer OCC361bug (Draw_Interpretor& di, Standard_Integer nb, co
 //function : OCC30182
 //purpose  : Testing different interfaces of Image_AlienPixMap::Load()
 //=======================================================================
-static Standard_Integer OCC30182 (Draw_Interpretor& di, Standard_Integer theNbArgs, const char** theArgVec)
+static Standard_Integer OCC30182 (Draw_Interpretor& , Standard_Integer theNbArgs, const char** theArgVec)
 {
   if (ViewerTest::CurrentView().IsNull())
   {
-    di << "Error: no active view\n";
+    std::cout << "Error: no active view\n";
     return 1;
   }
 
@@ -430,13 +430,13 @@ static Standard_Integer OCC30182 (Draw_Interpretor& di, Standard_Integer theNbAr
     }
     else
     {
-      di << "Syntax error at '" << anArg << "'\n";
+      std::cout << "Syntax error at '" << anArg << "'\n";
       return 1;
     }
   }
   if (anImgPath.IsEmpty())
   {
-    di << "Syntax error: wrong number of arguments\n";
+    std::cout << "Syntax error: wrong number of arguments\n";
     return 1;
   }
 
@@ -454,7 +454,7 @@ static Standard_Integer OCC30182 (Draw_Interpretor& di, Standard_Integer theNbAr
     std::shared_ptr<std::istream> aFile = aFileSystem->OpenIStream (anImgPath, std::ios::in | std::ios::binary);
     if (aFile.get() == NULL)
     {
-      di << "Syntax error: image file '" << anImgPath << "' cannot be found\n";
+      std::cout << "Syntax error: image file '" << anImgPath << "' cannot be found\n";
       return 1;
     }
     if (anOffset != 0)
@@ -469,13 +469,13 @@ static Standard_Integer OCC30182 (Draw_Interpretor& di, Standard_Integer theNbAr
       aFile->seekg (anOffset);
       if (aLen <= 0)
       {
-        di << "Syntax error: wrong offset\n";
+        std::cout << "Syntax error: wrong offset\n";
         return 1;
       }
       NCollection_Array1<Standard_Byte> aBuff (1, aLen);
       if (!aFile->read ((char* )&aBuff.ChangeFirst(), aBuff.Size()))
       {
-        di << "Error: unable to read file\n";
+        std::cout << "Error: unable to read file\n";
         return 1;
       }
       if (!anImage->Load (&aBuff.ChangeFirst(), aBuff.Size(), anImgPath))
@@ -510,107 +510,6 @@ static Standard_Integer OCC30182 (Draw_Interpretor& di, Standard_Integer theNbAr
   return 0;
 }
 
-//=======================================================================
-//function : OCC31956
-//purpose  : Testing Image_AlienPixMap::Save() overload for saving into a memory buffer or stream
-//=======================================================================
-static Standard_Integer OCC31956 (Draw_Interpretor& di, Standard_Integer theNbArgs, const char** theArgVec)
-{
-  if (ViewerTest::CurrentView().IsNull())
-  {
-    di << "Error: no active view\n";
-    return 1;
-  }
-  if (theNbArgs != 3 && theNbArgs != 5)
-  {
-    di << "Syntax error: wrong number of arguments\n";
-    return 1;
-  }
-
-  bool useStream = false;
-  TCollection_AsciiString aTempImgPath;
-  if (theNbArgs == 5)
-  {
-    TCollection_AsciiString anArg (theArgVec[3]);
-    anArg.LowerCase();
-    if (anArg == "-stream")
-    {
-      useStream = true;
-      aTempImgPath = theArgVec[4];
-    }
-    else
-    {
-      di << "Syntax error at '" << anArg << "'\n";
-      return 1;
-    }
-  }
-
-  TCollection_AsciiString aPrsName, anImgPath;
-  aPrsName = theArgVec[1];
-  anImgPath = theArgVec[2];
-  Handle(Image_AlienPixMap) anImage = new Image_AlienPixMap();
-  const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
-  opencascade::std::shared_ptr<std::istream> aFile = aFileSystem->OpenIStream (anImgPath, std::ios::in | std::ios::binary);
-  if (aFile.get() == NULL)
-  {
-    di << "Syntax error: image file '" << anImgPath << "' cannot be found\n";
-    return 1;
-  }
-
-  aFile->seekg (0, std::ios::end);
-  Standard_Integer aLen = (Standard_Integer )aFile->tellg();
-  aFile->seekg (0);
-  if (!anImage->Load (*aFile, anImgPath))
-  {
-    return 0;
-  }
-
-  Handle(Image_AlienPixMap) aControlImg = new Image_AlienPixMap();
-  if (useStream)
-  {
-    opencascade::std::shared_ptr<std::ostream> aTempFile = aFileSystem->OpenOStream (aTempImgPath, std::ios::out | std::ios::binary);
-    if (aTempFile.get() == NULL)
-    {
-      di << "Error: image file '" << aTempImgPath << "' cannot be open\n";
-      return 0;
-    }
-    if (!anImage->Save (*aTempFile, aTempImgPath))
-    {
-      di << "Error: failed saving file using stream '" << aTempImgPath << "'\n";
-      return 0;
-    }
-    aTempFile.reset();
-    aControlImg->Load (aTempImgPath);
-  }
-  else
-  {
-    NCollection_Array1<Standard_Byte> aBuff (1, aLen + 2048);
-    if (!anImage->Save (&aBuff.ChangeFirst(), aBuff.Size(), anImgPath))
-    {
-      di << "Error: failed saving file using buffer'" << anImgPath << "'\n";
-      return 0;
-    }
-    aControlImg->Load (&aBuff.ChangeFirst(), aBuff.Size(), anImgPath);
-  }
-
-  TopoDS_Shape aShape = BRepPrimAPI_MakeBox (100.0 * aControlImg->Ratio(), 100.0, 1.0).Shape();
-  Handle(AIS_Shape) aPrs = new AIS_Shape (aShape);
-  aPrs->SetDisplayMode (AIS_Shaded);
-  aPrs->Attributes()->SetupOwnShadingAspect();
-  const Handle(Graphic3d_AspectFillArea3d)& anAspect = aPrs->Attributes()->ShadingAspect()->Aspect();
-  anAspect->SetShadingModel (Graphic3d_TOSM_UNLIT);
-  anAspect->SetTextureMapOn (true);
-  anAspect->SetTextureMap (new Graphic3d_Texture2D(aControlImg));
-  if (aControlImg->IsTopDown())
-  {
-    anAspect->TextureMap()->GetParams()->SetTranslation (Graphic3d_Vec2 (0.0f, -1.0f));
-    anAspect->TextureMap()->GetParams()->SetScale       (Graphic3d_Vec2 (1.0f, -1.0f));
-  }
-
-  ViewerTest::Display (aPrsName, aPrs, true, true);
-  return 0;
-}
-
 void QABugs::Commands_1(Draw_Interpretor& theCommands) {
   const char *group = "QABugs";
 
@@ -628,7 +527,5 @@ void QABugs::Commands_1(Draw_Interpretor& theCommands) {
   theCommands.Add ("OCC30182",
                    "OCC30182 name image [-offset Start] [-fileName] [-stream] [-memory]\n"
                    "Decodes image either by passing file name, file stream or memory stream", __FILE__, OCC30182, group);
-  theCommands.Add ("OCC31956", "OCC31956 name image [-stream tempImage]\n"
-                   "Loads image and saves it into memory buffer or stream then loads it back", __FILE__, OCC31956, group);
   return;
 }

src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx

@@ -340,22 +340,16 @@ static Standard_Real ComputeMinEdgeSize(const TopTools_SequenceOfShape& theEdges
   return MinSize;
 }
 
-//=======================================================================
-//function : FindCoordBounds
-//purpose  : Searching for origin of U in 2d space
-//           Returns Standard_False if could not find curve on surface
-//           Returns Standard_True if succeed
-//=======================================================================
-static Standard_Boolean FindCoordBounds(const TopTools_SequenceOfShape& theFaces,
-                                        const TopoDS_Face&              theRefFace,
-                                        const TopTools_IndexedDataMapOfShapeListOfShape& theMapEF,
-                                        const TopTools_MapOfShape&      theEdgesMap,
-                                        const Standard_Integer          theIndCoord,
-                                        const Standard_Real             thePeriod,
-                                        Standard_Real&                  theMinCoord,
-                                        Standard_Real&                  theMaxCoord,
-                                        Standard_Integer&               theNumberOfIntervals,
-                                        Standard_Integer&               theIndFaceMax)
+static void FindCoordBounds(const TopTools_SequenceOfShape& theFaces,
+                            const TopoDS_Face&              theRefFace,
+                            const TopTools_IndexedDataMapOfShapeListOfShape& theMapEF,
+                            const TopTools_MapOfShape&      theEdgesMap,
+                            const Standard_Integer          theIndCoord,
+                            const Standard_Real             thePeriod,
+                            Standard_Real&                  theMinCoord,
+                            Standard_Real&                  theMaxCoord,
+                            Standard_Integer&               theNumberOfIntervals,
+                            Standard_Integer&               theIndFaceMax)
 {
   NCollection_Sequence<std::pair<Standard_Real, Standard_Real>> aPairSeq;
   
@@ -378,10 +372,6 @@ static Standard_Boolean FindCoordBounds(const TopTools_SequenceOfShape& theFaces
         continue;
       Standard_Real fpar, lpar;
       Handle(Geom2d_Curve) aPCurve = BRep_Tool::CurveOnSurface(anEdge, theRefFace, fpar, lpar);
-      if (aPCurve.IsNull())
-      {
-        return Standard_False;
-      }
       UpdateBoundaries (aPCurve, fpar, lpar, theIndCoord, aMinCoord, aMaxCoord);
     }
 
@@ -446,7 +436,6 @@ static Standard_Boolean FindCoordBounds(const TopTools_SequenceOfShape& theFaces
     theMinCoord = aPairSeq(1).first;
 
   theMaxCoord = aPairSeq(1).second;
-  return Standard_True;
 }
 
 static void RelocatePCurvesToNewUorigin(const TopTools_SequenceOfShape& theEdges,
@@ -3308,11 +3297,8 @@ void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape
             //so that all the faces are in [origin, origin + Uperiod]
             Standard_Real aMinCoord, aMaxCoord; //Umin, Umax;
             Standard_Integer aNumberOfIntervals, i_face_max;
-            if (!FindCoordBounds(faces, F_RefFace, aMapEF, edgesMap, ii + 1, aPeriods[ii],
-              aMinCoord, aMaxCoord, aNumberOfIntervals, i_face_max))
-            {
-              break;
-            }
+            FindCoordBounds (faces, F_RefFace, aMapEF, edgesMap, ii+1, aPeriods[ii],
+                             aMinCoord, aMaxCoord, aNumberOfIntervals, i_face_max);
             
             if (aMaxCoord - aMinCoord > aPeriods[ii] - 1.e-5)
               anIsSeamFound[ii] = Standard_True;
@@ -3617,10 +3603,6 @@ void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape
               
               ReconstructMissedSeam (RemovedEdges, F_RefFace, CurEdge, CurVertex, CurPoint,
                                      Uperiod, Vperiod, NextEdge, NextPoint);
-              if (NextEdge.IsNull())
-              {
-                return;
-              }
             }
             else
               return;

src/Standard/Standard_TypeDef.hxx

@@ -17,41 +17,8 @@
 
 #include <cstddef>
 #include <ctime>
-
-#include <stdint.h>
-
-#if(defined(_MSC_VER) && (_MSC_VER < 1800))
-  // only Visual Studio 2013 (vc12) provides <cinttypes> header
-  // we do not defined all macros here - only used by OCCT framework
-  #define PRIx64 "I64x"
-  #define PRIX64 "I64X"
-  #define PRId64 "I64d"
-  #define PRIu64 "I64u"
-  #define SCNd64 "I64d"
-  #define SCNu64 "I64u"
-  #ifdef _WIN64
-    #define PRIxPTR "I64x"
-    #define PRIXPTR "I64X"
-    #define PRIdPTR "I64d"
-    #define PRIuPTR "I64u"
-    #define SCNdPTR "I64d"
-    #define SCNuPTR "I64u"
-  #else
-    #define PRIxPTR "Ix"
-    #define PRIXPTR "IX"
-    #define PRIdPTR "d"
-    #define PRIuPTR "u"
-    #define SCNdPTR "d"
-    #define SCNuPTR "u"
-  #endif
-#else
-  // should be just <cinttypes> since C++11
-  // however we use this code for compatibility with old C99 compilers
-  #ifndef __STDC_FORMAT_MACROS
-    #define __STDC_FORMAT_MACROS
-  #endif
-  #include <inttypes.h>
-#endif
+#include <cstdint>
+#include <cinttypes>
 
 #define Standard_False false
 #define Standard_True  true

src/StepFile/lex.step.cxx

@@ -2,9 +2,7 @@
 // This file is generated, do not modify it directly; edit source file step.lex instead.
 
 // Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
-#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
-#include "stdint.h"
-#endif
+#include <Standard_TypeDef.hxx>
 
 #define  YY_INT_ALIGNED short int
 

src/StepFile/step.lex

@@ -33,9 +33,7 @@
 // This file is generated, do not modify it directly; edit source file step.lex instead.
 
 // Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
-#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
-#include "stdint.h"
-#endif
+#include <Standard_TypeDef.hxx>
 }
 
 %{

src/ViewerTest/ViewerTest_ViewerCommands.cxx

@@ -13910,73 +13910,6 @@ static int VSelBvhBuild (Draw_Interpretor& /*theDI*/, Standard_Integer theNbArgs
   return 0;
 }
 
-//=======================================================================
-//function : VChangeMouseGesture
-//purpose  :
-//=======================================================================
-static int VChangeMouseGesture (Draw_Interpretor&,
-                                Standard_Integer  theArgsNb,
-                                const char**      theArgVec)
-{
-  Handle(V3d_View) aView = ViewerTest::CurrentView();
-  if (aView.IsNull())
-  {
-    Message::SendFail ("Error: no active viewer");
-    return 1;
-  }
-
-  NCollection_DoubleMap<TCollection_AsciiString, AIS_MouseGesture> aGestureMap;
-  {
-    aGestureMap.Bind ("none",            AIS_MouseGesture_NONE);
-    aGestureMap.Bind ("selectrectangle", AIS_MouseGesture_SelectRectangle);
-    aGestureMap.Bind ("selectlasso",     AIS_MouseGesture_SelectLasso);
-    aGestureMap.Bind ("zoom",            AIS_MouseGesture_Zoom);
-    aGestureMap.Bind ("zoomwindow",      AIS_MouseGesture_ZoomWindow);
-    aGestureMap.Bind ("pan",             AIS_MouseGesture_Pan);
-    aGestureMap.Bind ("rotateorbit",     AIS_MouseGesture_RotateOrbit);
-    aGestureMap.Bind ("rotateview",      AIS_MouseGesture_RotateView);
-    aGestureMap.Bind ("drag",            AIS_MouseGesture_Drag);
-  }
-  NCollection_DoubleMap<TCollection_AsciiString, Standard_UInteger> aMouseButtonMap;
-  {
-    aMouseButtonMap.Bind ("none",   (Standard_UInteger )Aspect_VKeyMouse_NONE);
-    aMouseButtonMap.Bind ("left",   (Standard_UInteger )Aspect_VKeyMouse_LeftButton);
-    aMouseButtonMap.Bind ("middle", (Standard_UInteger )Aspect_VKeyMouse_MiddleButton);
-    aMouseButtonMap.Bind ("right",  (Standard_UInteger )Aspect_VKeyMouse_RightButton);
-  }
-
-  Standard_UInteger aButton = (Standard_UInteger )Aspect_VKeyMouse_LeftButton;
-  AIS_MouseGesture aGesture = AIS_MouseGesture_RotateOrbit;
-  for (Standard_Integer anArgIter = 1; anArgIter < theArgsNb; ++anArgIter)
-  {
-    Standard_CString        anArg = theArgVec[anArgIter];
-    TCollection_AsciiString anArgCase (anArg);
-    anArgCase.LowerCase();
-    if (anArgCase == "-button")
-    {
-      TCollection_AsciiString aButtonStr = theArgVec[++anArgIter];
-      aButtonStr.LowerCase();
-      aButton = aMouseButtonMap.Find1 (aButtonStr);
-    }
-    else if (anArgCase == "-gesture")
-    {
-      TCollection_AsciiString aGestureStr = theArgVec[++anArgIter];
-      aGestureStr.LowerCase();
-      aGesture = aGestureMap.Find1 (aGestureStr);
-    }
-    else
-    {
-      Message::SendFail() << "Error: unknown argument '" << anArg << "'";
-      return 1;
-    }
-  }
-
-  Handle(ViewerTest_EventManager) aViewMgr = ViewerTest::CurrentEventManager();
-  aViewMgr->ChangeMouseGestureMap().Bind (aButton, aGesture);
-
-  return 0;
-}
-
 //=======================================================================
 //function : ViewerTest_ExitProc
 //purpose  :
@@ -14994,12 +14927,4 @@ Turns on/off prebuilding of BVH within background thread(s).
  -nbThreads   number of threads, 1 by default; if < 1 then used (NbLogicalProcessors - 1);
  -wait        waits for building all of BVH.
 )" /* [vselbvhbuild] */);
-
-  addCmd ("vchangemousegesture", VChangeMouseGesture, /* [vchangemousegesture] */ R"(
-vchangemousegesture -button  {none|left|middle|right}=left
-                    -gesture {none|selectRectangle|selectLasso|zoom|zoomWindow|pan|rotateOrbit|rotateView|drag}=rotateOrbit
-Changes the gesture for the mouse button.
- -button  the mouse button;
- -gesture the new gesture for the button.
-)" /* [vchangemousegesture] */);
 }

src/XCAFDoc/XCAFDoc_VisMaterialTool.cxx

@@ -59,7 +59,7 @@ Handle(XCAFDoc_VisMaterialTool) XCAFDoc_VisMaterialTool::Set (const TDF_Label& t
 //=======================================================================
 XCAFDoc_VisMaterialTool::XCAFDoc_VisMaterialTool()
 {
-  myUseTextureBuffer = false;
+  //
 }
 
 //=======================================================================
@@ -95,8 +95,6 @@ TDF_Label XCAFDoc_VisMaterialTool::AddMaterial (const Handle(XCAFDoc_VisMaterial
 {
   TDF_TagSource aTag;
   TDF_Label aLab = aTag.NewChild (Label());
-  if (myUseTextureBuffer)
-    changeVisMaterial(theMat);
   aLab.AddAttribute (theMat);
   if (!theName.IsEmpty())
   {
@@ -285,23 +283,3 @@ Handle(XCAFDoc_VisMaterial) XCAFDoc_VisMaterialTool::GetShapeMaterial (const Top
        ? GetMaterial (aMatLabel)
        : Handle(XCAFDoc_VisMaterial)();
 }
-
-//=======================================================================
-//function : changeVisMaterial
-//purpose  :
-//=======================================================================
-void XCAFDoc_VisMaterialTool::changeVisMaterial(const Handle(XCAFDoc_VisMaterial)& theMat) const
-{
-  if (theMat->HasCommonMaterial())
-  {
-    theMat->CommonMaterial().DiffuseTexture->WriteToBuffer();
-  }
-  if (theMat->HasPbrMaterial())
-  {
-    theMat->PbrMaterial().BaseColorTexture->WriteToBuffer();
-    theMat->PbrMaterial().MetallicRoughnessTexture->WriteToBuffer();
-    theMat->PbrMaterial().EmissiveTexture->WriteToBuffer();
-    theMat->PbrMaterial().OcclusionTexture->WriteToBuffer();
-    theMat->PbrMaterial().NormalTexture->WriteToBuffer();
-  }
-}

src/XCAFDoc/XCAFDoc_VisMaterialTool.hxx

@@ -113,12 +113,6 @@ public:
   //! Returns material assigned to shape or NULL if not assigned.
   Standard_EXPORT Handle(XCAFDoc_VisMaterial) GetShapeMaterial (const TopoDS_Shape& theShape);
 
-  //! Return parameter for use texture buffer
-  const Standard_Boolean GetUseTextureBuffer() { return myUseTextureBuffer; }
-
-  //! Set parameter for use texture buffer
-  void SetUseTextureBuffer(const Standard_Boolean theUseBuffer) { myUseTextureBuffer = theUseBuffer; }
-
 public:
 
   //! Returns GUID of this attribute type.
@@ -134,14 +128,8 @@ public:
   virtual void Paste (const Handle(TDF_Attribute)& ,
                       const Handle(TDF_RelocationTable)& ) const Standard_OVERRIDE {}
 
-protected:
-
-  //! Reading a texture from file and save it to buffer
-  void changeVisMaterial(const Handle(XCAFDoc_VisMaterial)& theMat) const;
-
 private:
 
-  Standard_Boolean myUseTextureBuffer;
   Handle(XCAFDoc_ShapeTool) myShapeTool;
 
 };

src/XDEDRAW/XDEDRAW.cxx

@@ -98,7 +98,6 @@
 #include <XCAFDoc_LayerTool.hxx>
 #include <XCAFDoc_Material.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
-#include <XCAFDoc_VisMaterialTool.hxx>
 #include <XCAFDoc_Volume.hxx>
 #include <XCAFPrs.hxx>
 #include <XCAFPrs_AISObject.hxx>
@@ -1722,69 +1721,6 @@ static Standard_Integer testDoc (Draw_Interpretor&,
   return 0;
 }
 
-//=======================================================================
-// function: XGetUseTextureBuffer
-// purpose:  return current value of parameter
-//=======================================================================
-static Standard_Integer XGetUseTextureBuffer(Draw_Interpretor& di,
-                                             Standard_Integer argc,
-                                             const char** argv)
-{
-  if (argc < 2)
-  {
-    return 1;
-  }
-  Handle(TDocStd_Document) aDoc;
-  if (!DDocStd::GetDocument(argv[1], aDoc))
-  {
-    return 1;
-  }
-
-  Handle(XCAFDoc_VisMaterialTool) aVisMatTool = XCAFDoc_DocumentTool::VisMaterialTool(aDoc->Main());
-  if (aVisMatTool.IsNull())
-  {
-    return 1;
-  }
-  const char* aStr = aVisMatTool->GetUseTextureBuffer() ? "on" : "off";
-  di << "Current value is \"" << aStr << "\"" << "\n";
-
-  return 0;
-}
-
-//=======================================================================
-// function: XSetUseTextureBuffer
-// purpose:  change parameter for store texture (on/off),
-//           file path is use by default in case "off"
-//=======================================================================
-static Standard_Integer XSetUseTextureBuffer(Draw_Interpretor& di,
-                                             Standard_Integer argc,
-                                             const char** argv)
-{
-  if (argc < 3)
-  {
-    return 1;
-  }
-  Handle(TDocStd_Document) aDoc;
-  if (!DDocStd::GetDocument(argv[1], aDoc))
-  {
-    return 1;
-  }
-  bool aBuffOn = false;
-  if (!Draw::ParseOnOff(argv[2], aBuffOn))
-  {
-    return 1;
-  }
-
-  Handle(XCAFDoc_VisMaterialTool) aVisMatTool = XCAFDoc_DocumentTool::VisMaterialTool(aDoc->Main());
-  if (aVisMatTool.IsNull())
-  {
-    return 1;
-  }
-  aVisMatTool->SetUseTextureBuffer(aBuffOn);
-
-  (void)di;
-  return 0;
-}
 
 //=======================================================================
 //function : Init
@@ -1902,14 +1838,6 @@ void XDEDRAW::Init(Draw_Interpretor& di)
   di.Add("XRescaleGeometry",
          "Doc factor [-root label] [-force]: Applies geometrical scale to assembly",
          __FILE__, XRescaleGeometry, g);
-  di.Add("XGetUseTextureBuffer",
-         "Doc : return value of parameter for texture buffer usage",
-         __FILE__, XGetUseTextureBuffer, g);
-  di.Add("XSetUseTextureBuffer",
-         "Doc {on|off} : turns on/off texture buffer usage; \"off\" is use by default,\n"
-         "it means texture will store length, offset and will be read from file;\n"
-         "in case \"on\" texture data will be store in buffer",
-         __FILE__, XSetUseTextureBuffer, g);
 
   // Specialized commands
   XDEDRAW_Shapes::InitCommands ( di );

src/XSAlgo/XSAlgo_AlgoContainer.cxx

@@ -92,8 +92,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape(const TopoDS_Shape& theShape,
                                                 Handle(Standard_Transient)& theInfo,
                                                 const Handle(ShapeBuild_ReShape)& theReShape,
                                                 const Message_ProgressRange& theProgress,
-                                                const Standard_Boolean theNonManifold,
-                                                const TopAbs_ShapeEnum theDetalisationLevel) const
+                                                const Standard_Boolean theNonManifold) const
 {
   if (theShape.IsNull())
   {
@@ -115,7 +114,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape(const TopoDS_Shape& theShape,
         aRscfile = thePrscfile;
       aContext = new ShapeProcess_ShapeContext(theShape, aRscfile);
     }
-    aContext->SetDetalisation(theDetalisationLevel);
+    aContext->SetDetalisation(TopAbs_EDGE);
   }
   aContext->SetNonManifold(theNonManifold);
   theInfo = aContext;
@@ -200,13 +199,12 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape(const TopoDS_Shape& theShape,
                                                 const Standard_CString thePseq,
                                                 Handle(Standard_Transient)& theInfo,
                                                 const Message_ProgressRange& theProgress,
-                                                const Standard_Boolean theNonManifold,
-                                                const TopAbs_ShapeEnum theDetalisationLevel) const
+                                                const Standard_Boolean theNonManifold) const
 {
   Handle(ShapeBuild_ReShape) aReShape = new ShapeBuild_ReShape();
   return ProcessShape(theShape, thePrec, theMaxTol, thePrscfile,
                       thePseq, theInfo, aReShape, theProgress, 
-                      theNonManifold, theDetalisationLevel);
+                      theNonManifold);
 }
 
 //=======================================================================

src/XSAlgo/XSAlgo_AlgoContainer.hxx

@@ -19,10 +19,9 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Message_ProgressRange.hxx>
-#include <Standard_Integer.hxx>
 #include <Standard_Transient.hxx>
-#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_Integer.hxx>
+#include <Message_ProgressRange.hxx>
 
 class ShapeBuild_ReShape;
 class XSAlgo_ToolContainer;
@@ -72,8 +71,7 @@ public:
                                                      const Standard_CString       thePseq,
                                                      Handle(Standard_Transient)&  theInfo,
                                                      const Message_ProgressRange& theProgress = Message_ProgressRange(),
-                                                     const Standard_Boolean       theNonManifold = Standard_False,
-                                                     const TopAbs_ShapeEnum theDetalisationLevel = TopAbs_VERTEX) const;
+                                                     const Standard_Boolean       theNonManifold = Standard_False) const;
 
   //! Does shape processing with specified tolerances
   //! @param[in] theShape shape to process
@@ -94,8 +92,7 @@ public:
                                                     Handle(Standard_Transient)&       theInfo,
                                                     const Handle(ShapeBuild_ReShape)& theReShape,
                                                     const Message_ProgressRange&      theProgress = Message_ProgressRange(),
-                                                    const Standard_Boolean            theNonManifold = Standard_False,
-                                                    const TopAbs_ShapeEnum theDetalisationLevel = TopAbs_VERTEX) const;
+                                                    const Standard_Boolean            theNonManifold = Standard_False) const;
   
   //! Checks quality of pcurve of the edge on the given face,
   //! and corrects it if necessary.

src/XmlMXCAFDoc/XmlMXCAFDoc_VisMaterialDriver.cxx

@@ -13,11 +13,9 @@
 
 #include <XmlMXCAFDoc_VisMaterialDriver.hxx>
 
-#include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <XCAFDoc_VisMaterial.hxx>
 #include <XmlObjMgt.hxx>
-#include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_VisMaterialDriver, XmlMDF_ADriver)
@@ -44,10 +42,6 @@ IMPLEMENT_DOMSTRING(EmissiveColor,     "emissive_color")
 IMPLEMENT_DOMSTRING(Shininess,         "shininess")
 IMPLEMENT_DOMSTRING(Transparency,      "transparency")
 IMPLEMENT_DOMSTRING(DiffuseTexture,    "diffuse_texture")
-IMPLEMENT_DOMSTRING(FilePath,          "file_path")
-IMPLEMENT_DOMSTRING(TextureId,         "texture_id")
-IMPLEMENT_DOMSTRING(Offset,            "offset")
-IMPLEMENT_DOMSTRING(Length,            "length")
 
 //! Encode alpha mode into character.
 static const char* alphaModeToString (Graphic3d_AlphaMode theMode)
@@ -208,26 +202,11 @@ static void writeTexture (XmlObjMgt_Persistent& theTarget,
                           const XmlObjMgt_DOMString& theName,
                           const Handle(Image_Texture)& theImage)
 {
-  if (theImage.IsNull())
+  if (!theImage.IsNull()
+   && !theImage->FilePath().IsEmpty()
+   &&  theImage->FileOffset() == -1)
   {
-    return;
-  }
-  XmlObjMgt_Document aDoc(theTarget.Element().getOwnerDocument());
-  XmlObjMgt_Element aCurTarget = aDoc.createElement(theName);
-  theTarget.Element().appendChild(aCurTarget);
-  if (theImage->DataBuffer().IsNull())
-  {
-    aCurTarget.setAttribute(::FilePath(), theImage->FilePath().ToCString());
-    if (theImage->FileOffset() == -1 || theImage->FileLength() == -1)
-    {
-      return;
-    }
-    aCurTarget.setAttribute(::Offset(), static_cast<int>(theImage->FileOffset()));
-    aCurTarget.setAttribute(::Length(), static_cast<int>(theImage->FileLength()));
-  }
-  else
-  {
-    Message::SendWarning(TCollection_AsciiString("Can't write a texture to buffer."));
+    theTarget.Element().setAttribute (theName, theImage->FilePath().ToCString());
   }
 }
 
@@ -236,34 +215,10 @@ static void readTexture (const XmlObjMgt_Element& theElement,
                          const XmlObjMgt_DOMString& theName,
                          Handle(Image_Texture)& theImage)
 {
-  TCollection_AsciiString aStr(theElement.getAttribute(theName).GetString());
-  if (!aStr.IsEmpty())
+  TCollection_AsciiString aPath (theElement.getAttribute (theName).GetString());
+  if (!aPath.IsEmpty())
   {
-    theImage = new Image_Texture(aStr);
-    return;
-  }
-  LDOM_Element anElement = theElement.GetChildByTagName(theName);
-  if (anElement.isNull())
-  {
-    return;
-  }
-  TCollection_AsciiString aFilePath(anElement.getAttribute(::FilePath()).GetString());
-  TCollection_AsciiString anId(anElement.getAttribute(::TextureId()).GetString());
-  Standard_Integer anOffset = -1, aLength = -1;
-  if (!aFilePath.IsEmpty())
-  {
-    anElement.getAttribute(::Offset()).GetInteger(anOffset);
-    anElement.getAttribute(::Length()).GetInteger(aLength);
-    if (anOffset == -1 || aLength == -1)
-    {
-      theImage = new Image_Texture(aFilePath);
-      return;
-    }
-    theImage = new Image_Texture(aFilePath, anOffset, aLength);
-  }
-  else if (!anId.IsEmpty())
-  {
-    Message::SendWarning(TCollection_AsciiString("Can't read a texture from buffer."));
+    theImage = new Image_Texture (aPath);
   }
 }
 

tests/bugs/heal/bug33398

@@ -1,10 +0,0 @@
-puts "========================================="
-puts "0033398: Modeling Algorithms - ShapeUpgrade_UnifySameDomain fails on specific STEP model"
-puts "========================================="
-puts ""
-
-testreadstep [locate_data_file bug33398.step] s 
-unifysamedom result s 
-
-checknbshapes result -vertex 506 -edge 908 -wire 394 -face 382 -shell 4 -solid 4    
-checkview -display result -2d -path ${imagedir}/${test_image}.png

tests/bugs/heal/bug33421

@@ -1,19 +0,0 @@
-puts "TODO CR33439 ALL: Error :  is WRONG because number of EDGE entities in shape"
-puts "TODO CR33439 ALL: Error :  is WRONG because number of WIRE entities in shape"
-puts "TODO CR33439 ALL: Error :  is WRONG because number of FACE entities in shape"
-
-puts "========================================="
-puts "0033421: Modeling Algorithms - ShapeUpgrade_UnifySameDomain fails"
-puts "========================================="
-puts ""
-
-pcylinder c1 10 10
-copy c1 c2
-tmirror c2 0 0 10 0 0 1
-bop c1 c2
-bopfuse c3
-
-unifysamedom result c3
-
-checknbshapes result -t -solid 1 -shell 1 -face 3 -wire 3 -edge 3 -vertex 3
-checkview -display result -2d -path ${imagedir}/${test_image}.png

tests/bugs/modalg_8/bug26578_1

@@ -1,14 +0,0 @@
-puts "================================"
-puts "0026578: Modeling Algorithm - Exceptions in offset operation with intersection"
-puts "================================"
-puts ""
-
-restore [locate_data_file bug26578_plate1.brep] s
-
-offsetparameter 1e-7 p i
-offsetload s 100
-offsetperform r
-
-checkshape r
-checknbshapes r -vertex 22 -edge 32 -wire 11 -face 11
-checkview -display r -2d -path ${imagedir}/${test_image}.png  

tests/bugs/modalg_8/bug26578_2

@@ -1,12 +0,0 @@
-puts "REQUIRED ALL: ERROR. Can not trim edges."
-
-puts "================================"
-puts "0026578: Modeling Algorithm - Exceptions in offset operation with intersection"
-puts "================================"
-puts ""
-
-restore [locate_data_file bug26578_plate2.brep] s
-
-offsetparameter 1e-7 p i
-offsetload s -30
-offsetperform r

tests/bugs/modalg_8/bug26578_3

@@ -1,14 +0,0 @@
-puts "================================"
-puts "0026578: Modeling Algorithm - Exceptions in offset operation with intersection"
-puts "================================"
-puts ""
-
-restore [locate_data_file bug26578_plate3.brep] s
-
-offsetparameter 1e-7 p i
-offsetload s 4
-offsetperform r
-
-checkshape r
-checknbshapes r -vertex 25 -edge 36 -wire 12 -face 12
-checkview -display r -2d -path ${imagedir}/${test_image}.png

tests/bugs/modalg_8/bug26578_4

@@ -1,14 +0,0 @@
-puts "================================"
-puts "0026578: Modeling Algorithm - Exceptions in offset operation with intersection"
-puts "================================"
-puts ""
-
-restore [locate_data_file bug26578_plate4.brep] s
-
-offsetparameter 1e-7 p i
-offsetload s 2
-offsetperform r
-
-checkshape r
-checknbshapes r -vertex 22 -edge 31 -wire 10 -face 10
-checkview -display r -2d -path ${imagedir}/${test_image}.png  

tests/bugs/modalg_8/bug26578_5

@@ -1,14 +0,0 @@
-puts "================================"
-puts "0026578: Modeling Algorithm - Exceptions in offset operation with intersection"
-puts "================================"
-puts ""
-
-restore [locate_data_file bug26578_plate5.brep] s
-
-offsetparameter 1e-7 p i
-offsetload s 2
-offsetperform r
-
-checkshape r
-checknbshapes r -vertex 39 -edge 57 -wire 19 -face 19
-checkview -display r -2d -path ${imagedir}/${test_image}.png

tests/bugs/modalg_8/bug26578_6

@@ -1,14 +0,0 @@
-puts "================================"
-puts "0026578: Modeling Algorithm - Exceptions in offset operation with intersection"
-puts "================================"
-puts ""
-
-restore [locate_data_file bug26578_plate7.brep] s
-
-offsetparameter 1e-7 p i
-offsetload s 60
-offsetperform r
-
-checkshape r
-checknbshapes r -vertex 15 -edge 21 -wire 7 -face 7
-checkview -display r -2d -path ${imagedir}/${test_image}.png

tests/bugs/modalg_8/bug33414

@@ -1,10 +0,0 @@
-puts "========================"
-puts "0033414: Modeling Algorithms - Access violation during executing BRepAlgoAPI_Section::Build()"
-puts "========================"
-
-set filepath1 [locate_data_file "bug33414_1.brep"]
-set filepath2 [locate_data_file "bug33414_2.brep"]
-restore ${filepath1} shape1
-restore ${filepath2} shape2
-bsection res shape1 shape2
-# If bsection didn't cause a crash - everything is OK.

tests/bugs/step/bug32681

@@ -1,27 +0,0 @@
-puts "=================================="
-puts "0032681: Data Exchange - Missed dimension after STEP export"
-puts "Check adding of dimension"
-puts "=================================="
-
-pload DCAF
-
-ReadStep D [locate_data_file bug32681.stp]
-XGetOneShape s D
-explode s V
-XAddSubShape D s_1 0:1:1:1
-XAddSubShape D s_84 0:1:1:1
-XAddDimension D 0:1:1:1:57 0:1:1:1:58
-param write.step.schema 5
-param write.surfacecurve.mode 0
-set tmpFile ${imagedir}/tmpFile.stp
-WriteStep D $tmpFile
-Close D
-ReadStep D1 $tmpFile
-set str [XDumpDGTs D1 all]
-if {[string first "0:1:1:1:57" $str] == -1 || [string first "0:1:1:1:58" $str] == -1} {
-  puts "Error: don't find subshape"
-}
-Close D1
-file delete $tmpFile
-param write.step.schema 4
-param write.surfacecurve.mode 1

tests/bugs/xde/begin

@@ -1,3 +1,3 @@
-pload XDE OCAF VISUALISATION
+pload XDE
 
 set subgroup xde

tests/bugs/xde/bug33183_1

@@ -1,21 +0,0 @@
-puts "========"
-puts "0033183: Data Exchange - Lose texture after saving XBF file"
-puts "Checking saving of textures for the previous version"
-puts "========"
-
-Close D -silent
-XOpen [locate_data_file bug33183_ship_boat.xbf] D
-set data [XGetVisMaterial D 0:1:10:3]
-
-if {[string first "Common.DiffuseTexture" $data] == -1} {
-  puts "Error: Texture is not found"
-}
-
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-if { [vreadpixel 130 300 rgb name] != "ROSYBROWN" } { puts "Error: color not match" }
-if { [vreadpixel 150 250 rgb name] != "ORANGE2" } { puts "Error: color not match" }
-if { [vreadpixel 250 250 rgb name] != "GRAY43" } { puts "Error: color not match" }
-
-Close D

tests/bugs/xde/bug33183_2

@@ -1,21 +0,0 @@
-puts "========"
-puts "0033183: Data Exchange - Lose texture after saving XBF file"
-puts "Checking saving of textures for the previous version"
-puts "========"
-
-Close D -silent
-XOpen [locate_data_file bug33183_ship_boat.xml] D
-set data [XGetVisMaterial D 0:1:10:3]
-
-if {[string first "Common.DiffuseTexture" $data] == -1} {
-  puts "Error: Texture is not found"
-}
-
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-if { [vreadpixel 130 300 rgb name] != "ROSYBROWN" } { puts "Error: color not match" }
-if { [vreadpixel 150 250 rgb name] != "ORANGE2" } { puts "Error: color not match" }
-if { [vreadpixel 250 250 rgb name] != "GRAY43" } { puts "Error: color not match" }
-
-Close D

tests/bugs/xde/bug33451_1

@@ -1,37 +0,0 @@
-puts "========"
-puts "0033451: Saving texture to buffer"
-puts "Checks store texture in .xbf file"
-puts "========"
-
-Close D -silent
-XNewDoc D
-XSetUseTextureBuffer D on
-ReadGltf D [locate_data_file bug31706_launchvehicle.glb] -noCreateDoc
-
-set aTmpFile ${imagedir}/result.xbf
-XSave D $aTmpFile
-Close D
-Open $aTmpFile D
-set data1 [XGetVisMaterial D 0:1:10:1]
-set data2 [XGetVisMaterial D 0:1:10:5]
-
-if {[string first "PBR.BaseColorTexture" $data1] == -1
-    || [string first "PBR.EmissiveTexture" $data1] == -1} {
-  puts "Error: Texture is not found"
-}
-if {[string first "PBR.BaseColorTexture" $data2] == -1
-    || [string first "PBR.MetallicRoughnessTexture" $data2] == -1
-    || [string first "PBR.OcclusionTexture" $data2] == -1
-    || [string first "PBR.NormalTexture" $data2] == -1} {
-  puts "Error: Texture is not found"
-}
-
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-if { [vreadpixel 50 300 rgb name] != "WHITE" || [vreadpixel 120 250 rgb name] != "LEMONCHIFFON1" } {
-  puts "Error: color not match"
-}
-
-Close D
-file delete -force $aTmpFile

tests/bugs/xde/bug33451_2

@@ -1,38 +0,0 @@
-puts "========"
-puts "0033451: Saving texture to buffer"
-puts "Checks store texture in .xml file"
-puts "========"
-
-Close D -silent
-XNewDoc D
-#XSetUseTextureBuffer D on
-ReadGltf D [locate_data_file bug31706_launchvehicle.glb] -noCreateDoc
-
-set aTmpFile ${imagedir}/res.xml
-Format D XmlXCAF
-XSave D $aTmpFile
-Close D
-XOpen $aTmpFile D
-set data1 [XGetVisMaterial D 0:1:10:1]
-set data2 [XGetVisMaterial D 0:1:10:5]
-
-if {[string first "PBR.BaseColorTexture" $data1] == -1
-    || [string first "PBR.EmissiveTexture" $data1] == -1} {
-  puts "Error: Texture is not found"
-}
-if {[string first "PBR.BaseColorTexture" $data2] == -1
-    || [string first "PBR.MetallicRoughnessTexture" $data2] == -1
-    || [string first "PBR.OcclusionTexture" $data2] == -1
-    || [string first "PBR.NormalTexture" $data2] == -1} {
-  puts "Error: Texture is not found"
-}
-
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-if { [vreadpixel 50 300 rgb name] != "WHITE" || [vreadpixel 120 250 rgb name] != "LEMONCHIFFON1" } {
-  puts "Error: color not match"
-}
-
-Close D
-file delete -force $aTmpFile

tests/bugs/xde/bug33451_3

@@ -1,29 +0,0 @@
-puts "========"
-puts "0033451: Saving texture to buffer"
-puts "Checks store texture in .xbf file"
-puts "========"
-
-Close D -silent
-XNewDoc D
-XSetUseTextureBuffer D on
-ReadObj D [locate_data_file ship_boat.obj] -noCreateDoc
-
-set aTmpFile ${imagedir}/result.xbf
-XSave D $aTmpFile
-Close D
-Open $aTmpFile D
-set data [XGetVisMaterial D 0:1:10:3]
-
-if {[string first "Common.DiffuseTexture" $data] == -1} {
-  puts "Error: Texture is not found"
-}
-
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-if { [vreadpixel 130 300 rgb name] != "ROSYBROWN" } { puts "Error: color not match" }
-if { [vreadpixel 150 250 rgb name] != "ORANGE2" } { puts "Error: color not match" }
-if { [vreadpixel 250 250 rgb name] != "GRAY43" } { puts "Error: color not match" }
-
-Close D
-file delete -force $aTmpFile

tests/bugs/xde/bug33451_4

@@ -1,30 +0,0 @@
-puts "========"
-puts "0033451: Saving texture to buffer"
-puts "Checks store texture in .xbf file"
-puts "========"
-
-Close D -silent
-XNewDoc D
-#XSetUseTextureBuffer D on
-ReadObj D [locate_data_file ship_boat.obj] -noCreateDoc
-
-set aTmpFile ${imagedir}/result.xml
-Format D XmlXCAF
-XSave D $aTmpFile
-Close D
-XOpen $aTmpFile D
-set data [XGetVisMaterial D 0:1:10:3]
-
-if {[string first "Common.DiffuseTexture" $data] == -1} {
-  puts "Error: Texture is not found"
-}
-
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-if { [vreadpixel 130 300 rgb name] != "ROSYBROWN" } { puts "Error: color not match" }
-if { [vreadpixel 150 250 rgb name] != "ORANGE2" } { puts "Error: color not match" }
-if { [vreadpixel 250 250 rgb name] != "GRAY43" } { puts "Error: color not match" }
-
-Close D
-file delete -force $aTmpFile

tests/offset/shape_type_i_c/AA1

@@ -1,7 +0,0 @@
-restore [locate_data_file bug33420.brep] s
-
-OFFSETSHAPE 35 {} $calcul $type
-
-checkprops result -v 4.04602e+07
-
-checknbshapes result -face 43 -shell 1

tests/offset/shape_type_i_c/ZC6

@@ -1,5 +1,3 @@
-puts "TODO OCC27414 ALL: Error : The area of result shape is"
-
 restore [locate_data_file bug26917_M2_trim33.brep] s
 
 OFFSETSHAPE 8 {} $calcul $type

tests/offset/shape_type_i_c/ZS1

@@ -7,4 +7,4 @@ offsetperform result
 checkprops result -s 6.21471e+06 -v 8.95633e+08
 
 unifysamedom result_unif result
-checknbshapes result_unif -wire 142 -face 140 -shell 1 -solid 1
+checknbshapes result_unif -wire 140 -face 138 -shell 1 -solid 1

tests/v3d/bugs/bug31956

@@ -1,41 +0,0 @@
-puts "============"
-puts "0031956: Visualization - provide Image_AlienPixMap::Save() writing into a memory buffer instead of a file"
-puts "============"
-puts ""
-
-set anImg1 [locate_data_file chataignier.gif]
-set anImg2 [locate_data_file hatch_1.png]
-
-pload VISUALIZATION QAcommands
-vclear
-vinit View1
-vtop
-
-OCC30182 t $anImg1 -fileName; vfit
-vdump $imagedir/${casename}_1.png
-
-OCC30182 t $anImg2 -fileName; vfit
-vdump $imagedir/${casename}_2.png
-
-vclear
-
-OCC31956 t $anImg1; vfit
-vdump $imagedir/${casename}_test_1.png
-
-OCC31956 t $anImg2; vfit
-vdump $imagedir/${casename}_test_2.png
-
-vclear
-
-OCC31956 t $anImg1 -stream $imagedir/${casename}_temp_1.gif; vfit
-vdump $imagedir/${casename}_test_1s.png
-
-OCC31956 t $anImg2 -stream $imagedir/${casename}_temp_2.png; vfit
-vdump $imagedir/${casename}_test_2s.png
-
-if { [diffimage $imagedir/${casename}_test_1.png $imagedir/${casename}_1.png -toleranceOfColor 0.1] != 0 } { puts "Error difference in 1st image" }
-if { [diffimage $imagedir/${casename}_test_2.png $imagedir/${casename}_2.png -toleranceOfColor 0.1] != 0 } { puts "Error difference in 2nd image" }
-
-if { [diffimage $imagedir/${casename}_test_1s.png $imagedir/${casename}_1.png -toleranceOfColor 0.1] != 0 } { puts "Error difference in 1st image (using stream)" }
-if { [diffimage $imagedir/${casename}_test_2s.png $imagedir/${casename}_2.png -toleranceOfColor 0.1] != 0 } { puts "Error difference in 2nd image (using stream)" }
-

tests/v3d/manipulator/drag_pan_zoom

@@ -1,43 +0,0 @@
-puts "=============================================="
-puts "0032879: Visualization - Separate pan/zoom and move the object behavior in AIS_ViewController"
-puts "=============================================="
-puts ""
-
-pload MODELING VISUALIZATION
-
-vinit View1
-pcylinder c1  5 10
-vdisplay c1
-vsetdispmode 1
-vmanipulator m -attach c1 -adjustPosition 1 -adjustSize 0 -enableModes 1 -size 40
-vfit
-
-# note: mouse events cannot be emulated here, so the original bug cannot be reproduced by this test case
-
-# pan for the left mouse button
-vchangemousegesture -button left -gesture pan
-
-set mouse_pick {204 194}
-set mouse_drag {369 35}
-
-vmoveto {*}$mouse_pick
-vselect {*}$mouse_pick
-vmanipulator m -startTransform {*}$mouse_pick
-vmanipulator m -transform {*}$mouse_drag
-vmanipulator m -stopTransform
-vselect 0 0
-vdump $imagedir/${casename}_pan.png
-
-# zoom for the left mouse button
-vchangemousegesture -button left -gesture zoom
-
-set mouse_pick {206 32}
-set mouse_drag {365 330}
-
-vmoveto {*}$mouse_pick
-vselect {*}$mouse_pick
-vmanipulator m -startTransform {*}$mouse_pick
-vmanipulator m -transform {*}$mouse_drag
-vmanipulator m -stopTransform
-vselect 0 0
-vdump $imagedir/${casename}_zoom.png