X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Frenddesc.cpp;h=9a498b176d841640e2abe0d4465a57565ed573d2;hb=2ccf682bfdcdf0ac006e454942f90399fde01312;hp=94dc16d18587f4c93adad07fe520bd2211031ce8;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/renddesc.cpp b/synfig-core/trunk/src/synfig/renddesc.cpp
index 94dc16d..9a498b1 100644
--- a/synfig-core/trunk/src/synfig/renddesc.cpp
+++ b/synfig-core/trunk/src/synfig/renddesc.cpp
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file renddesc.h_
+/*!	\file synfig/renddesc.cpp
 **	\brief RendDesc
 **
-**	$Id: renddesc.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
 **
-**	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
 */
 /* ========================================================================= */
@@ -41,6 +43,9 @@ using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
+#undef FLAGS
+#define FLAGS(x,y)		(((x)&(y))==(y))
+
 /* === G L O B A L S ======================================================= */
 
 /* === M E T H O D S ======================================================= */
@@ -99,25 +104,25 @@ RendDesc::get_w()const
 RendDesc &
 RendDesc::set_w(int x)
 {
-	if(FLAGS(flags,LINK_PX_ASPECT))
+	if(FLAGS(flags,LINK_PX_ASPECT)) // never set
 	{
 		h_=h_*x/w_;
 		w_=x;
 	}
-	else if(FLAGS(flags,LINK_PX_AREA))
+	else if(FLAGS(flags,LINK_PX_AREA)) // never set
 	{
 		//! \writeme
 		w_=x;
 	}
-	else if(FLAGS(flags,PX_ASPECT))
+	else if(FLAGS(flags,PX_ASPECT)) // "Pixel Aspect"
 	{
 		Vector d=br_-tl_;
 		float old_span=get_span();
 
 		// If we should preserve image width
-		if(		FLAGS(flags,IM_W)
-			|| (FLAGS(flags,IM_ZOOMIN) && d[1]>d[1]/x*w_)
-			|| (FLAGS(flags,IM_ZOOMOUT) && d[1]<d[1]/x*w_))
+		if(		FLAGS(flags,IM_W)							// "Image Width"
+			|| (FLAGS(flags,IM_ZOOMIN) && d[1]>d[1]/x*w_)	// never set
+			|| (FLAGS(flags,IM_ZOOMOUT) && d[1]<d[1]/x*w_)) // never set
 		{
 			br_[1]-=focus[1];
 			br_[1]=br_[1]/x*w_;
@@ -137,10 +142,10 @@ RendDesc::set_w(int x)
 
 		w_=x;
 
-		if(FLAGS(flags,IM_SPAN))
+		if(FLAGS(flags,IM_SPAN)) // "Image Span"
 			set_span(old_span);
 	}
-	else if(FLAGS(flags,PX_AREA))
+	else if(FLAGS(flags,PX_AREA)) // never set
 	{
 		//! \writeme
 		w_=x;
@@ -160,25 +165,25 @@ RendDesc::get_h()const
 RendDesc &
 RendDesc::set_h(int y)
 {
-	if(FLAGS(flags,LINK_PX_ASPECT))
+	if(FLAGS(flags,LINK_PX_ASPECT)) // never set
 	{
 		w_=w_*y/h_;
 		h_=y;
 	}
-	else if(FLAGS(flags,LINK_PX_AREA))
+	else if(FLAGS(flags,LINK_PX_AREA)) // never set
 	{
 		//! \writeme
 		h_=y;
 	}
-	else if(FLAGS(flags,PX_ASPECT))
+	else if(FLAGS(flags,PX_ASPECT)) // "Pixel Aspect"
 	{
 		Vector d=br_-tl_;
 		float old_span=get_span();
 
 		// If we should preserve image width
-		if(		FLAGS(flags,IM_W)
-			|| (FLAGS(flags,IM_ZOOMIN) && d[0]>d[0]/y*h_)
-			|| (FLAGS(flags,IM_ZOOMOUT) && d[0]<d[0]/y*h_))
+		if(		FLAGS(flags,IM_W)							// "Image Width"
+			|| (FLAGS(flags,IM_ZOOMIN) && d[0]>d[0]/y*h_)	// never set
+			|| (FLAGS(flags,IM_ZOOMOUT) && d[0]<d[0]/y*h_)) // never set
 		{
 			br_[0]-=focus[0];
 			br_[0]=br_[0]/y*h_;
@@ -198,10 +203,10 @@ RendDesc::set_h(int y)
 
 		h_=y;
 
-		if(FLAGS(flags,IM_SPAN))
+		if(FLAGS(flags,IM_SPAN)) // "Image Span"
 			set_span(old_span);
 	}
-	else if(FLAGS(flags,PX_AREA))
+	else if(FLAGS(flags,PX_AREA)) // never set
 	{
 		//! \writeme
 		h_=y;
@@ -249,7 +254,7 @@ RendDesc::set_y_res(Real y)
 int
 RendDesc::get_frame_start()const
 {
-	return time_begin*frame_rate;
+	return round_to_int(time_begin*frame_rate);
 }
 
 RendDesc &
@@ -261,7 +266,7 @@ RendDesc::set_frame_start(int x)
 int
 RendDesc::get_frame_end()const
 {
-	return time_end*frame_rate;
+	return round_to_int(time_end*frame_rate);
 }
 
 RendDesc &
@@ -338,7 +343,7 @@ RendDesc::get_interlaced()const
 
 RendDesc &
 RendDesc::set_interlaced(bool x)
-{ interlaced=x; return *this; }	
+{ interlaced=x; return *this; }
 
 //! Return the status of the clamp flag
 const bool &
@@ -348,7 +353,7 @@ RendDesc::get_clamp()const
 //! Set the clamp flag
 RendDesc &
 RendDesc::set_clamp(bool x)
-{ clamp=x; return *this; }	
+{ clamp=x; return *this; }
 
 //! Set constraint flags
 RendDesc &
@@ -395,7 +400,7 @@ const int &
 RendDesc::get_antialias()const
 { return a; }
 
-//! Set the antilaias amount
+//! Set the antialias amount
 RendDesc &
 RendDesc::set_antialias(const int &x)
 { a=x; return *this; }
@@ -414,7 +419,10 @@ RendDesc::set_span(const Real &x)
 {
 	Vector::value_type ratio=x/get_span();
 
-	if(!FLAGS(flags,IM_W|IM_H) || FLAGS(flags,IM_ASPECT))
+	//! \todo this looks wrong.  I suspect the intention was to check
+	//		  "(not IM_W) AND (not IM_H)", ie "not(IM_W OR IM_H)" but
+	//		  this check does "not(IM_W AND IM_H)"
+	if(!FLAGS(flags,IM_W|IM_H) || FLAGS(flags,IM_ASPECT)) // (not "Image Width") or (not "Image Height") or "Image Aspect"
 	{
 		br_-=focus;
 		br_=br_*ratio;
@@ -423,7 +431,7 @@ RendDesc::set_span(const Real &x)
 		tl_=tl_*ratio;
 		tl_+=focus;
 	}
-	else if(FLAGS(flags,IM_W))
+	else if(FLAGS(flags,IM_W))	// "Image Width"
 	{
 		//! \writeme or fix me
 		br_-=focus;
@@ -432,7 +440,7 @@ RendDesc::set_span(const Real &x)
 		tl_-=focus;
 		tl_=tl_*ratio;
 		tl_+=focus;
-	}else // IM_H
+	}else // IM_H				// "Image Height"
 	{
 		//! \writeme or fix me
 		br_-=focus;
@@ -450,7 +458,7 @@ RendDesc::set_span(const Real &x)
 /*
 const Gamma &
 RendDesc::get_gamma()const
-{ return gamma; }	
+{ return gamma; }
 
 RendDesc &
 RendDesc::set_gamma(const Gamma &x)
@@ -477,42 +485,42 @@ RendDesc::get_br()const
 RendDesc &
 RendDesc::set_tl(const Point &x)
 {
-	if(FLAGS(flags,PX_ASPECT))
+	if(FLAGS(flags,PX_ASPECT)) // "Pixel Aspect"
 	{
 		Vector new_size(x-br_);
 		new_size[0]=abs(new_size[0]);
 		new_size[1]=abs(new_size[1]);
-	
+
 		Vector old_size(tl_-br_);
 		old_size[0]=abs(old_size[0]);
 		old_size[1]=abs(old_size[1]);
-		
+
 		if(new_size[0]!=old_size[0])
 			w_=round_to_int(new_size[0]*w_/old_size[0]);
-	
+
 		if(new_size[1]!=old_size[1])
 			h_=round_to_int(new_size[1]*h_/old_size[1]);
 	}
-	
+
 	tl_=x; return *this;
 }
 
 RendDesc &
 RendDesc::set_br(const Point &x)
 {
-	if(FLAGS(flags,PX_ASPECT))
+	if(FLAGS(flags,PX_ASPECT)) // "Pixel Aspect"
 	{
 		Vector new_size(x-tl_);
 		new_size[0]=abs(new_size[0]);
 		new_size[1]=abs(new_size[1]);
-	
+
 		Vector old_size(tl_-br_);
 		old_size[0]=abs(old_size[0]);
 		old_size[1]=abs(old_size[1]);
-		
+
 		if(new_size[0]!=old_size[0])
 			w_=round_to_int(new_size[0]*w_/old_size[0]);
-	
+
 		if(new_size[1]!=old_size[1])
 			h_=round_to_int(new_size[1]*h_/old_size[1]);
 	}
@@ -524,7 +532,7 @@ RendDesc::set_viewport(const Point &__tl, const Point &__br)
 { tl_=__tl; br_=__br; return *this; }
 
 RendDesc &
-RendDesc::set_viewport(Real a,Real b,Real c,Real d)
+RendDesc::set_viewport(Vector::value_type a, Vector::value_type b, Vector::value_type c, Vector::value_type d)
 { tl_=Point(a,b); br_=Point(c,d); return *this; }
 
 Real
@@ -544,7 +552,7 @@ RendDesc::set_subwindow(int x, int y, int w, int h)
 {
 	const Real pw(get_pw());
 	const Real ph(get_ph());
-	
+
 	tl_[0]+=pw*x;
 	tl_[1]+=ph*y;
 
@@ -553,6 +561,6 @@ RendDesc::set_subwindow(int x, int y, int w, int h)
 
 	w_=w;
 	h_=h;
-	
+
 	return *this;
 }