From 7cd67a017475cee358300a9142034d0c734ed8fc Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 23 Jul 2020 16:18:07 +0300 Subject: [PATCH] Build GEOM with OCCT dev version. --- src/GEOMGUI/GEOM_Displayer.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 +#if OCC_VERSION_LARGE > 0x07040000 +#include +#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; -- 2.39.2