projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow the user to set the default foreground and background color
[synfig.git]
/
synfig-core
/
tags
/
stable
/
src
/
synfig
/
blur.cpp
diff --git
a/synfig-core/tags/stable/src/synfig/blur.cpp
b/synfig-core/tags/stable/src/synfig/blur.cpp
index
ec80fd7
..
392ef71
100644
(file)
--- a/
synfig-core/tags/stable/src/synfig/blur.cpp
+++ b/
synfig-core/tags/stable/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 ======================================================= */
/* === 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);
{
Point blurpos(pos);
@@
-114,7
+114,7
@@
Point Blur::operator ()(const Point &pos) const
return blurpos;
}
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));
}
{
return (*this)(Point(x,y));
}
@@
-128,7
+128,7
@@
static inline T zero()
}
template <>
}
template <>
-
static
inline Color zero<Color>()
+inline Color zero<Color>()
{
return Color::alpha();
}
{
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];
T *SC0=new T[w+1];
T *SC1=new T[w+1];
- // Setup the row bufers
+ // Setup the row buf
f
ers
for(x=0;x<w;x++)SC0[x]=surface[0][x]*4;
// memcpy(SC1,surface[0],w*sizeof(T));
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();
w=surface.get_w();
h=surface.get_h();
- // Setup the row bufers
+ // Setup the row buf
f
ers
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));
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!!!!!!!!!
}
//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();
{
int w = surface.get_w(),
h = surface.get_h();
@@
-714,10
+714,10
@@
bool Blur::operator ()(const Surface &surface,
}*/
/* Squaring the pw and ph values
}*/
/* Squaring the pw and ph values
- is necessary to insure consist
a
nt
+ is necessary to insure consist
e
nt
results when rendered to different
resolutions.
results when rendered to different
resolutions.
- Unfortunately, this automaticly
+ Unfortunately, this automatic
al
ly
squares our rendertime.
There has got to be a faster way...
*/
squares our rendertime.
There has got to be a faster way...
*/
@@
-846,9
+846,9
@@
bool Blur::operator ()(const Surface &surface,
return true;
}
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();
{
int w = surface.get_w(),
h = surface.get_h();
@@
-1088,10
+1088,10
@@
bool Blur::operator ()(const surface<float> &surface,
}*/
/* Squaring the pw and ph values
}*/
/* Squaring the pw and ph values
- is necessary to insure consist
a
nt
+ is necessary to insure consist
e
nt
results when rendered to different
resolutions.
results when rendered to different
resolutions.
- Unfortunately, this automaticly
+ Unfortunately, this automatic
al
ly
squares our rendertime.
There has got to be a faster way...
*/
squares our rendertime.
There has got to be a faster way...
*/