X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fblur.cpp;h=4fff029639e95bd7949532ee0d44c8a48c2340d3;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=85ce275faacf8280a1ea4c313cd5065eab673b93;hpb=47a6485b6c2602a8bce63cbf09ded0952566a70a;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/blur.cpp b/synfig-core/trunk/src/synfig/blur.cpp
index 85ce275..4fff029 100644
--- a/synfig-core/trunk/src/synfig/blur.cpp
+++ b/synfig-core/trunk/src/synfig/blur.cpp
@@ -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));
@@ -714,7 +714,7 @@ bool Blur::operator ()(const Surface &surface,
 			}*/
 
             /* Squaring the pw and ph values
-			   is necessary to insure consistant
+			   is necessary to insure consistent
 			   results when rendered to different
 			   resolutions.
 			   Unfortunately, this automatically
@@ -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();
@@ -1088,7 +1088,7 @@ bool Blur::operator ()(const surface<float> &surface,
 			}*/
 
             /* Squaring the pw and ph values
-			   is necessary to insure consistant
+			   is necessary to insure consistent
 			   results when rendered to different
 			   resolutions.
 			   Unfortunately, this automatically