X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_composite.cpp;h=8a4188e0717c625536ae2975e6ecd7728af9256b;hb=20a38826ee92a217ecbe472a90797788b58e0a9f;hp=038d68ff4759d576b325d4ad9f587bdd77204852;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_composite.cpp b/synfig-core/trunk/src/synfig/layer_composite.cpp
index 038d68f..8a4188e 100644
--- a/synfig-core/trunk/src/synfig/layer_composite.cpp
+++ b/synfig-core/trunk/src/synfig/layer_composite.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\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
 */
 /* ========================================================================= */
@@ -48,7 +49,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -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);
 
@@ -102,19 +103,19 @@ Layer_Composite::accelerated_render(Context context,Surface *surface,int quality
 	surfacelayer->br=renddesc.get_br();
 	surfacelayer->set_blend_method(Color::BLEND_STRAIGHT);
 
-	image.push_front(const_cast<sinfg::Layer_Composite*>(this));
+	image.push_front(const_cast<synfig::Layer_Composite*>(this));
 
 	// 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