X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_filter%2Fhalftone3.cpp;h=d5b40a6e8fd69404582e4ede4d68cb0dc8a642ca;hb=771388a04b903a5f9551362b143cd8f3e520b37f;hp=2905c9d0ddcde7795c19368959c04e7f2ec62d5c;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
index 2905c9d..d5b40a6 100644
--- a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
+++ b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file halftone3.cpp
 **	\brief blehh
 **
 **	$Id: halftone3.cpp,v 1.1.1.1 2005/01/04 01:23:10 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
 */
 /* ========================================================================= */
@@ -31,31 +32,31 @@
 #include "halftone3.h"
 #include "halftone.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(Halftone3);
-SINFG_LAYER_SET_NAME(Halftone3,"halftone3");
-SINFG_LAYER_SET_LOCAL_NAME(Halftone3,_("Halftone3"));
-SINFG_LAYER_SET_CATEGORY(Halftone3,_("Filters"));
-SINFG_LAYER_SET_VERSION(Halftone3,"0.0");
-SINFG_LAYER_SET_CVS_ID(Halftone3,"$Id: halftone3.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_INIT(Halftone3);
+SYNFIG_LAYER_SET_NAME(Halftone3,"halftone3");
+SYNFIG_LAYER_SET_LOCAL_NAME(Halftone3,_("Halftone3"));
+SYNFIG_LAYER_SET_CATEGORY(Halftone3,_("Filters"));
+SYNFIG_LAYER_SET_VERSION(Halftone3,"0.0");
+SYNFIG_LAYER_SET_CVS_ID(Halftone3,"$Id: halftone3.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -66,14 +67,14 @@ SINFG_LAYER_SET_CVS_ID(Halftone3,"$Id: halftone3.cpp,v 1.1.1.1 2005/01/04 01:23:
 
 Halftone3::Halftone3()
 {
-	size=(sinfg::Vector(0.25,0.25));
+	size=(synfig::Vector(0.25,0.25));
 	type=TYPE_SYMMETRIC;
 
 	for(int i=0;i<3;i++)
 	{
 		tone[i].size=size;
 		tone[i].type=type;
-		tone[i].offset=(sinfg::Point(0,0));
+		tone[i].offset=(synfig::Point(0,0));
 		tone[i].angle=Angle::deg(30.0)*(float)i;
 	}
 
@@ -228,13 +229,13 @@ Halftone3::color_func(const Point &point, float supersample,const Color& in_colo
 }
 
 inline float
-Halftone3::calc_supersample(const sinfg::Point &x, float pw,float ph)const
+Halftone3::calc_supersample(const synfig::Point &x, float pw,float ph)const
 {
 	return abs(pw/(tone[0].size).mag());
 }
 
-sinfg::Layer::Handle
-Halftone3::hit_check(sinfg::Context context, const sinfg::Point &point)const
+synfig::Layer::Handle
+Halftone3::hit_check(synfig::Context context, const synfig::Point &point)const
 {
 	return const_cast<Halftone3*>(this);
 }