projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Write "operator()" instead of "operator ()", "operator&" instead of "operator &"...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
blineconvert.h
diff --git
a/synfig-studio/trunk/src/synfigapp/blineconvert.h
b/synfig-studio/trunk/src/synfigapp/blineconvert.h
index
7e5c020
..
74c98d4
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/blineconvert.h
+++ b/
synfig-studio/trunk/src/synfigapp/blineconvert.h
@@
-2,7
+2,7
@@
/*! \file blineconvert.h
** \brief Template Header
**
/*! \file blineconvert.h
** \brief Template Header
**
-** $Id
: blineconvert.h,v 1.1.1.1 2005/01/07 03:34:37 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
@@
-39,7
+39,7
@@
/* === C L A S S E S & S T R U C T S ======================================= */
namespace synfigapp {
/* === C L A S S E S & S T R U C T S ======================================= */
namespace synfigapp {
-
+
class BLineConverter
{
public:
class BLineConverter
{
public:
@@
-48,28
+48,28
@@
public:
int curind;
synfig::Real tangentscale;
synfig::Real error; //negative error will indicate invalid;
int curind;
synfig::Real tangentscale;
synfig::Real error; //negative error will indicate invalid;
-
- cpindex(int ci, synfig::Real s=0, synfig::Real e=-1)
- :curind(ci), tangentscale(s), error(e)
+
+ cpindex(int ci, synfig::Real s=0, synfig::Real e=-1)
+ :curind(ci), tangentscale(s), error(e)
{}
{}
-
+
cpindex(const cpindex & o)
cpindex(const cpindex & o)
- :curind(o.curind), tangentscale(o.tangentscale), error(o.error)
+ :curind(o.curind), tangentscale(o.tangentscale), error(o.error)
{}
{}
-
- const cpindex & operator
=
(const cpindex & rhs)
+
+ const cpindex & operator
=
(const cpindex & rhs)
{
curind = rhs.curind;
tangentscale = rhs.tangentscale;
error = rhs.error;
return *this;
}
{
curind = rhs.curind;
tangentscale = rhs.tangentscale;
error = rhs.error;
return *this;
}
-
- bool operator
<
(const cpindex &rhs) const
+
+ bool operator
<
(const cpindex &rhs) const
{
{
- return curind < rhs.curind;
+ return curind < rhs.curind;
}
}
-
+
//point is obviously in[curind]
//tangent scale will get reset to the smallest (or something else depending on experimentation)
};
//point is obviously in[curind]
//tangent scale will get reset to the smallest (or something else depending on experimentation)
};
@@
-81,18
+81,18
@@
private:
//temporary point storage for vector calc
std::vector<synfig::Point> ftemp;
//temporary point storage for vector calc
std::vector<synfig::Point> ftemp;
-
- std::vector<synfig::Vector> df; //the derivative cache
+
+ std::vector<synfig::Vector> df; //the derivative cache
std::vector<synfig::Real> cvt; //the curvature cache
std::vector<synfig::Real> cvt; //the curvature cache
-
+
std::vector<int> brk; //the break point cache
std::vector<int> brk; //the break point cache
-
+
std::vector<synfig::Real> di, //cumulative distance
d_i; //distance between adjacent segments
std::vector<synfig::Real> di, //cumulative distance
d_i; //distance between adjacent segments
-
+
std::vector<synfig::Point> work; //the working point cache for the entire curve
std::vector<cpindex> curind;
std::vector<synfig::Point> work; //the working point cache for the entire curve
std::vector<cpindex> curind;
-
+
//function parameters
void clear();
//function parameters
void clear();
@@
-106,9
+106,9
@@
public:
BLineConverter();
static void EnforceMinWidth(std::list<synfig::BLinePoint> &bline, synfig::Real min_pressure);
BLineConverter();
static void EnforceMinWidth(std::list<synfig::BLinePoint> &bline, synfig::Real min_pressure);
- void operator
()(std::list<synfig::BLinePoint> &out, const std::list<synfig::Point> &in,const std::list<synfig::Real> &in_w);
+ void operator()(std::list<synfig::BLinePoint> &out, const std::list<synfig::Point> &in,const std::list<synfig::Real> &in_w);
};
};
-
+
}; // END of namespace synfigapp
/* === E N D =============================================================== */
}; // END of namespace synfigapp
/* === E N D =============================================================== */