From d8930825c411a7553490e8a144ae3362ab8a9f3b Mon Sep 17 00:00:00 2001 From: darco Date: Tue, 29 Nov 2005 04:28:54 +0000 Subject: [PATCH] Hopefully this fixes some GCC 4.0 issues git-svn-id: http://svn.voria.com/code@65 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/ChangeLog | 2 ++ synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp | 4 ++-- synfig-core/trunk/src/modules/lyr_std/sphere_distort.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/synfig-core/trunk/ChangeLog b/synfig-core/trunk/ChangeLog index fd24458..52fbf52 100644 --- a/synfig-core/trunk/ChangeLog +++ b/synfig-core/trunk/ChangeLog @@ -1,3 +1,5 @@ +2005-11-28 Robert Quattlebaum + * src/modules/lyr_std/sphere_distort.cpp/h: Clarified namespace issues 2005-11-08 Robert Quattlebaum * src/modules/lyr_std/stretch.cpp/h: Clarified namespace issues 2005-11-03 Robert Quattlebaum 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 --- 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 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 --- 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 { -- 2.7.4