summaryrefslogtreecommitdiffstats
path: root/src/helper/units.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2009-02-10 07:30:56 +0000
committerjoncruz <joncruz@users.sourceforge.net>2009-02-10 07:30:56 +0000
commite903e021e4b6c7adabea47682c861dcb3326bc19 (patch)
treeef8f2d3e613f21648ca8b17631cc94bcbe002e42 /src/helper/units.cpp
parentprevent hotkey clash (at least for english) (diff)
downloadinkscape-e903e021e4b6c7adabea47682c861dcb3326bc19.tar.gz
inkscape-e903e021e4b6c7adabea47682c861dcb3326bc19.zip
Adding explicit parenthesis to remove warnings
(bzr r7261)
Diffstat (limited to 'src/helper/units.cpp')
-rw-r--r--src/helper/units.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/helper/units.cpp b/src/helper/units.cpp
index 3e632a0ca..47c4746ac 100644
--- a/src/helper/units.cpp
+++ b/src/helper/units.cpp
@@ -137,8 +137,8 @@ sp_convert_distance(gdouble *distance, SPUnit const *from, SPUnit const *to)
if ((from->base == SP_UNIT_VOLATILE) || (to->base == SP_UNIT_VOLATILE)) return FALSE;
if ((from->base == to->base)
- || (from->base == SP_UNIT_DEVICE) && (to->base == SP_UNIT_ABSOLUTE)
- || (from->base == SP_UNIT_ABSOLUTE) && (to->base == SP_UNIT_DEVICE))
+ || ((from->base == SP_UNIT_DEVICE) && (to->base == SP_UNIT_ABSOLUTE))
+ || ((from->base == SP_UNIT_ABSOLUTE) && (to->base == SP_UNIT_DEVICE)))
{
*distance = *distance * from->unittobase / to->unittobase;
return TRUE;