Author: Carlos Lopez <[email protected]>
Date: Tue Sep 25 20:01:47 2012 +0200
Halftone3: add std, etl and synfig namespaces.
---
synfig-core/src/modules/mod_filter/halftone3.h | 25 +++++++++++++----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/synfig-core/src/modules/mod_filter/halftone3.h
b/synfig-core/src/modules/mod_filter/halftone3.h
index 1045c37..3f19013 100644
--- a/synfig-core/src/modules/mod_filter/halftone3.h
+++ b/synfig-core/src/modules/mod_filter/halftone3.h
@@ -40,36 +40,39 @@
/* === T Y P E D E F S ===================================================== */
/* === C L A S S E S & S T R U C T S ======================================= */
+using namespace synfig;
+using namespace std;
+using namespace etl;
-class Halftone3 : public synfig::Layer_Composite
+class Halftone3 : public Layer_Composite
{
SYNFIG_LAYER_MODULE_EXT
private:
- synfig::Vector size;
+ Vector size;
int type;
Halftone tone[3];
- synfig::Color color[3];
+ Color color[3];
float inverse_matrix[3][3];
bool subtractive;
- synfig::Color color_func(const synfig::Point &x, float
supersample,const synfig::Color &under_color)const;
+ Color color_func(const Point &x, float supersample,const Color
&under_color)const;
- float calc_supersample(const synfig::Point &x, float pw,float ph)const;
+ float calc_supersample(const Point &x, float pw,float ph)const;
- //float halftone_func(synfig::Point x)const;
+ //float halftone_func(Point x)const;
void sync();
public:
Halftone3();
- virtual bool set_param(const synfig::String ¶m, const
synfig::ValueBase &value);
- virtual synfig::ValueBase get_param(const synfig::String ¶m)const;
- virtual synfig::Color get_color(synfig::Context context, const
synfig::Point &pos)const;
- virtual bool accelerated_render(synfig::Context context,synfig::Surface
*surface,int quality, const synfig::RendDesc &renddesc,
synfig::ProgressCallback *cb)const;
- synfig::Layer::Handle hit_check(synfig::Context context, const
synfig::Point &point)const;
+ virtual bool set_param(const String ¶m, const ValueBase &value);
+ virtual ValueBase get_param(const String ¶m)const;
+ virtual Color get_color(Context context, const Point &pos)const;
+ virtual bool accelerated_render(Context context,Surface *surface,int
quality, const RendDesc &renddesc, ProgressCallback *cb)const;
+ Layer::Handle hit_check(Context context, const Point &point)const;
virtual Vocab get_param_vocab()const;
virtual bool reads_context()const { return true; }
}; // END of class Halftone3
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl