Mantis issue 0021483: EDF 1638 GEOM: Retrieve non blocks solids and faces from a...

[modules/geom.git] / src / GEOMImpl / GEOMImpl_IInsertOperations.hxx

diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
index 67880bc1da96f18fca3e98c82c66f0b65b01ef6c..e60c22b32847068753773b50edabd11a5e42523c 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -23,17 +23,26 @@
 #ifndef _GEOMImpl_IInsertOperations_HXX_
 #define _GEOMImpl_IInsertOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
+
+#include <Basics_OCCTVersion.hxx>
+
+#include "Utils_SALOME_Exception.hxx"
+
 #include <TDocStd_Document.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <Resource_Manager.hxx>
+
 #include <list>
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+class Handle_TColStd_HArray1OfByte;
+#else
 class Handle_TDataStd_HArray1OfByte;
+#endif
 
 class GEOMImpl_IInsertOperations : public GEOM_IOperations {
  public:
@@ -61,15 +70,23 @@ class GEOMImpl_IInsertOperations : public GEOM_IOperations {
                                                 Handle(TCollection_HAsciiString)& theLibName);
 
   Standard_EXPORT int LoadTexture(const TCollection_AsciiString& theTextureFile);
-  
-  Standard_EXPORT int AddTexture(int theWidth, int theHeight, 
+
+  Standard_EXPORT int AddTexture(int theWidth, int theHeight,
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+                                 const Handle(TColStd_HArray1OfByte)& theTexture);
+#else
                                  const Handle(TDataStd_HArray1OfByte)& theTexture);
+#endif
 
-  Standard_EXPORT Handle(TDataStd_HArray1OfByte) GetTexture(int theTextureId, 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Standard_EXPORT Handle(TColStd_HArray1OfByte) GetTexture(int theTextureId,
+#else
+  Standard_EXPORT Handle(TDataStd_HArray1OfByte) GetTexture(int theTextureId,
+#endif
                                                             int& theWidth, int& theHeight);
 
   Standard_EXPORT std::list<int> GetAllTextures();
-  
+
  private:
   Standard_Boolean InitResMgr ();