From 5e0a313b3d74a5b2158ab5dfd2afbc42da7c2f29 Mon Sep 17 00:00:00 2001
From: mjwybrow <mjwybrow@users.sourceforge.net>
Date: Tue, 24 Jan 2006 05:54:19 +0000
Subject: * src/libavoid/connector.cpp, src/libavoid/connector.h,      
 src/libavoid/shape.cpp, src/libavoid/graph.cpp,      
 src/libavoid/incremental.cpp, src/libavoid/incremental.h,      
 src/libavoid/static.cpp, src/libavoid/visibility.cpp,      
 src/libavoid/makepath.cpp:

    Some minor upstream libavoid fixes.

(bzr r25)
---
 src/libavoid/connector.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

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

diff --git a/src/libavoid/connector.cpp b/src/libavoid/connector.cpp
index cde387c5b..870095415 100644
--- a/src/libavoid/connector.cpp
+++ b/src/libavoid/connector.cpp
@@ -32,7 +32,7 @@ namespace Avoid {
 ConnRefList connRefs;
 
 
-ConnRef::ConnRef(const uint id)
+ConnRef::ConnRef(const unsigned int id)
     : _id(id)
     , _needs_reroute_flag(true)
     , _false_path(false)
@@ -50,7 +50,7 @@ ConnRef::ConnRef(const uint id)
 }
 
 
-ConnRef::ConnRef(const uint id, const Point& src, const Point& dst)
+ConnRef::ConnRef(const unsigned int id, const Point& src, const Point& dst)
     : _id(id)
     , _needs_reroute_flag(true)
     , _false_path(false)
@@ -102,16 +102,23 @@ ConnRef::~ConnRef()
     }
 }
 
-void ConnRef::updateEndPoint(const uint type, const Point& point)
+void ConnRef::updateEndPoint(const unsigned int type, const Point& point)
 {
-    assert((type == (uint) VertID::src) || (type == (uint) VertID::tar));
+    assert((type == (unsigned int) VertID::src) ||
+           (type == (unsigned int) VertID::tar));
     //assert(IncludeEndpoints);
 
+    if (!_initialised)
+    {
+        makeActive();
+        _initialised = true;
+    }
+    
     VertInf *altered = NULL;
     VertInf *partner = NULL;
     bool isShape = false;
 
-    if (type == (uint) VertID::src)
+    if (type == (unsigned int) VertID::src)
     {
         if (_srcVert)
         {
@@ -126,7 +133,7 @@ void ConnRef::updateEndPoint(const uint type, const Point& point)
         altered = _srcVert;
         partner = _dstVert;
     }
-    else // if (type == (uint) VertID::dst)
+    else // if (type == (unsigned int) VertID::dst)
     {
         if (_dstVert)
         {
@@ -311,10 +318,10 @@ int ConnRef::generatePath(Point p0, Point p1)
 
     _false_path = false;
     _needs_reroute_flag = false;
-    
+
     VertInf *src = _srcVert;
     VertInf *tar = _dstVert;
-   
+
     if (!IncludeEndpoints)
     {
         lateSetup(p0, p1);
-- 
cgit v1.2.3