X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_filter%2Fhalftone.cpp;h=4afacd02cc9c1a95a9853de0215c499f8fae3c76;hb=e6956d92691bf2d8d962318f9763b21b854144c9;hp=8493a521c42ba860693e88bc247b7d43cc31efb6;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone.cpp
index 8493a52..4afacd0 100644
--- a/synfig-core/trunk/src/modules/mod_filter/halftone.cpp
+++ b/synfig-core/trunk/src/modules/mod_filter/halftone.cpp
@@ -2,7 +2,7 @@
 /*!	\file halftone.cpp
 **	\brief blehh
 **
-**	$Id: halftone.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -52,14 +52,14 @@ float
 Halftone::operator()(const Point &point, const float& luma, float supersample)const
 {
 	float halftone(mask(point));
-	
+
 	if(supersample>=0.5f)
 		supersample=0.4999999999f;
-	
+
 	halftone=(halftone-0.5f)*(1.0f-supersample*2.0f)+0.5f;
-	
+
 	const float diff(halftone-luma);
-	
+
 	if(supersample)
 	{
 		const float amount(diff/(supersample*2.0f)+0.5f);
@@ -87,13 +87,13 @@ Halftone::mask(synfig::Point point)const
 {
 	float radius1;
 	float radius2;
-	
+
 	point-=offset;
 
 	{
 		const float	a(Angle::sin(-angle).get()),	b(Angle::cos(-angle).get());
 		const float	u(point[0]),v(point[1]);
-	
+
 		point[0]=b*u-a*v;
 		point[1]=a*u+b*v;
 	}
@@ -109,7 +109,7 @@ Halftone::mask(synfig::Point point)const
 		x*=2;
 		return x;
 	}
-	
+
 	{
 		Point pnt(fmod(point[0],size[0]),fmod(point[1],size[1]));
 		while(pnt[0]<0)pnt[0]+=abs(size[0]);
@@ -118,13 +118,13 @@ Halftone::mask(synfig::Point point)const
 		pnt*=2.0;
 		pnt[0]/=size[0];
 		pnt[1]/=size[1];
-		
+
 		radius1=pnt.mag()/SQRT2;
 		radius1*=radius1;
 	}
 	if(type==TYPE_DARKONLIGHT || type== TYPE_LIGHTONDARK)
 		return radius1;
-	
+
 	{
 		Point pnt(fmod(point[0]+size[0]*0.5,size[0]),fmod(point[1]+size[0]*0.5,size[1]));
 		while(pnt[0]<0)pnt[0]+=abs(size[0]);
@@ -133,11 +133,11 @@ Halftone::mask(synfig::Point point)const
 		pnt*=2.0;
 		pnt[0]/=size[0];
 		pnt[1]/=size[1];
-		
+
 		radius2=pnt.mag()/SQRT2;
 		radius2*=radius2;
 	}
-	
+
 	if(type==TYPE_DIAMOND)
 	{
 		//return (radius1+(1.0f-radius2))*0.5;
@@ -146,19 +146,19 @@ Halftone::mask(synfig::Point point)const
 		x-=0.5;
 		x*=2.0;
 		if(x<0)x=-sqrt(-x);else x=sqrt(x);
-		x*=1.01f;	
+		x*=1.01f;
 		x/=2.0;
 		x+=0.5;
 		return x;
 	}
-	
+
 	if(type==TYPE_SYMMETRIC)
 	{
 		float x(((radius2-radius1)*((radius1+(1.0f-radius2))*0.5)+radius1)*2.0f);
 		x-=0.5;
 		x*=2.0;
 		if(x<0)x=-sqrt(-x);else x=sqrt(x);
-		x*=1.01f;	
+		x*=1.01f;
 		x/=2.0;
 		x+=0.5;
 		return x;