summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrius Ramanauskas <knutux@gmail.com>2006-04-20 07:13:38 +0000
committerknutux <knutux@users.sourceforge.net>2006-04-20 07:13:38 +0000
commit8dba9652fbd573b3f92dda22dc6638f334491dab (patch)
tree9a22591c7c9910165865c336558a8daf49c02854
parentc for calligraphy (diff)
downloadinkscape-8dba9652fbd573b3f92dda22dc6638f334491dab.tar.gz
inkscape-8dba9652fbd573b3f92dda22dc6638f334491dab.zip
resolving compiler warnings
(bzr r552)
-rw-r--r--src/display/sp-ctrlline.cpp8
-rw-r--r--src/livarot/Shape.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp
index 463d32336..d6dbdf022 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -143,10 +143,10 @@ sp_ctrlline_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int f
thePath->LineTo(NR::Point(cl->e.x, cl->e.y) * affine);
NRRectL area;
- area.x0=item->x1;
- area.x1=item->x2;
- area.y0=item->y1;
- area.y1=item->y2;
+ area.x0=(double)item->x1;
+ area.x1=(double)item->x2;
+ area.y0=(double)item->y1;
+ area.y1=(double)item->y2;
thePath->Convert(&area, 1.0);
if ( cl->shp == NULL ) cl->shp=new Shape;
thePath->Stroke(cl->shp,false,0.5,join_straight,butt_straight,20.0,false);
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index 178e8660e..145bbafe5 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -19,10 +19,10 @@
*/
Shape::Shape()
- : iData(NULL),
+ : qrsData(NULL),
+ iData(NULL),
sTree(NULL),
sEvts(NULL),
- qrsData(NULL),
_need_points_sorting(false),
_need_edges_sorting(false),
_has_points_data(false),