projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert the previous commit. This is an issue that needs resolving somehow but just...
[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
fba31a5
..
cc3882c
100644
(file)
--- a/
synfig-core/trunk/src/synfig/renddesc.cpp
+++ b/
synfig-core/trunk/src/synfig/renddesc.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-250,7
+251,7
@@
RendDesc::set_y_res(Real y)
int
RendDesc::get_frame_start()const
{
int
RendDesc::get_frame_start()const
{
- return
time_begin*frame_rate
;
+ return
round_to_int(time_begin*frame_rate)
;
}
RendDesc &
}
RendDesc &
@@
-262,7
+263,7
@@
RendDesc::set_frame_start(int x)
int
RendDesc::get_frame_end()const
{
int
RendDesc::get_frame_end()const
{
- return
time_end*frame_rate
;
+ return
round_to_int(time_end*frame_rate)
;
}
RendDesc &
}
RendDesc &
@@
-525,7
+526,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