From 27732efd761b727c736829b13492ef33fc41199d Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Sat, 16 Mar 2013 18:17:57 +0100
Subject: fix/suppress build warnings

(bzr r12215)
---
 src/marker.cpp    | 12 ++++++------
 src/splivarot.cpp | 36 +++---------------------------------
 2 files changed, 9 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/marker.cpp b/src/marker.cpp
index ba5cd4b05..9717160ed 100644
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -324,13 +324,13 @@ static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags)
     // Now set up viewbox transformation
 
     // Determine actual viewbox in viewport coordinates
-    double x = 0;
-    double y = 0;
+    // double x = 0;
+    // double y = 0;
     double width = 0;
     double height = 0;
     if (marker->aspect_align == SP_ASPECT_NONE) {
-        x = 0.0;
-        y = 0.0;
+        // x = 0.0;
+        // y = 0.0;
         width = rctx.viewport.width();
         height = rctx.viewport.height();
     } else {
@@ -343,7 +343,7 @@ static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags)
         height = (vb.height()) * scale;
 
         // Now place viewbox to requested position
-        switch (marker->aspect_align) {
+        /*switch (marker->aspect_align) {
             case SP_ASPECT_XMIN_YMIN:
                 x = 0.0;
                 y = 0.0;
@@ -384,7 +384,7 @@ static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags)
                 x = 0.0;
                 y = 0.0;
                 break;
-        }
+        }*/
     }
     // TODO fixme: all that work is done to figure out x and y, which are just ignored. Check why.
 
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 061d32554..2015ffd27 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -1369,48 +1369,18 @@ void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool
     Inkscape::XML::Node *parent = item->getRepr()->parent();
 
     float o_width = 0;
-    JoinType o_join = join_straight;
-    ButtType o_butt = butt_straight;
-    float o_miter = 0;
     {
         SPStyle *i_style = item->style;
-        int jointype = i_style->stroke_linejoin.value;
-        int captype = i_style->stroke_linecap.value;
 
         o_width = i_style->stroke_width.computed;
-        if (jointype == SP_STROKE_LINEJOIN_MITER)
-        {
-            o_join = join_pointy;
-        }
-        else if (jointype == SP_STROKE_LINEJOIN_ROUND)
-        {
-            o_join = join_round;
-        }
-        else
-        {
-            o_join = join_straight;
-        }
-        if (captype == SP_STROKE_LINECAP_SQUARE)
-        {
-            o_butt = butt_square;
-        }
-        else if (captype == SP_STROKE_LINECAP_ROUND)
-        {
-            o_butt = butt_round;
-        }
-        else
-        {
-            o_butt = butt_straight;
-        }
-
         {
             Inkscape::Preferences *prefs = Inkscape::Preferences::get();
             o_width = prefs->getDouble("/options/defaultoffsetwidth/value", 1.0, "px");
         }
 
-        if (o_width < 0.01)
+        if (o_width < 0.01){
             o_width = 0.01;
-        o_miter = i_style->stroke_miterlimit.value * o_width;
+        }
     }
 
     Path *orig = Path_for_item(item, true, false);
@@ -1508,7 +1478,7 @@ void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool
         // move to the saved position
         repr->setPosition(pos > 0 ? pos : 0);
 
-        SPItem *nitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr);
+        SPItem *nitem = reinterpret_cast<SPItem *>(sp_desktop_document(desktop)->getObjectByRepr(repr));
 
         if ( !updating ) {
             // delete original, apply the transform to the offset
-- 
cgit v1.2.3