r22315 by craig -

scribus-commit scribus-commit at lists.scribus.net
Sat Dec 30 22:27:18 UTC 2017


Author: craig
Date: Sat Dec 30 22:27:18 2017
New Revision: 22315

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22315
Log:
Fix Coverity 1426979

Modified:
    trunk/Scribus/scribus/scpainter.cpp

Modified: trunk/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22315&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp	(original)
+++ trunk/Scribus/scribus/scpainter.cpp	Sat Dec 30 22:27:18 2017
@@ -26,37 +26,65 @@
 {
 	Q_ASSERT(w>=0);
 	Q_ASSERT(h>=0);
-	m_width = w;
-	m_height= h;
-	m_stroke = QColor(0,0,0);
-	m_strokeMode = 0;
-	m_maskMode = 0;
-	m_fill = QColor(0,0,0);
-	m_fill_trans = 1.0;
-	m_stroke_trans = 1.0;
-	m_fillRule = true;
-	m_fillMode = 1;
-	m_LineWidth = 1.0;
-	m_offset = 0;
+	m_maskPattern = NULL;
+	m_pattern = NULL;
+	m_imageMask = NULL;
+	m_image = target;
 	m_layerTransparency = transparency;
 	m_blendMode = blendmode;
 	m_blendModeFill = 0;
 	m_blendModeStroke = 0;
-	m_array.clear();
+	m_width = w;
+	m_height= h;
+	m_fontSize = 0.0;
 	mf_underline = false;
 	mf_strikeout = false;
 	mf_shadow = false;
 	mf_outlined = false;
+	m_fill = QColor(0,0,0);
+	m_fill_trans = 1.0;
+	m_fillRule = true;
+	m_fillMode = 1;
+	m_patternScaleX = 0.0;
+	m_patternScaleX = 0.0;
+	m_patternScaleY = 0.0;
+	m_patternOffsetX = 0.0;
+	m_patternOffsetY = 0.0;
+	m_patternRotation = 0.0;
+	m_patternSkewX = 0.0;
+	m_patternSkewY = 0.0;
+	m_patternMirrorX = false;
+	m_patternMirrorY = false;
+	m_gradientScale = 0.0;
+	m_gradientSkew = 0.0;
+	setHatchParameters(0, 2, 0, false, QColor(), QColor(), 0.0, 0.0);
+	m_stroke = QColor(0,0,0);
+	m_stroke_trans = 1.0;
+	m_LineWidth = 1.0;
+	m_strokeMode = 0;
+	m_maskMode = 0;
+	m_mask_patternScaleX = 0.0;
+	m_mask_patternScaleY = 0.0;
+	m_mask_patternOffsetX = 0.0;
+	m_mask_patternOffsetY = 0.0;
+	m_mask_patternRotation = 0.0;
+	m_mask_patternSkewX = 0.0;
+	m_mask_patternSkewY = 0.0;
+	m_mask_patternMirrorX = false;
+	m_mask_patternMirrorY = false;
+	m_mask_gradientScale = 0.0;
+	m_mask_gradientSkew = 0.0;
 	PLineEnd = Qt::FlatCap;
 	PLineJoin = Qt::MiterJoin;
-	fill_gradient = VGradient(VGradient::linear);
-	stroke_gradient = VGradient(VGradient::linear);
-	setHatchParameters(0, 2, 0, false, QColor(), QColor(), 0.0, 0.0);
+	m_offset = 0;
 	m_zoomFactor = 1;
 	m_layeredMode = true;
 	m_imageMode = true;
 	m_svgMode = false;
-	m_image = target;
+
+	fill_gradient = VGradient(VGradient::linear);
+	stroke_gradient = VGradient(VGradient::linear);
+
 	m_matrix = QTransform();
 	m_zoomStack.clear();
 	cairo_surface_t *img = cairo_image_surface_create_for_data(m_image->bits(), CAIRO_FORMAT_ARGB32, w, h, w*4);




More information about the scribus-commit mailing list