Hopefully this fixes some GCC 4.0 issues

git-svn-id: http://svn.voria.com/code@65 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/ChangeLog b/synfig-core/trunk/ChangeLog
index fd24458..52fbf52 100644 (file)
--- a/synfig-core/trunk/ChangeLog
+++ b/synfig-core/trunk/ChangeLog
@@ -1,3 +1,5 @@
+2005-11-28     Robert Quattlebaum      <darco@deepdarc.com>
+       * src/modules/lyr_std/sphere_distort.cpp/h: Clarified namespace issues 
 2005-11-08     Robert Quattlebaum      <darco@deepdarc.com>
        * src/modules/lyr_std/stretch.cpp/h: Clarified namespace issues 
 2005-11-03     Robert Quattlebaum      <darco@deepdarc.com>

diff --git a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp
index 61c4d28..cf37a99 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp
@@ -83,7 +83,7 @@ Layer_SphereDistort::Layer_SphereDistort()
 :Layer_Composite(1.0,Color::BLEND_STRAIGHT),
 center(0,0),
 radius(1),
-percent(1,1),
+percent(1.0),
 type(TYPE_NORMAL),
 clip(false)
 {
@@ -525,7 +525,7 @@ bool Layer_SphereDistort::accelerated_render(Context context,Surface *surface,in
 }
 #endif
 
-class  Spherize_Trans : public Transform
+class synfig::Spherize_Trans : public synfig::Transform
 {
        etl::handle<const Layer_SphereDistort> layer;
 public:

diff --git a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h
index 18da60f..cc6eca3 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h
+++ b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.h
@@ -36,9 +36,9 @@
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
-class Spherize_Trans;
 namespace synfig 
 {
+class Spherize_Trans;
 
 class Layer_SphereDistort : public Layer_Composite
 {