X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_bline.cpp;h=0852ed4397e6519ae1405ee6c592fd397df46d1a;hb=e704e6dbd6bd7607e0e484685b8f6997dd9d1286;hp=c8259fcaafbeeca7f93865a3d714b010e85ee1d2;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.cpp b/synfig-core/trunk/src/synfig/valuenode_bline.cpp
index c8259fc..0852ed4 100644
--- a/synfig-core/trunk/src/synfig/valuenode_bline.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_bline.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file valuenode_bline.cpp
 **	\brief Template File
 **
 **	$Id: valuenode_bline.cpp,v 1.1.1.1 2005/01/04 01:23:15 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
 */
 /* ========================================================================= */
@@ -47,7 +48,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -74,7 +75,7 @@ radial_interpolation(const Vector& a, const Vector& b, float c)
 
 
 ValueBase
-sinfg::convert_bline_to_segment_list(const ValueBase& bline)
+synfig::convert_bline_to_segment_list(const ValueBase& bline)
 {
 	std::vector<Segment> ret;
 	
@@ -117,7 +118,7 @@ sinfg::convert_bline_to_segment_list(const ValueBase& bline)
 }
 
 ValueBase
-sinfg::convert_bline_to_width_list(const ValueBase& bline)
+synfig::convert_bline_to_width_list(const ValueBase& bline)
 {
 	std::vector<Real> ret;
 //	std::vector<BLinePoint> list(bline.operator std::vector<BLinePoint>());
@@ -266,7 +267,7 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin)
 	ValueNode_BLine::ListEntry ret;
 
 	
-	sinfg::BLinePoint prev,next;
+	synfig::BLinePoint prev,next;
 
 	int prev_i,next_i;
 
@@ -282,7 +283,7 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin)
 		next_i=index;
 	prev_i=find_prev_valid_entry(index,time);
 	
-	sinfg::info("index=%d, next_i=%d, prev_i=%d",index,next_i,prev_i);
+	synfig::info("index=%d, next_i=%d, prev_i=%d",index,next_i,prev_i);
 	
 	next=(*list[next_i].value_node)(time);
 	prev=(*list[prev_i].value_node)(time);
@@ -290,7 +291,7 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin)
 	etl::hermite<Vector> curve(prev.get_vertex(),next.get_vertex(),prev.get_tangent2(),next.get_tangent1());
 	etl::derivative< etl::hermite<Vector> > deriv(curve);
 
-	sinfg::BLinePoint bline_point;
+	synfig::BLinePoint bline_point;
 	bline_point.set_vertex(curve(origin));
 	bline_point.set_width((next.get_width()-prev.get_width())*origin+prev.get_width());
 	bline_point.set_tangent1(deriv(origin)*min(1.0-origin,origin));
@@ -482,8 +483,8 @@ ValueNode_BLine::operator()(Time t)const
 			float prev_tangent_scalar(1.0f);
 			float next_tangent_scalar(1.0f);
 			
-			//sinfg::info("index_%d:dist_from_begin=%d",index,dist_from_begin);
-			//sinfg::info("index_%d:dist_from_end=%d",index,dist_from_end);
+			//synfig::info("index_%d:dist_from_begin=%d",index,dist_from_begin);
+			//synfig::info("index_%d:dist_from_end=%d",index,dist_from_end);
 			
 			// If we are the next to the begin
 			if(begin_iter==--std::vector<ListEntry>::const_iterator(iter) || dist_from_begin==1)
@@ -729,10 +730,10 @@ ValueNode_BLine::operator()(Time t)const
 */
 	
 	if(list.empty())
-		sinfg::warning(string("ValueNode_BLine::operator()():")+_("No entries in list"));
+		synfig::warning(string("ValueNode_BLine::operator()():")+_("No entries in list"));
 	else
 	if(ret_list.empty())
-		sinfg::warning(string("ValueNode_BLine::operator()():")+_("No entries in ret_list"));
+		synfig::warning(string("ValueNode_BLine::operator()():")+_("No entries in ret_list"));
 
 	return ValueBase(ret_list,get_loop());
 }