[Libreoffice-commits] core.git: basegfx/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Jan 13 20:36:27 UTC 2020


 basegfx/source/polygon/b2dlinegeometry.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 76a8746ea40965547c3d0fd9d56a8649f26ef756
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jan 13 19:42:15 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jan 13 21:35:57 2020 +0100

    crashtesting: downgrade assert to a warning
    
    its asserts since...
    
    commit 5291c3ef56948a91166a597033f3e48e00d57403
    Date:   Sun Dec 1 05:41:43 2019 +1100
        tdf#43157 basegfx: remove OSL_ENSURE preconditions
    
    on e.g. export of tdf12500-2.wmf to odg
    
    but its unclear what a fix might look like
    
    Change-Id: I26c1b1426a0d5ca7f25ca69cf1b720fe3344ce69
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86714
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index 007ff8b4811d..91769a833ff5 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <osl/diagnose.h>
+#include <sal/log.hxx>
 #include <basegfx/polygon/b2dlinegeometry.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
@@ -698,7 +699,7 @@ namespace basegfx
             double fMiterMinimumAngle,
             basegfx::triangulator::B2DTriangleVector* pTriangles)
         {
-            assert((fHalfLineWidth > 0.0) && "createAreaGeometryForJoin: LineWidth too small (!)");
+            SAL_WARN_IF(fHalfLineWidth <= 0.0,"basegfx","createAreaGeometryForJoin: LineWidth too small (!)");
             assert((eJoin != B2DLineJoin::NONE) && "createAreaGeometryForJoin: B2DLineJoin::NONE not allowed (!)");
 
             // LineJoin from tangent rPerpendPrev to tangent rPerpendEdge in rPoint


More information about the Libreoffice-commits mailing list