From 81e302f81e877421e5484b086ab6472c557ebc74 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 9 Aug 2012 21:12:28 +0200 Subject: Warnings cleanup (see Bug #1034663). (bzr r11602) --- src/live_effects/lpe-rough-hatches.cpp | 2 +- src/spray-context.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp index 043296526..de40d4fb5 100644 --- a/src/live_effects/lpe-rough-hatches.cpp +++ b/src/live_effects/lpe-rough-hatches.cpp @@ -414,7 +414,7 @@ LPERoughHatches::linearSnake(Piecewise > const &f, Point const &org){ while ( i < lscs.size() ){ int dir = 0; //switch orientation of first segment according to starting point. - if ((i % 2 == n % 2) && ((j + 1) < lscs[i].size()) && !lscs[i][j].used){ + if ((static_cast(i) % 2 == n % 2) && ((j + 1) < lscs[i].size()) && !lscs[i][j].used){ j += 1; dir = 2; } diff --git a/src/spray-context.cpp b/src/spray-context.cpp index dc0ffdf0f..8013d9e3a 100644 --- a/src/spray-context.cpp +++ b/src/spray-context.cpp @@ -474,10 +474,10 @@ bool sp_spray_recursive(SPDesktop *desktop, } } else if (mode == SPRAY_MODE_SINGLE_PATH) { - SPItem *father; //initial Object - SPItem *item_copied; //Projected Object - SPItem *unionResult; //previous union - SPItem *son; //father copy + SPItem *father = NULL; //initial Object + SPItem *item_copied = NULL; //Projected Object + SPItem *unionResult = NULL; //previous union + SPItem *son = NULL; //father copy int i=1; for (GSList *items = g_slist_copy((GSList *) selection->itemList()); -- cgit v1.2.3