projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add my copyright to files I've modified.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_filter
/
lumakey.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp
b/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp
index
cd7ed90
..
20cf143
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_filter/lumakey.cpp
+++ b/
synfig-core/trunk/src/modules/mod_filter/lumakey.cpp
@@
-1,11
+1,12
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file
checkerboard
.cpp
+/*! \file
lumakey
.cpp
** \brief Template Header
**
** \brief Template Header
**
-** $Id
: lumakey.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-53,10
+54,10
@@
using namespace etl;
SYNFIG_LAYER_INIT(LumaKey);
SYNFIG_LAYER_SET_NAME(LumaKey,"lumakey");
SYNFIG_LAYER_INIT(LumaKey);
SYNFIG_LAYER_SET_NAME(LumaKey,"lumakey");
-SYNFIG_LAYER_SET_LOCAL_NAME(LumaKey,_("LumaKey"));
+SYNFIG_LAYER_SET_LOCAL_NAME(LumaKey,_("Luma
Key"));
SYNFIG_LAYER_SET_CATEGORY(LumaKey,_("Filters"));
SYNFIG_LAYER_SET_VERSION(LumaKey,"0.1");
SYNFIG_LAYER_SET_CATEGORY(LumaKey,_("Filters"));
SYNFIG_LAYER_SET_VERSION(LumaKey,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(LumaKey,"$Id
: lumakey.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp
$");
+SYNFIG_LAYER_SET_CVS_ID(LumaKey,"$Id$");
/* === P R O C E D U R E S ================================================= */
/* === P R O C E D U R E S ================================================= */
@@
-71,7
+72,7
@@
LumaKey::LumaKey():
bool
LumaKey::set_param(const String ¶m, const ValueBase &value)
bool
LumaKey::set_param(const String ¶m, const ValueBase &value)
-{
+{
return Layer_Composite::set_param(param,value);
}
return Layer_Composite::set_param(param,value);
}
@@
-80,15
+81,15
@@
LumaKey::get_param(const String ¶m)const
{
EXPORT_NAME();
EXPORT_VERSION();
{
EXPORT_NAME();
EXPORT_VERSION();
-
- return Layer_Composite::get_param(param);
+
+ return Layer_Composite::get_param(param);
}
Layer::Vocab
LumaKey::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
}
Layer::Vocab
LumaKey::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
-
+
/* ret.push_back(ParamDesc("color")
.set_local_name(_("Color"))
.set_description(_("Color of checkers"))
/* ret.push_back(ParamDesc("color")
.set_local_name(_("Color"))
.set_description(_("Color of checkers"))
@@
-115,14
+116,14
@@
Color
LumaKey::get_color(Context context, const Point &getpos)const
{
const Color color(context.get_color(getpos));
LumaKey::get_color(Context context, const Point &getpos)const
{
const Color color(context.get_color(getpos));
-
+
if(get_amount()==0.0)
return color;
if(get_amount()==0.0)
return color;
-
+
Color ret(color);
ret.set_a(ret.get_y()*ret.get_a());
ret.set_y(1);
Color ret(color);
ret.set_a(ret.get_y()*ret.get_a());
ret.set_y(1);
-
+
if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
return ret;
if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
return ret;
@@
-162,6
+163,6
@@
LumaKey::get_bounding_rect(Context context)const
{
if(is_disabled())
return Rect::zero();
{
if(is_disabled())
return Rect::zero();
-
+
return context.get_full_bounding_rect();
}
return context.get_full_bounding_rect();
}