From 1ac9173e8c967677afa398148d42b9ef85238777 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 28 Apr 2022 10:08:01 +0200 Subject: [PATCH] Disable assertion tests floating point against inf for Intel oneAPI - closes https://github.com/assimp/assimp/issues/4450 --- code/AssetLib/IFC/IFCCurve.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/AssetLib/IFC/IFCCurve.cpp b/code/AssetLib/IFC/IFCCurve.cpp index 19732ef25..ff84bb59b 100644 --- a/code/AssetLib/IFC/IFCCurve.cpp +++ b/code/AssetLib/IFC/IFCCurve.cpp @@ -4,7 +4,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2022, assimp team - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -51,7 +50,6 @@ namespace Assimp { namespace IFC { namespace { - // -------------------------------------------------------------------------------- // Conic is the base class for Circle and Ellipse // -------------------------------------------------------------------------------- @@ -546,8 +544,10 @@ IfcFloat RecursiveSearch(const Curve* cv, const IfcVector3& val, IfcFloat a, Ifc } } +#ifndef __INTEL_LLVM_COMPILER ai_assert( min_diff[ 0 ] != inf ); ai_assert( min_diff[ 1 ] != inf ); +#endif // __INTEL_LLVM_COMPILER if ( std::fabs(a-min_point[0]) < threshold || recurse >= max_recurse) { return min_point[0]; } @@ -606,8 +606,10 @@ bool BoundedCurve::IsClosed() const { // ------------------------------------------------------------------------------------------------ void BoundedCurve::SampleDiscrete(TempMesh& out) const { const ParamRange& range = GetParametricRange(); +#ifndef __INTEL_LLVM_COMPILER ai_assert( range.first != std::numeric_limits::infinity() ); ai_assert( range.second != std::numeric_limits::infinity() ); +#endif // __INTEL_LLVM_COMPILER return SampleDiscrete(out,range.first,range.second); }