nurr

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

diff --git a/synfig-core/trunk/ChangeLog b/synfig-core/trunk/ChangeLog
index 062055c..fd24458 100644 (file)
--- a/synfig-core/trunk/ChangeLog
+++ b/synfig-core/trunk/ChangeLog
@@ -1,3 +1,5 @@
+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>
        * src/synfig/savecanvas.cpp: added #include <sys/errorno.h>
        * src/synfig/value.cpp: Various GCC 4.0 fixes

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 0f6f1a9..1d07ed4 100644 (file)
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -14,7 +14,7 @@ pkgconfig_DATA = @PACKAGE_TARNAME@.pc
 
 bin_SCRIPTS=synfig-config
 
-EXTRA_DIST=TODO bootstrap config/package doc/hw-gfx-mapping.txt win32build.sh macosxbuild.sh win32inst.nsi.in COPYING config/depcomp config/synfig.m4 config/cxx_macros.m4 synfig.pbproj/config.h synfig.pbproj/project.pbxproj @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg synfig.kdevprj synfig-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in config/pkgconfig.m4 config/libxml++.m4 @PACKAGE_TARNAME@.pc.in pkg-info/macosx/core-resources/ReadMe.txt pkg-info/macosx/core-resources/Welcome.txt pkg-info/macosx/core-resources/install.sh
+EXTRA_DIST=TODO config/subs.m4 bootstrap config/package doc/hw-gfx-mapping.txt win32build.sh macosxbuild.sh win32inst.nsi.in COPYING config/depcomp config/synfig.m4 config/cxx_macros.m4 synfig.pbproj/config.h synfig.pbproj/project.pbxproj @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg synfig.kdevprj synfig-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in config/pkgconfig.m4 config/libxml++.m4 @PACKAGE_TARNAME@.pc.in pkg-info/macosx/core-resources/ReadMe.txt pkg-info/macosx/core-resources/Welcome.txt pkg-info/macosx/core-resources/install.sh
 
 CVS=cvs
 

diff --git a/synfig-core/trunk/config/build.cfg b/synfig-core/trunk/config/build.cfg
index ecb279f..60beabc 100644 (file)
--- a/synfig-core/trunk/config/build.cfg
+++ b/synfig-core/trunk/config/build.cfg
@@ -1,7 +1,7 @@
 
 PACKAGE_NAME="Synfig Core"
 PACKAGE_BUGREPORT="darco@voria.com"
-PACKAGE_TARNAME=synfig-core
+PACKAGE_TARNAME=synfig
 VERSION_MAJ="0"
 VERSION_MIN="61"
 VERSION_REV="01"

diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
index be847bf..dc98f3f 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
@@ -127,7 +127,7 @@ Layer_Stretch::get_color(Context context, const Point &pos)const
        return context.get_color(npos);
 }
 
-class  Stretch_Trans : public Transform
+class ::Stretch_Trans : public Transform
 {
        etl::handle<const Layer_Stretch> layer;
 public:

diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.h b/synfig-core/trunk/src/modules/lyr_std/stretch.h
index 24597ba..a9cf2d4 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/stretch.h
+++ b/synfig-core/trunk/src/modules/lyr_std/stretch.h
@@ -42,7 +42,7 @@ namespace synfig {
 class Layer_Stretch : public Layer
 {
        SYNFIG_LAYER_MODULE_EXT
-       friend class Stretch_Trans;
+       friend class ::Stretch_Trans;
        
 private: