Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / synfig / waypoint.h

diff --git a/synfig-core/tags/stable/src/synfig/waypoint.h b/synfig-core/tags/stable/src/synfig/waypoint.h
index 8d156a8..d94cf21 100644 (file)
--- a/synfig-core/tags/stable/src/synfig/waypoint.h
+++ b/synfig-core/tags/stable/src/synfig/waypoint.h
@@ -6,6 +6,8 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
+**     Copyright (c) 2008 Paul Wise
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -77,6 +79,10 @@ public:
 
        public:
                Model():
+                       // we don't need to initialise these 5, but the compiler thinks they're used uninitialised if we don't
+                       // and this constructor isn't called often, so it's ok
+                       priority(0), before(INTERPOLATION_NIL), after(INTERPOLATION_NIL), tension(0), continuity(0), bias(0), temporal_tension(0),
+
                        priority_flag(false),
                        before_flag(false),
                        after_flag(false),
@@ -141,6 +147,13 @@ public:
                }
        };
 
+       enum Side
+       {
+               SIDE_UNSPECIFIED, SIDE_LEFT, SIDE_RIGHT,
+
+           SIDE_END=2                          //!< \internal
+       };
+
        /*
  --    ** -- D A T A -------------------------------------------------------------
        */
@@ -219,8 +232,6 @@ public:
 
        bool is_static()const;
 
-       float get_time_tension()const { return time_tension; }
-       void set_time_tension(const float& x) { time_tension=x; }
        float get_temporal_tension()const { return time_tension; }
        void set_temporal_tension(const float& x) { time_tension=x; }