]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Build GEOM with OCCT dev version.
authorrnv <rnv@opencascade.com>
Thu, 23 Jul 2020 13:18:07 +0000 (16:18 +0300)
committerrnv <rnv@opencascade.com>
Thu, 23 Jul 2020 13:18:07 +0000 (16:18 +0300)
src/GEOMGUI/GEOM_Displayer.cxx

index f311ea4dca14e60f98bf3f11e14d768da97fbb6b..21f7591882a30d8085b2952b4cd7d61472cc8ea5 100644 (file)
 
 #include <TColStd_HArray1OfByte.hxx>
 
+#if OCC_VERSION_LARGE > 0x07040000
+#include <Image_SupportedFormats.hxx>
+#endif
+
 // If the next macro is defined, autocolor feature works for all sub-shapes;
 // if it is undefined, autocolor feature works for groups only
 #define GENERAL_AUTOCOLOR
@@ -242,8 +246,12 @@ namespace
       const Handle(Graphic3d_TextureMap)& aTexture = aAISShape->Attributes()->ShadingAspect()->Aspect()->TextureMap();
       if ( aTexture.IsNull() )
         continue;
-
+#if OCC_VERSION_LARGE > 0x07040000
+      Handle(Image_SupportedFormats) aFormats = new Image_SupportedFormats();
+      const Handle(Image_PixMap)& aPixmap = aTexture->GetImage(aFormats);
+#else
       const Handle(Image_PixMap)& aPixmap = aTexture->GetImage();
+#endif
       if ( aPixmap.IsNull() )
         continue;