X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fstretch.cpp;h=c54cf67d1e89e2ca1489d254c7f45709b5f9de4f;hb=675aca937d23c7f460edf42ac3ec0ffa06205a2c;hp=ccd2ee6fbc9387f51da34d58d480f7ae14791d76;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
index ccd2ee6..c54cf67 100644
--- a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
@@ -1,27 +1,28 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file stretch.cpp
 **	\brief Template Header
 **
-**	$Id: stretch.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_NO_ANGLE
+#define SYNFIG_NO_ANGLE
 
 #ifdef USING_PCH
 #	include "pch.h"
@@ -31,15 +32,15 @@
 #endif
 
 #include "stretch.h"
-#include <sinfg/string.h>
-#include <sinfg/time.h>
-#include <sinfg/context.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/renddesc.h>
-#include <sinfg/surface.h>
-#include <sinfg/value.h>
-#include <sinfg/valuenode.h>
-#include <sinfg/transform.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/transform.h>
 
 #endif
 
@@ -47,16 +48,16 @@
 
 using namespace etl;
 using namespace std;
-using namespace sinfg;
+using namespace synfig;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(Layer_Stretch);
-SINFG_LAYER_SET_NAME(Layer_Stretch,"stretch");
-SINFG_LAYER_SET_LOCAL_NAME(Layer_Stretch,_("Stretch"));
-SINFG_LAYER_SET_CATEGORY(Layer_Stretch,_("Distortions"));
-SINFG_LAYER_SET_VERSION(Layer_Stretch,"0.1");
-SINFG_LAYER_SET_CVS_ID(Layer_Stretch,"$Id: stretch.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_INIT(Layer_Stretch);
+SYNFIG_LAYER_SET_NAME(Layer_Stretch,"stretch");
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Stretch,_("Stretch"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_Stretch,_("Distortions"));
+SYNFIG_LAYER_SET_VERSION(Layer_Stretch,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Layer_Stretch,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -70,14 +71,14 @@ Layer_Stretch::Layer_Stretch():
 {
 }
 
-	
+
 bool
 Layer_Stretch::set_param(const String & param, const ValueBase &value)
 {
 	IMPORT(amount);
 	IMPORT(center);
-	
-	return false;	
+
+	return false;
 }
 
 ValueBase
@@ -88,15 +89,15 @@ Layer_Stretch::get_param(const String &param)const
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return ValueBase();	
+
+	return ValueBase();
 }
 
 Layer::Vocab
 Layer_Stretch::get_param_vocab()const
 {
 	Layer::Vocab ret;
-	
+
 	ret.push_back(ParamDesc("amount")
 		.set_local_name(_("Amount"))
 	);
@@ -104,12 +105,12 @@ Layer_Stretch::get_param_vocab()const
 	ret.push_back(ParamDesc("center")
 		.set_local_name(_("Center"))
 	);
-	
+
 	return ret;
 }
 
-sinfg::Layer::Handle
-Layer_Stretch::hit_check(sinfg::Context context, const sinfg::Point &pos)const
+synfig::Layer::Handle
+Layer_Stretch::hit_check(synfig::Context context, const synfig::Point &pos)const
 {
 	Point npos(pos);
 	npos[0]=(npos[0]-center[0])/amount[0]+center[0];
@@ -126,18 +127,18 @@ 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:
 	Stretch_Trans(const Layer_Stretch* x):Transform(x->get_guid()),layer(x) { }
-	
-	sinfg::Vector perform(const sinfg::Vector& x)const
+
+	synfig::Vector perform(const synfig::Vector& x)const
 	{
 		return Vector((x[0]-layer->center[0])*layer->amount[0]+layer->center[0],(x[1]-layer->center[1])*layer->amount[1]+layer->center[1]);
 	}
-	
-	sinfg::Vector unperform(const sinfg::Vector& x)const
+
+	synfig::Vector unperform(const synfig::Vector& x)const
 	{
 		return Vector((x[0]-layer->center[0])/layer->amount[0]+layer->center[0],(x[1]-layer->center[1])/layer->amount[1]+layer->center[1]);
 	}