X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_composite.cpp;h=24f640d96f4ce15b91305e13eeb3c3d9900a032f;hb=47a6485b6c2602a8bce63cbf09ded0952566a70a;hp=a96e72cffec5b2708a2afd0ce0bbea929235a6cd;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_composite.cpp b/synfig-core/trunk/src/synfig/layer_composite.cpp
index a96e72c..24f640d 100644
--- a/synfig-core/trunk/src/synfig/layer_composite.cpp
+++ b/synfig-core/trunk/src/synfig/layer_composite.cpp
@@ -2,19 +2,20 @@
 /*!	\file layer_composite.cpp
 **	\brief Template File
 **
-**	$Id: layer_composite.cpp,v 1.2 2005/01/24 03:08:18 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -62,7 +63,7 @@ bool
 Layer_Composite::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc_, ProgressCallback *cb)  const
 {
 	RendDesc renddesc(renddesc_);
-	
+
 	if(!amount_)
 		return context.accelerated_render(surface,quality,renddesc,cb);
 
@@ -74,7 +75,7 @@ Layer_Composite::accelerated_render(Context context,Surface *surface,int quality
 	Layer_Bitmap::Handle surfacelayer(new class Layer_Bitmap());
 
 	Context iter;
-	
+
 	for(iter=context;*iter;iter++)
 		image.push_back(*iter);
 
@@ -106,15 +107,15 @@ Layer_Composite::accelerated_render(Context context,Surface *surface,int quality
 
 	// Set up a surface target
 	Target::Handle target(surface_target(surface));
-	
+
 	if(!target)
 	{
 		if(cb)cb->error(_("Unable to create surface target"));
 		return false;
 	}
-	
+
 	RendDesc desc(renddesc);
-	
+
 	target->set_rend_desc(&desc);
 
 	// Render the scene
@@ -149,10 +150,10 @@ Layer_Composite::get_param_vocab()const
 bool
 Layer_Composite::set_param(const String & param, const ValueBase &value)
 {
-	if(param=="amount" && value.same_as(amount_))
+	if(param=="amount" && value.same_type_as(amount_))
 		amount_=value.get(amount_);
 	else
-	if(param=="blend_method" && value.same_as(int()))
+	if(param=="blend_method" && value.same_type_as(int()))
 		blend_method_=static_cast<Color::BlendMethod>(value.get(int()));
 	else
 		return Layer::set_param(param,value);