projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moreupdates
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
blur.cpp
diff --git
a/synfig-core/trunk/src/synfig/blur.cpp
b/synfig-core/trunk/src/synfig/blur.cpp
index
3d22fc8
..
0602622
100644
(file)
--- a/
synfig-core/trunk/src/synfig/blur.cpp
+++ b/
synfig-core/trunk/src/synfig/blur.cpp
@@
-1,4
+1,4
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file blur.cpp
** \brief Blur Implementation File
**
/*! \file blur.cpp
** \brief Blur Implementation File
**
@@
-28,8
+28,8
@@
# include <config.h>
#endif
# include <config.h>
#endif
-#include <s
inf
g/general.h>
-#include <s
inf
g/surface.h>
+#include <s
ynfi
g/general.h>
+#include <s
ynfi
g/surface.h>
#include "blur.h"
#include "blur.h"
@@
-46,7
+46,7
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
/* === M A C R O S ========================================================= */
/* === M A C R O S ========================================================= */
@@
-113,7
+113,7
@@
Point Blur::operator ()(const Point &pos) const
return blurpos;
}
return blurpos;
}
-Point Blur::operator ()(s
infg::Real x, sinf
g::Real y) const
+Point Blur::operator ()(s
ynfig::Real x, synfi
g::Real y) const
{
return (*this)(Point(x,y));
}
{
return (*this)(Point(x,y));
}
@@
-469,7
+469,7
@@
bool Blur::operator ()(const Surface &surface,
Surface worksurface(w,h);
Surface worksurface(w,h);
- //s
inf
g::info("Blur: check surface = %s", surface_valid(surface)?"true":"false");
+ //s
ynfi
g::info("Blur: check surface = %s", surface_valid(surface)?"true":"false");
// Premultiply the alpha
for(y=0;y<h;y++)
// Premultiply the alpha
for(y=0;y<h;y++)
@@
-555,7
+555,7
@@
bool Blur::operator ()(const Surface &surface,
case Blur::BOX: // B O X -------------------------------------------------------
{
//horizontal part
case Blur::BOX: // B O X -------------------------------------------------------
{
//horizontal part
- //s
inf
g::info("Blur: Starting Box blur (surface valid %d)", (int)surface_valid(worksurface));
+ //s
ynfi
g::info("Blur: Starting Box blur (surface valid %d)", (int)surface_valid(worksurface));
Surface temp_surface;
temp_surface.set_wh(w,h);
Surface temp_surface;
temp_surface.set_wh(w,h);
@@
-565,11
+565,11
@@
bool Blur::operator ()(const Surface &surface,
int length = halfsizex;
length=std::max(1,length);
int length = halfsizex;
length=std::max(1,length);
- //s
inf
g::info("Blur: hbox blur work -> temp %d", length);
+ //s
ynfi
g::info("Blur: hbox blur work -> temp %d", length);
etl::hbox_blur(worksurface.begin(),worksurface.end(),length,temp_surface.begin());
}
else temp_surface = worksurface;
etl::hbox_blur(worksurface.begin(),worksurface.end(),length,temp_surface.begin());
}
else temp_surface = worksurface;
- //s
inf
g::info("Blur: hbox finished");
+ //s
ynfi
g::info("Blur: hbox finished");
//vertical part
//Surface temp_surface2;
//vertical part
//Surface temp_surface2;
@@
-580,11
+580,11
@@
bool Blur::operator ()(const Surface &surface,
int length = halfsizey;
length = std::max(1,length);
int length = halfsizey;
length = std::max(1,length);
- //s
inf
g::info("Blur: vbox blur temp -> work %d",length);
+ //s
ynfi
g::info("Blur: vbox blur temp -> work %d",length);
etl::vbox_blur(temp_surface.begin(),temp_surface.end(),length,worksurface.begin());
}
else worksurface = temp_surface;
etl::vbox_blur(temp_surface.begin(),temp_surface.end(),length,worksurface.begin());
}
else worksurface = temp_surface;
- //s
inf
g::info("Blur: vbox finished");
+ //s
ynfi
g::info("Blur: vbox finished");
//blend with the original surface
/*int x,y;
//blend with the original surface
/*int x,y;
@@
-702,7
+702,7
@@
bool Blur::operator ()(const Surface &surface,
Surface temp_surface;
Surface *gauss_surface;
Surface temp_surface;
Surface *gauss_surface;
- //s
inf
g::warning("Didn't crash yet b1");
+ //s
ynfi
g::warning("Didn't crash yet b1");
//if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
gauss_surface = &worksurface;
//if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
gauss_surface = &worksurface;
@@
-736,7
+736,7
@@
bool Blur::operator ()(const Surface &surface,
memset(SC0,0,(w+2)*sizeof(Color));
memset(SC0,0,(w+2)*sizeof(Color));
memset(SC0,0,(w+2)*sizeof(Color));
memset(SC0,0,(w+2)*sizeof(Color));
- //s
inf
g::warning("Didn't crash yet b2");
+ //s
ynfi
g::warning("Didn't crash yet b2");
//int i = 0;
while(bw&&bh)
//int i = 0;
while(bw&&bh)
@@
-761,7
+761,7
@@
bool Blur::operator ()(const Surface &surface,
bw--,bh--;
}
bw--,bh--;
}
- //s
inf
g::warning("Didn't crash yet bi - %d",i++);
+ //s
ynfi
g::warning("Didn't crash yet bi - %d",i++);
}
while(bw)
{
}
while(bw)
{
@@
-777,7
+777,7
@@
bool Blur::operator ()(const Surface &surface,
GuassianBlur_2x1(*gauss_surface);
bw--;
}
GuassianBlur_2x1(*gauss_surface);
bw--;
}
- //s
inf
g::warning("Didn't crash yet bi - %d",i++);
+ //s
ynfi
g::warning("Didn't crash yet bi - %d",i++);
}
while(bh)
{
}
while(bh)
{
@@
-793,7
+793,7
@@
bool Blur::operator ()(const Surface &surface,
GuassianBlur_1x2(*gauss_surface);
bh--;
}
GuassianBlur_1x2(*gauss_surface);
bh--;
}
- //s
inf
g::warning("Didn't crash yet bi - %d",i++);
+ //s
ynfi
g::warning("Didn't crash yet bi - %d",i++);
}
delete [] SC0;
}
delete [] SC0;
@@
-808,7
+808,7
@@
bool Blur::operator ()(const Surface &surface,
for(x=0;x<renddesc.get_w();x++)
worksurface[y][x]=Color::blend(temp_surface[y][x],worksurface[y][x],get_amount(),get_blend_method());
}*/
for(x=0;x<renddesc.get_w();x++)
worksurface[y][x]=Color::blend(temp_surface[y][x],worksurface[y][x],get_amount(),get_blend_method());
}*/
- //s
inf
g::warning("Didn't crash yet b end",i++);
+ //s
ynfi
g::warning("Didn't crash yet b end",i++);
}
break;
}
break;