X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=67c5899ad5dab9f1fb2acd55176c486d26f1db8f;hb=3c8b24929765c51ae41675f49c71c7e017d4f301;hp=e3a71f07dd9419cf02acc84f3885bf872d92f032;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index e3a71f0..67c5899 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file layer_pastecanvas.h
 **	\brief Template Header
 **
 **	$Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $
 **
 **	\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
 */
 /* ========================================================================= */
@@ -45,14 +46,14 @@
 
 using namespace etl;
 using namespace std;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
 #define MAX_DEPTH 10
 
 //#ifdef __APPLE__
-//#define SINFG_NO_CLIP
+//#define SYNFIG_NO_CLIP
 //#endif
 
 /* === C L A S S E S ======================================================= */
@@ -67,12 +68,12 @@ public:
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(Layer_PasteCanvas);
-SINFG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas");
-SINFG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas"));
-SINFG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default"));
-SINFG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
-SINFG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $");
+SYNFIG_LAYER_INIT(Layer_PasteCanvas);
+SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas");
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default"));
+SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $");
 
 /* === M E T H O D S ======================================================= */
 
@@ -159,7 +160,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 }
 
 void
-Layer_PasteCanvas::set_sub_canvas(etl::handle<sinfg::Canvas> x)
+Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 {
 	if(canvas && !do_not_muck_with_time_)
 		remove_child(canvas.get());
@@ -196,13 +197,13 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<sinfg::Canvas> x)
 void
 Layer_PasteCanvas::on_canvas_set()
 {
-	//sinfg::info("before count()=%d",count());
+	//synfig::info("before count()=%d",count());
 	if(get_canvas() && canvas && canvas->is_inline() && canvas->parent()!=get_canvas())
 	{
-		//sinfg::info("during count()=%d",count());
+		//synfig::info("during count()=%d",count());
 		canvas->set_inline(get_canvas());
 	}
-	//sinfg::info("after count()=%d",count());
+	//synfig::info("after count()=%d",count());
 }
 
 ValueBase
@@ -237,8 +238,8 @@ Layer_PasteCanvas::set_time(Context context, Time time)const
 		bounds=Rect::zero();
 }
 
-sinfg::Layer::Handle
-Layer_PasteCanvas::hit_check(sinfg::Context context, const sinfg::Point &pos)const
+synfig::Layer::Handle
+Layer_PasteCanvas::hit_check(synfig::Context context, const synfig::Point &pos)const
 {
 	if(depth==MAX_DEPTH)return 0;depth_counter counter(depth);
 
@@ -332,9 +333,9 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 			blend_method=Color::BLEND_STRAIGHT;
 	}
 	
-#ifndef SINFG_NO_CLIP
+#ifndef SYNFIG_NO_CLIP
 	{
-		//sinfg::info("PasteCanv Clip");
+		//synfig::info("PasteCanv Clip");
 		Rect area(desc.get_rect()&full_bounding_rect);
 				
 		Point min(area.get_min());