X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_noise%2Fdistort.cpp;h=9f0820db3e09437cac03a55d75d9cd4f2c9879e2;hb=75635270584b5775982adbd70250a0ebc7e3e76b;hp=fe9eb02facb2fb2c2141354a1fe203923f705917;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.cpp b/synfig-core/trunk/src/modules/mod_noise/distort.cpp
index fe9eb02..9f0820d 100644
--- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp
+++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file noise.cpp
 **	\brief blehh
 **
 **	$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
 **
 **	\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
 */
 /* ========================================================================= */
@@ -30,31 +31,31 @@
 
 #include "distort.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 <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>
 
 #endif
 
 /* === M A C R O S ========================================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(NoiseDistort);
-SINFG_LAYER_SET_NAME(NoiseDistort,"noise_distort");
-SINFG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort"));
-SINFG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions"));
-SINFG_LAYER_SET_VERSION(NoiseDistort,"0.0");
-SINFG_LAYER_SET_CVS_ID(NoiseDistort,"$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_LAYER_INIT(NoiseDistort);
+SYNFIG_LAYER_SET_NAME(NoiseDistort,"noise_distort");
+SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort"));
+SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions"));
+SYNFIG_LAYER_SET_VERSION(NoiseDistort,"0.0");
+SYNFIG_LAYER_SET_CVS_ID(NoiseDistort,"$Id: distort.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -119,27 +120,27 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c
 }
 
 inline float
-NoiseDistort::calc_supersample(const sinfg::Point &x, float pw,float ph)const
+NoiseDistort::calc_supersample(const synfig::Point &x, float pw,float ph)const
 {
 	return 0.0f;
 }
 
 void
-NoiseDistort::set_time(sinfg::Context context, sinfg::Time t)const
+NoiseDistort::set_time(synfig::Context context, synfig::Time t)const
 {
 	curr_time=t;
 	context.set_time(t);
 }
 
 void
-NoiseDistort::set_time(sinfg::Context context, sinfg::Time t, const sinfg::Point &point)const
+NoiseDistort::set_time(synfig::Context context, synfig::Time t, const synfig::Point &point)const
 {
 	curr_time=t;
 	context.set_time(t,point);
 }
 
-sinfg::Layer::Handle
-NoiseDistort::hit_check(sinfg::Context context, const sinfg::Point &point)const
+synfig::Layer::Handle
+NoiseDistort::hit_check(synfig::Context context, const synfig::Point &point)const
 {
 	if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5)
 		return const_cast<NoiseDistort*>(this);