r14944 by fschmid - Removed some no longer needed code.

scribus-commit scribus-commit at lists.scribus.net
Sun Mar 28 20:10:24 CEST 2010


Revision: 14944
Author: fschmid
Date: 2010-03-28T18:07:29.905164Z
Commit message: Removed some no longer needed code.

Changeset: 
M  /trunk/Scribus/scribus/scpainter.cpp
M  /trunk/Scribus/scribus/scpainter.h

Diffs:
Index: scribus/scpainter.cpp
===================================================================
--- scribus/scpainter.cpp	(revision 14943)
+++ scribus/scpainter.cpp	(revision 14944)
@@ -12,14 +12,6 @@
 
 #ifdef HAVE_CAIRO
 	#include <cairo.h>
-	#if defined(_WIN32)
-	#include <cairo-win32.h>
-	#elif defined(Q_WS_X11)
-	#include <cairo-xlib.h>
-	#elif defined(Q_WS_MAC)
-//	#include <cairo-quartz.h>
-	#endif
-	#include <cairo-svg.h>
 #endif
 
 #include <math.h>
@@ -67,46 +59,6 @@
 	cairo_set_tolerance( m_cr, 0.5 );
 }
 
-/// SVG file painter
-ScPainter::ScPainter( QString target, unsigned int w, unsigned int h, double transparency, int blendmode )
-{
-	m_width = w;
-	m_height= h;
-	m_stroke = QColor(0,0,0);
-	strokeMode = 0;
-	maskMode = 0;
-	m_fill = QColor(0,0,0);
-	fill_trans = 1.0;
-	stroke_trans = 1.0;
-	m_fillRule = true;
-	fillMode = 1;
-	LineWidth = 1.0;
-	m_offset = 0;
-	m_layerTransparency = transparency;
-	m_blendMode = blendmode;
-	m_blendModeFill = 0;
-	m_blendModeStroke = 0;
-	m_array.clear();
-	mf_underline = false;
-	mf_strikeout = false;
-	mf_shadow = false;
-	mf_outlined = false;
-	PLineEnd = Qt::FlatCap;
-	PLineJoin = Qt::MiterJoin;
-	fill_gradient = VGradient(VGradient::linear);
-	stroke_gradient = VGradient(VGradient::linear);
-	m_zoomFactor = 1;
-	layeredMode = true;
-	imageMode = false;
-	svgMode = true;
-	m_matrix = QTransform();
-	cairo_surface_t *img = cairo_svg_surface_create(target.toLocal8Bit().constData(), w, h);
-	m_cr = cairo_create(img);
-	cairo_save( m_cr );
-	cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_EVEN_ODD);
-	cairo_set_operator(m_cr, CAIRO_OPERATOR_OVER);
-	cairo_set_tolerance( m_cr, 0.5 );
-}
 // HAVE_CAIRO
 #else
 /// image painter
Index: scribus/scpainter.h
===================================================================
--- scribus/scpainter.h	(revision 14943)
+++ scribus/scpainter.h	(revision 14944)
@@ -33,9 +33,6 @@
 {
 public:
 	ScPainter( QImage *target, unsigned int w, unsigned int h, double transparency = 1.0, int blendmode = 0 );
-#ifdef HAVE_CAIRO
-	ScPainter( QString target, unsigned int w, unsigned int h, double transparency = 1.0, int blendmode = 0 );
-#endif
 	virtual ~ScPainter();
 	enum FillMode { None, Solid, Gradient, Pattern };
 	virtual void beginLayer(double transparency, int blendmode, FPointArray *clipArray = 0);




More information about the scribus-commit mailing list