[QGIS Commit] r12261 - trunk/qgis/src/core/composer

svn_qgis at osgeo.org svn_qgis at osgeo.org
Thu Nov 26 03:21:24 EST 2009


Author: mhugent
Date: 2009-11-26 03:21:22 -0500 (Thu, 26 Nov 2009)
New Revision: 12261

Modified:
   trunk/qgis/src/core/composer/qgscomposerarrow.cpp
Log:
Fix arrow bug and an assert on windows

Modified: trunk/qgis/src/core/composer/qgscomposerarrow.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerarrow.cpp	2009-11-26 00:42:19 UTC (rev 12260)
+++ trunk/qgis/src/core/composer/qgscomposerarrow.cpp	2009-11-26 08:21:22 UTC (rev 12261)
@@ -298,10 +298,10 @@
   //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 )
   {



More information about the QGIS-commit mailing list