**
** \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
#define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__)
#define LAYER_ALIAS(class,alias) synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__);
- INCLUDE_LAYER(Layer_SolidColor);
- INCLUDE_LAYER(Layer_PasteCanvas);
- INCLUDE_LAYER(Layer_Polygon);
- LAYER_ALIAS(Layer_Polygon,"Polygon");
- INCLUDE_LAYER(Layer_MotionBlur);
+ INCLUDE_LAYER(Layer_SolidColor); LAYER_ALIAS(Layer_SolidColor, "solid_color");
+ INCLUDE_LAYER(Layer_PasteCanvas); LAYER_ALIAS(Layer_PasteCanvas, "paste_canvas");
+ INCLUDE_LAYER(Layer_Polygon); LAYER_ALIAS(Layer_Polygon, "Polygon");
+ INCLUDE_LAYER(Layer_MotionBlur); LAYER_ALIAS(Layer_MotionBlur, "motion_blur");
#undef INCLUDE_LAYER
bool
Layer::set_param(const String ¶m, const ValueBase &value)
{
- if(param=="z_depth" && value.same_as(z_depth_))
+ if(param=="z_depth" && value.same_type_as(z_depth_))
{
z_depth_=value.get(z_depth_);
return true;
ret->set_guid(get_guid()^deriv_guid);
//ret->set_param_list(get_param_list());
- // Process the parameter list sothat
- // we can duplicate any inlinecanvases
+ // Process the parameter list so that
+ // we can duplicate any inline canvases
ParamList param_list(get_param_list());
for(ParamList::const_iterator iter(param_list.begin()); iter != param_list.end(); ++iter)
{
// This parameter is a canvas. We need a close look.
Canvas::Handle canvas(iter->second.get(Canvas::Handle()));
- if(canvas->is_inline())
+ if(canvas && canvas->is_inline())
{
- // This parameter is an inlinecanvas! we need to clone it
- // before we set it as aparameter.
+ // This parameter is an inline canvas! we need to clone it
+ // before we set it as a parameter.
Canvas::Handle new_canvas(canvas->clone(deriv_guid));
ValueBase value(new_canvas);
ret->set_param(iter->first, value);
DynamicParamList::const_iterator iter;
for(iter=dynamic_param_list().begin();iter!=dynamic_param_list().end();++iter)
{
- // Make sure we clone inlinecanvases
+ // Make sure we clone inline canvases
if(iter->second->get_type()==ValueBase::TYPE_CANVAS)
{
Canvas::Handle canvas((*iter->second)(0).get(Canvas::Handle()));
}
bool
-Layer::set_version(const String &ver)
+Layer::set_version(const String &/*ver*/)
{
return false;
}
** is anything but accelerated...
*/
bool
-Layer::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb) const
+Layer::accelerated_render(Context context,Surface *surface,int /*quality*/, const RendDesc &renddesc, ProgressCallback *cb) const
{
handle<Target> target=surface_target(surface);
if(!target)