Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_filter / halftone2.cpp

diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
index c7083e1..177f6a0 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
+++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file halftone2.cpp
-**     \brief blehh
+**     \brief Implementation of the "Halftone 2" layer
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007-2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -53,8 +54,8 @@ using namespace etl;
 
 SYNFIG_LAYER_INIT(Halftone2);
 SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2");
-SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone 2"));
-SYNFIG_LAYER_SET_CATEGORY(Halftone2,_("Filters"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,N_("Halftone 2"));
+SYNFIG_LAYER_SET_CATEGORY(Halftone2,N_("Filters"));
 SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0");
 SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id$");
 
@@ -66,7 +67,7 @@ Halftone2::Halftone2():
        color_dark(Color::black()),
        color_light(Color::white())
 {
-       halftone.offset=(synfig::Point(0,0));
+       halftone.origin=(synfig::Point(0,0));
        halftone.size=(synfig::Vector(0.25,0.25));
        halftone.angle=(Angle::zero());
        halftone.type=TYPE_SYMMETRIC;
@@ -93,13 +94,13 @@ Halftone2::color_func(const Point &point, float supersample,const Color& color)c
 }
 
 inline float
-Halftone2::calc_supersample(const synfig::Point &x, float pw,float ph)const
+Halftone2::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const
 {
        return abs(pw/(halftone.size).mag());
 }
 
 synfig::Layer::Handle
-Halftone2::hit_check(synfig::Context context, const synfig::Point &point)const
+Halftone2::hit_check(synfig::Context /*context*/, const synfig::Point &/*point*/)const
 {
        return const_cast<Halftone2*>(this);
 }
@@ -113,7 +114,9 @@ Halftone2::set_param(const String & param, const ValueBase &value)
        IMPORT_AS(halftone.size,"size");
        IMPORT_AS(halftone.type,"type");
        IMPORT_AS(halftone.angle,"angle");
-       IMPORT_AS(halftone.offset,"offset");
+       IMPORT_AS(halftone.origin,"origin");
+
+       IMPORT_AS(halftone.origin,"offset");
 
        return Layer_Composite::set_param(param,value);
 }
@@ -124,7 +127,7 @@ Halftone2::get_param(const String & param)const
        EXPORT_AS(halftone.size,"size");
        EXPORT_AS(halftone.type,"type");
        EXPORT_AS(halftone.angle,"angle");
-       EXPORT_AS(halftone.offset,"offset");
+       EXPORT_AS(halftone.origin,"origin");
 
        EXPORT(color_dark);
        EXPORT(color_light);
@@ -140,18 +143,18 @@ Halftone2::get_param_vocab()const
 {
        Layer::Vocab ret(Layer_Composite::get_param_vocab());
 
-       ret.push_back(ParamDesc("offset")
-               .set_local_name(_("Mask Offset"))
+       ret.push_back(ParamDesc("origin")
+               .set_local_name(_("Mask Origin"))
                .set_is_distance()
        );
        ret.push_back(ParamDesc("angle")
                .set_local_name(_("Mask Angle"))
-               .set_origin("offset")
+               .set_origin("origin")
        );
        ret.push_back(ParamDesc("size")
                .set_local_name(_("Mask Size"))
                .set_is_distance()
-               .set_origin("offset")
+               .set_origin("origin")
        );
        ret.push_back(ParamDesc("color_light")
                .set_local_name(_("Light Color"))