From 618fe74db3717f5c37f7a51d0d6df95776efbfe1 Mon Sep 17 00:00:00 2001
From: mjwybrow <mjwybrow@users.sourceforge.net>
Date: Wed, 15 Feb 2006 13:25:54 +0000
Subject: *  src/document.cpp, src/document.h, src/sp-conn-end-pair.cpp,       
 src/connector-context.cpp, src/conn-avoid-ref.cpp:

    Keep a seperate connector router for each document.

    *  src/libavoid/Makefile_insert, src/libavoid/connector.cpp,
       src/libavoid/connector.h, src/libavoid/debug.h,
       src/libavoid/geometry.cpp, src/libavoid/geometry.h,
       src/libavoid/geomtypes.h, src/libavoid/graph.cpp,
       src/libavoid/graph.h, src/libavoid/incremental.cpp,
       src/libavoid/incremental.h, src/libavoid/libavoid.h,
       src/libavoid/makepath.cpp, src/libavoid/makepath.h,
       src/libavoid/polyutil.cpp, src/libavoid/polyutil.h,
       src/libavoid/router.cpp, src/libavoid/router.h,
       src/libavoid/shape.cpp, src/libavoid/shape.h,
       src/libavoid/static.cpp, src/libavoid/static.h,
       src/libavoid/timer.cpp, src/libavoid/timer.h,
       src/libavoid/vertices.cpp, src/libavoid/vertices.h,
       src/libavoid/visibility.cpp, src/libavoid/visibility.h:

    Upstream changes to libavoid that allow multiple connector
    router instances, as well a few other minor bugfixes.

(bzr r144)
---
 src/libavoid/geometry.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/libavoid/geometry.cpp')

diff --git a/src/libavoid/geometry.cpp b/src/libavoid/geometry.cpp
index d720693ac..20f045231 100644
--- a/src/libavoid/geometry.cpp
+++ b/src/libavoid/geometry.cpp
@@ -2,7 +2,7 @@
  * vim: ts=4 sw=4 et tw=0 wm=0
  *
  * libavoid - Fast, Incremental, Object-avoiding Line Router
- * Copyright (C) 2004-2005  Michael Wybrow <mjwybrow@users.sourceforge.net>
+ * Copyright (C) 2004-2006  Michael Wybrow <mjwybrow@users.sourceforge.net>
  *
  * --------------------------------------------------------------------
  * Much of the code in this module is based on code published with
@@ -27,6 +27,7 @@
 */
 
 #include "libavoid/graph.h"
+#include "libavoid/geometry.h"
 #include "libavoid/polyutil.h"
 
 #include <math.h>
@@ -103,8 +104,8 @@ bool segmentIntersect(const Point& a, const Point& b, const Point& c,
 //
 // Based on the code of 'InCone'.
 //
-bool inValidRegion(const Point& a0, const Point& a1, const Point& a2,
-        const Point& b)
+bool inValidRegion(bool IgnoreRegions, const Point& a0, const Point& a1,
+        const Point& a2, const Point& b)
 {
     int rSide = vecDir(b, a0, a1);
     int sSide = vecDir(b, a1, a2);
-- 
cgit v1.2.3