Fix arrow bug and an assert on windows

mhugent · mhugent · commit 7e01bf9a1c02 · 2009-11-26T08:21:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12261 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp
@@ -298,10 +298,10 @@ void QgsComposerArrow::adaptItemSceneRect()
   //rectangle containing start and end point
   QRectF rect = QRectF( std::min( mStartPoint.x(), mStopPoint.x() ), std::min( mStartPoint.y(), mStopPoint.y() ), \
                         fabs( mStopPoint.x() - mStartPoint.x() ), fabs( mStopPoint.y() - mStartPoint.y() ) );
-  double enlarge;
+  double enlarge = 0;
   if ( mMarkerMode == DefaultMarker )
   {
-    enlarge == mPen.widthF() / 2.0 + mArrowHeadWidth / 2.0;
+    enlarge = mPen.widthF() / 2.0 + mArrowHeadWidth / 2.0;
   }
   else if ( mMarkerMode == NoMarker )
   {

Original file line number	Diff line number	Diff line change
`@@ -298,10 +298,10 @@ void QgsComposerArrow::adaptItemSceneRect()`
`298`	`298`	`//rectangle containing start and end point`
`299`	`299`	`QRectF rect = QRectF( std::min( mStartPoint.x(), mStopPoint.x() ), std::min( mStartPoint.y(), mStopPoint.y() ), \`
`300`	`300`	`fabs( mStopPoint.x() - mStartPoint.x() ), fabs( mStopPoint.y() - mStartPoint.y() ) );`
`301`		`- double enlarge;`
	`301`	`+ double enlarge = 0;`
`302`	`302`	`if ( mMarkerMode == DefaultMarker )`
`303`	`303`	`{`
`304`		`- enlarge == mPen.widthF() / 2.0 + mArrowHeadWidth / 2.0;`
	`304`	`+ enlarge = mPen.widthF() / 2.0 + mArrowHeadWidth / 2.0;`
`305`	`305`	`}`
`306`	`306`	`else if ( mMarkerMode == NoMarker )`
`307`	`307`	`{`