patch-src_libavoid_connector_cpp 786 B

1234567891011121314151617181920212223242526
  1. $OpenBSD: patch-src_libavoid_connector_cpp,v 1.1 2017/05/22 15:02:40 espie Exp $
  2. Index: src/libavoid/connector.cpp
  3. --- src/libavoid/connector.cpp.orig
  4. +++ src/libavoid/connector.cpp
  5. @@ -694,6 +694,10 @@ bool validateBendPoint(VertInf *aInf, VertInf *bInf, V
  6. return bendOkay;
  7. }
  8. +template<typename T>inline T absdiff(T a, T b)
  9. +{
  10. + return a < b ? b - a : a - b;
  11. +}
  12. bool ConnRef::generatePath(void)
  13. {
  14. @@ -885,7 +889,7 @@ bool ConnRef::generatePath(void)
  15. {
  16. // Check for consecutive points on opposite
  17. // corners of two touching shapes.
  18. - COLA_ASSERT(abs(i->pathNext->id.objID - i->id.objID) != 2);
  19. + COLA_ASSERT(absdiff(i->pathNext->id.objID, i->id.objID) != 2);
  20. }
  21. }
  22. }