X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fblur.cpp;h=392ef7113f1d6063004be3877ec032743a21512d;hb=d15c4522466bedfbe61620c401becae0931854f5;hp=4307a7e3069f3ef69c619b3ceb922446d615e761;hpb=a844921624f813ecafac3f34104c1078b9e375f2;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/blur.cpp b/synfig-core/trunk/src/synfig/blur.cpp index 4307a7e..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() +inline Color zero() { return Color::alpha(); } @@ -449,9 +449,9 @@ static void GuassianBlur_1x3(etl::surface &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 &surface, - const Vector &resolution, - surface &out) const +bool Blur::operator()(const etl::surface &surface, + const synfig::Vector &resolution, + etl::surface &out) const { int w = surface.get_w(), h = surface.get_h();