Update of /cvsroot/libwpg/libwpg/src/lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16525/src/lib
Modified Files:
WPG2Parser.cpp WPGGradient.cpp WPGGradient.h
WPGSVGGenerator.cpp
Log Message:
move gradient angle from WPGGradient class to the general style (we will get rid of WPGGradient soon)
Index: WPG2Parser.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG2Parser.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- WPG2Parser.cpp 5 Dec 2008 15:17:25 -0000 1.96
+++ WPG2Parser.cpp 10 Dec 2008 12:54:28 -0000 1.97
@@ -947,7 +947,7 @@
double tanangle = tan(angle);
double ref = (tanangle < 1e2 && tanangle > -1e2) ? (yref+xref*tanangle)/(1+tanangle) : xref;
libwpg::WPGGradient gradient;
- gradient.setAngle(-m_gradientAngle); // upside down
+ m_style.insert("draw:gradient", -m_gradientAngle); // upside down
gradient.addStop(0, colors[1].getColorString(), colors[0].getOpacity());
gradient.addStop(ref, colors[0].getColorString(), colors[0].getOpacity());
if((m_gradientRef["svg:x"]->getInt() != 65535) && (m_gradientRef["svg:y"]->getInt() != 65535))
@@ -1018,7 +1018,7 @@
double tanangle = tan(angle);
double ref = (tanangle<1e2) ? (yref+xref*tanangle)/(1+tanangle) : xref;
libwpg::WPGGradient gradient;
- gradient.setAngle(-m_gradientAngle); // upside down
+ m_style.insert("draw:gradient", -m_gradientAngle); // upside down
gradient.addStop(0, colors[1].getColorString(), colors[1].getOpacity());
gradient.addStop(ref, colors[0].getColorString(), colors[0].getOpacity());
if((m_gradientRef["svg:x"]->getInt() != 65535) && (m_gradientRef["svg:y"]->getInt() != 65536))
Index: WPGGradient.h
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGGradient.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- WPGGradient.h 3 Dec 2008 23:05:05 -0000 1.5
+++ WPGGradient.h 10 Dec 2008 12:54:28 -0000 1.6
@@ -45,10 +45,6 @@
WPGGradient& operator=(const WPGGradient&);
- double angle() const; // in radiant
-
- void setAngle(double angle);
-
unsigned count() const;
double stopOffset(unsigned index) const;
Index: WPGGradient.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGGradient.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- WPGGradient.cpp 5 Dec 2008 15:17:25 -0000 1.9
+++ WPGGradient.cpp 10 Dec 2008 12:54:28 -0000 1.10
@@ -46,11 +46,9 @@
{
public:
WPGGradientPrivate() :
- gradientStops(),
- angle(0.0) {};
+ gradientStops() {};
std::vector<WPGGradientStop> gradientStops;
- double angle;
};
} // namespace libwpg
@@ -68,27 +66,15 @@
libwpg::WPGGradient::WPGGradient(const libwpg::WPGGradient& g) :
d(new libwpg::WPGGradientPrivate())
{
- d->angle = g.d->angle;
d->gradientStops = g.d->gradientStops;
}
libwpg::WPGGradient& libwpg::WPGGradient::operator=(const libwpg::WPGGradient& g)
{
- d->angle = g.d->angle;
d->gradientStops = g.d->gradientStops;
return *this;
}
-double libwpg::WPGGradient::angle() const
-{
- return d->angle;
-}
-
-void libwpg::WPGGradient::setAngle(double a)
-{
- d->angle = a;
-}
-
unsigned libwpg::WPGGradient::count() const
{
return d->gradientStops.size();
Index: WPGSVGGenerator.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGSVGGenerator.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- WPGSVGGenerator.cpp 5 Dec 2008 15:17:25 -0000 1.30
+++ WPGSVGGenerator.cpp 10 Dec 2008 12:54:28 -0000 1.31
@@ -89,7 +89,7 @@
if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
{
- double angle = m_gradient.angle();
+ double angle = (m_style["draw:angle"] ? m_style["draw:angle"]->getDouble() : 0.0);
m_outputSink << "<defs>\n";
m_outputSink << " <linearGradient id=\"grad" << m_gradientIndex++ << "\" >\n";
|
