Compiler suggested "parentheses around comparison in operand of ^". So I added them.

[synfig.git] / synfig-core / trunk / src / modules / example / filledrect.cpp

diff --git a/synfig-core/trunk/src/modules/example/filledrect.cpp b/synfig-core/trunk/src/modules/example/filledrect.cpp
index 57e03ab..ca5b988 100644 (file)
--- a/synfig-core/trunk/src/modules/example/filledrect.cpp
+++ b/synfig-core/trunk/src/modules/example/filledrect.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -82,8 +83,8 @@ FilledRect::set_param(const String & param, const ValueBase &value)
        IMPORT(color);
        IMPORT(point1);
        IMPORT(point2);
-       IMPORT(feather_x);
-       IMPORT(feather_y);
+       IMPORT_PLUS(feather_x, if(feather_x<0)feather_x=0;);
+       IMPORT_PLUS(feather_y, if(feather_y<0)feather_y=0;);
        IMPORT(bevel);
        IMPORT(bevCircle);
 
@@ -331,12 +332,12 @@ FilledRect::accelerated_render(Context context,Surface *surface,int quality, con
        //the bounds of the rectangle
        Point p[2] = {point1,point2};
 
-       if((p[0][0] > p[1][0]) ^ wpp < 0)
+       if((p[0][0] > p[1][0]) ^ (wpp < 0))
        {
                swap(p[0][0],p[1][0]);
        }
 
-       if((p[0][1] > p[1][1]) ^ hpp < 0)
+       if((p[0][1] > p[1][1]) ^ (hpp < 0))
        {
                swap(p[0][1],p[1][1]);
        }