Update of /cvsroot/libwpg/perfectspot/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13637/src
Modified Files:
renderer.cpp
Log Message:
Keep the SVG in the class instead of generating it all the time
Index: renderer.cpp
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/src/renderer.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- renderer.cpp 17 Jun 2010 10:33:55 -0000 1.20
+++ renderer.cpp 17 Jun 2010 10:47:10 -0000 1.21
@@ -45,6 +45,7 @@
public:
QSize defaultSize;
WPXInputStream* stream;
+ QByteArray content;
};
Renderer::Renderer(const QString &fileName, QObject *parent): QObject(parent)
@@ -76,8 +77,8 @@
WPXString generatedSVG;
WPGraphics::generateSVG(d->stream, generatedSVG);
- QByteArray tempSVG(generatedSVG.cstr());
- QSvgRenderer tmpRenderer(tempSVG, parent);
+ d->content = generatedSVG.cstr();
+ QSvgRenderer tmpRenderer(d->content, parent);
d->defaultSize = tmpRenderer.defaultSize();
}
}
@@ -92,27 +93,19 @@
{
if(d->stream)
{
- WPXString generatedSVG;
- WPGraphics::generateSVG(d->stream, generatedSVG);
- QByteArray tempSVG(generatedSVG.cstr());
-
- QSvgRenderer tmpRenderer(tempSVG, this);
+ QSvgRenderer tmpRenderer(d->content, this);
tmpRenderer.render(target);
}
}
bool Renderer::renderSVG(const QString& outputFile)
{
- ::WPXString output;
- if (!libwpg::WPGraphics::generateSVG(d->stream, output))
- return false;
-
QFile file(outputFile);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
return false;
QTextStream out(&file);
- out << output.cstr();
+ out << d->content.data();
file.close();
return true;
|
