projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid warning.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
renddesc.cpp
diff --git
a/synfig-core/trunk/src/synfig/renddesc.cpp
b/synfig-core/trunk/src/synfig/renddesc.cpp
index
92eeae7
..
c899e7b
100644
(file)
--- a/
synfig-core/trunk/src/synfig/renddesc.cpp
+++ b/
synfig-core/trunk/src/synfig/renddesc.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file
renddesc.h_
+/*! \file
synfig/renddesc.cpp
** \brief RendDesc
**
** \brief RendDesc
**
-** $Id
: renddesc.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-339,7
+339,7
@@
RendDesc::get_interlaced()const
RendDesc &
RendDesc::set_interlaced(bool x)
RendDesc &
RendDesc::set_interlaced(bool x)
-{ interlaced=x; return *this; }
+{ interlaced=x; return *this; }
//! Return the status of the clamp flag
const bool &
//! Return the status of the clamp flag
const bool &
@@
-349,7
+349,7
@@
RendDesc::get_clamp()const
//! Set the clamp flag
RendDesc &
RendDesc::set_clamp(bool x)
//! Set the clamp flag
RendDesc &
RendDesc::set_clamp(bool x)
-{ clamp=x; return *this; }
+{ clamp=x; return *this; }
//! Set constraint flags
RendDesc &
//! Set constraint flags
RendDesc &
@@
-396,7
+396,7
@@
const int &
RendDesc::get_antialias()const
{ return a; }
RendDesc::get_antialias()const
{ return a; }
-//! Set the anti
la
ias amount
+//! Set the anti
al
ias amount
RendDesc &
RendDesc::set_antialias(const int &x)
{ a=x; return *this; }
RendDesc &
RendDesc::set_antialias(const int &x)
{ a=x; return *this; }
@@
-451,7
+451,7
@@
RendDesc::set_span(const Real &x)
/*
const Gamma &
RendDesc::get_gamma()const
/*
const Gamma &
RendDesc::get_gamma()const
-{ return gamma; }
+{ return gamma; }
RendDesc &
RendDesc::set_gamma(const Gamma &x)
RendDesc &
RendDesc::set_gamma(const Gamma &x)
@@
-483,18
+483,18
@@
RendDesc::set_tl(const Point &x)
Vector new_size(x-br_);
new_size[0]=abs(new_size[0]);
new_size[1]=abs(new_size[1]);
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]);
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[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]);
}
if(new_size[1]!=old_size[1])
h_=round_to_int(new_size[1]*h_/old_size[1]);
}
-
+
tl_=x; return *this;
}
tl_=x; return *this;
}
@@
-506,14
+506,14
@@
RendDesc::set_br(const Point &x)
Vector new_size(x-tl_);
new_size[0]=abs(new_size[0]);
new_size[1]=abs(new_size[1]);
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]);
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[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]);
}
if(new_size[1]!=old_size[1])
h_=round_to_int(new_size[1]*h_/old_size[1]);
}
@@
-525,7
+525,7
@@
RendDesc::set_viewport(const Point &__tl, const Point &__br)
{ tl_=__tl; br_=__br; return *this; }
RendDesc &
{ 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
{ tl_=Point(a,b); br_=Point(c,d); return *this; }
Real
@@
-545,7
+545,7
@@
RendDesc::set_subwindow(int x, int y, int w, int h)
{
const Real pw(get_pw());
const Real ph(get_ph());
{
const Real pw(get_pw());
const Real ph(get_ph());
-
+
tl_[0]+=pw*x;
tl_[1]+=ph*y;
tl_[0]+=pw*x;
tl_[1]+=ph*y;
@@
-554,6
+554,6
@@
RendDesc::set_subwindow(int x, int y, int w, int h)
w_=w;
h_=h;
w_=w;
h_=h;
-
+
return *this;
}
return *this;
}