X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-conn-end-pair.cpp;h=5bce1a4f80d7a4378848e0e0c66229b73c239c08;hb=c7cf14ac71346f76ae219ce67fb88c1bd34832e2;hp=7f019979a7bd65b95fd3589de02aba5310a80d06;hpb=839598cdda20adbc1a3b5d0982c13558440d1fcb;p=inkscape.git

diff --git a/src/sp-conn-end-pair.cpp b/src/sp-conn-end-pair.cpp
index 7f019979a..5bce1a4f8 100644
--- a/src/sp-conn-end-pair.cpp
+++ b/src/sp-conn-end-pair.cpp
@@ -4,6 +4,7 @@
  * Authors:
  *   Peter Moulder <pmoulder@mail.csse.monash.edu.au>
  *   Michael Wybrow <mjwybrow@users.sourceforge.net>
+ *   Abhishek Sharma
  *
  *    * Copyright (C) 2004-2005 Monash University
  *
@@ -79,12 +80,12 @@ SPConnEndPair::release()
 void
 sp_conn_end_pair_build(SPObject *object)
 {
-    sp_object_read_attr(object, "inkscape:connector-type");
-    sp_object_read_attr(object, "inkscape:connection-start");
-    sp_object_read_attr(object, "inkscape:connection-start-point");
-    sp_object_read_attr(object, "inkscape:connection-end");
-    sp_object_read_attr(object, "inkscape:connection-end-point");
-    sp_object_read_attr(object, "inkscape:connector-curvature");
+    object->readAttr( "inkscape:connector-type" );
+    object->readAttr( "inkscape:connection-start" );
+    object->readAttr( "inkscape:connection-start-point" );
+    object->readAttr( "inkscape:connection-end" );
+    object->readAttr( "inkscape:connection-end-point" );
+    object->readAttr( "inkscape:connector-curvature" );
 }
 
 
@@ -216,6 +217,7 @@ SPConnEndPair::getEndpoints(Geom::Point endPts[]) const {
     SPCurve *curve = _path->original_curve ? _path->original_curve : _path->curve;
     SPItem *h2attItem[2];
     getAttachedItems(h2attItem);
+    Geom::Matrix i2d = SP_ITEM(_path)->i2doc_affine();
 
     for (unsigned h = 0; h < 2; ++h) {
         if ( h2attItem[h] ) {
@@ -225,10 +227,10 @@ SPConnEndPair::getEndpoints(Geom::Point endPts[]) const {
         else
         {
             if (h == 0) {
-                endPts[h] = *(curve->first_point());
+                endPts[h] = *(curve->first_point())*i2d;
             }
             else {
-                endPts[h] = *(curve->last_point());
+                endPts[h] = *(curve->last_point())*i2d;
             }
         }
     }
@@ -405,7 +407,7 @@ SPConnEndPair::reroutePathFromLibavoid(void)
 
     recreateCurve( curve, _connRef, _connCurvature );
 
-    Geom::Matrix doc2item = sp_item_i2doc_affine(SP_ITEM(_path)).inverse();
+    Geom::Matrix doc2item = SP_ITEM(_path)->i2doc_affine().inverse();
     curve->transform(doc2item);
 
     return true;