X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.cpp;h=b6ae2e68f4ce11a2e535e85632e84d93d939eea4;hb=19814e54d027ea1a98c532218966212298b9b555;hp=b7d8307615ca2f4ebb548d7f51ff2c6fa6080343;hpb=dd77396ef0832460e05b4ce99a5e9f552424d9e2;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index b7d8307..b6ae2e6 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -98,10 +98,10 @@ Layer::subsys_init() #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); LAYER_ALIAS(Layer_SolidColor,"SolidColor"); - INCLUDE_LAYER(Layer_PasteCanvas); LAYER_ALIAS(Layer_PasteCanvas,"PasteCanvas"); - INCLUDE_LAYER(Layer_Polygon); LAYER_ALIAS(Layer_Polygon,"Polygon"); - INCLUDE_LAYER(Layer_MotionBlur); LAYER_ALIAS(Layer_MotionBlur,"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 @@ -313,8 +313,8 @@ Layer::clone(const GUID& deriv_guid) const 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) { @@ -325,8 +325,8 @@ Layer::clone(const GUID& deriv_guid) const Canvas::Handle canvas(iter->second.get(Canvas::Handle())); 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); @@ -342,7 +342,7 @@ Layer::clone(const GUID& deriv_guid) const 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())); @@ -425,7 +425,7 @@ Layer::get_version()const } bool -Layer::set_version(const String &ver) +Layer::set_version(const String &/*ver*/) { return false; } @@ -466,7 +466,7 @@ Layer::hit_check(synfig::Context context, const synfig::Point &pos)const ** 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=surface_target(surface); if(!target)