From: rnv <rnv@opencascade.com>
Date: Thu, 23 Jul 2020 13:18:07 +0000 (+0300)
Subject: Build GEOM with OCCT dev version.
X-Git-Tag: V9_6_0a1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7cd67a017475cee358300a9142034d0c734ed8fc;p=modules%2Fgeom.git

Build GEOM with OCCT dev version.
---

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index f311ea4dc..21f759188 100644
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -126,6 +126,10 @@
 
 #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;