X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fblur.cpp;h=392ef7113f1d6063004be3877ec032743a21512d;hb=8d7d3cdebad707c13d8365e2860dfc42666445fd;hp=c2fb90fbba1666edc0cb7694c0f586129d98770e;hpb=9fec9e45acee8a602a11699eac2dea3a0bfe4154;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/blur.cpp b/synfig-core/trunk/src/synfig/blur.cpp
index c2fb90f..392ef71 100644
--- a/synfig-core/trunk/src/synfig/blur.cpp
+++ b/synfig-core/trunk/src/synfig/blur.cpp
@@ -56,7 +56,7 @@ using namespace synfig;
 /* === P R O C E D U R E S ================================================= */
 
 /* === M E T H O D S ======================================================= */
-Point Blur::operator ()(const Point &pos) const
+Point Blur::operator()(const Point &pos) const
 {
 	Point blurpos(pos);
 
@@ -114,7 +114,7 @@ Point Blur::operator ()(const Point &pos) const
 	return blurpos;
 }
 
-Point Blur::operator ()(synfig::Real x, synfig::Real y) const
+Point Blur::operator()(synfig::Real x, synfig::Real y) const
 {
 	return (*this)(Point(x,y));
 }
@@ -128,7 +128,7 @@ static inline T zero()
 }
 
 template <>
-static inline Color zero<Color>()
+inline Color zero<Color>()
 {
 	return Color::alpha();
 }
@@ -170,7 +170,7 @@ static void GuassianBlur_3x3(etl::surface<T,AT,VP> &surface)
 	T *SC0=new T[w+1];
 	T *SC1=new T[w+1];
 
-	// Setup the row bufers
+	// Setup the row buffers
 	for(x=0;x<w;x++)SC0[x]=surface[0][x]*4;
 //	memcpy(SC1,surface[0],w*sizeof(T));
 
@@ -218,7 +218,7 @@ inline static void GaussianBlur_5x5_(etl::surface<T,AT,VP> &surface,T *SC0,T *SC
 	w=surface.get_w();
 	h=surface.get_h();
 
-	// Setup the row bufers
+	// Setup the row buffers
 	for(x=0;x<w;x++)SC0[x+2]=surface[0][x]*24;
 //	memset(SC0,0,(w+2)*sizeof(T));
 	memset(SC1,0,(w+2)*sizeof(T));
@@ -449,9 +449,9 @@ static void GuassianBlur_1x3(etl::surface<T,AT,VP> &surface)
 }
 
 //THE GOOD ONE!!!!!!!!!
-bool Blur::operator ()(const Surface &surface,
-						const Vector &resolution,
-						Surface &out) const
+bool Blur::operator()(const Surface &surface,
+					  const Vector &resolution,
+					  Surface &out) const
 {
 	int w = surface.get_w(),
 		h = surface.get_h();
@@ -846,9 +846,9 @@ bool Blur::operator ()(const Surface &surface,
 	return true;
 }
 
-bool Blur::operator ()(const surface<float> &surface,
-						const Vector &resolution,
-						surface<float> &out) const
+bool Blur::operator()(const etl::surface<float> &surface,
+					  const synfig::Vector &resolution,
+					  etl::surface<float> &out) const
 {
 	int w = surface.get_w(),
 		h = surface.get_h();