From 2940ca79a8c134efcdccd2821965ebd201ea5207 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 12 Apr 2019 15:02:39 +0300 Subject: [PATCH] Compilation with DEV version of OCCT --- src/OBJECT/GEOM_Annotation.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/OBJECT/GEOM_Annotation.cxx b/src/OBJECT/GEOM_Annotation.cxx index 755b4cc51..932466d9b 100644 --- a/src/OBJECT/GEOM_Annotation.cxx +++ b/src/OBJECT/GEOM_Annotation.cxx @@ -52,6 +52,8 @@ #include #include +#include + IMPLEMENT_STANDARD_RTTIEXT( GEOM_Annotation, AIS_InteractiveObject ) // ======================================================================= @@ -689,7 +691,11 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& const unsigned int aDPI = theWorkspace->View()->RenderingParams().Resolution; if (myTextDPI != aDPI) { +#if OCC_VERSION_LARGE <= 0x07030000 const OpenGl_AspectText* anAspect = theWorkspace->AspectText(); +#else + const OpenGl_Aspects* anAspect = theWorkspace->Aspects(); +#endif // getting string size will also initialize font library myTextDraw->StringSize( aContext, @@ -751,7 +757,11 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& { Handle(Graphic3d_PresentationAttributes) empty; theWorkspace->SetHighlightStyle(empty); +#if OCC_VERSION_LARGE <= 0x07030000 theWorkspace->ApplyAspectLine(); +#else + theWorkspace->ApplyAspects(); +#endif } GLint myOldDepthMode = 0; -- 2.30.2