[composer] Ensure that QgsComposerMap::mapPolygon returns a closed

polygon, fixes rare crash when using map overviews (fix #11305)
qgis · Oct 8, 2014 · 6bb045b · 6bb045b
1 parent fbc5f06
commit 6bb045b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1925,6 +1925,8 @@ void QgsComposerMap::mapPolygon( const QgsRectangle& extent, QPolygonF& poly ) c
     poly << QPointF( extent.xMaximum(), extent.yMaximum() );
     poly << QPointF( extent.xMaximum(), extent.yMinimum() );
     poly << QPointF( extent.xMinimum(), extent.yMinimum() );
+    //ensure polygon is closed by readding first point
+    poly << QPointF( poly.at( 0 ) );
     return;
   }
 
@@ -1955,6 +1957,9 @@ void QgsComposerMap::mapPolygon( const QgsRectangle& extent, QPolygonF& poly ) c
   dy = rotationPoint.y() - extent.yMinimum();
   QgsComposerUtils::rotate( mEvaluatedMapRotation, dx, dy );
   poly << QPointF( rotationPoint.x() - dx, rotationPoint.y() - dy );
+
+  //ensure polygon is closed by readding first point
+  poly << QPointF( poly.at( 0 ) );
 }
 
 QPolygonF QgsComposerMap::visibleExtentPolygon() const

diff --git a/src/core/composer/qgscomposermapoverview.cpp b/src/core/composer/qgscomposermapoverview.cpp
@@ -108,6 +108,8 @@ void QgsComposerMapOverview::draw( QPainter *painter )
 
   //workaround QT Bug #21329
   thisRectPoly.pop_back();
+  thisExtent.pop_back();
+
   //create transform from map coordinates to painter coordinates
   QTransform::quadToQuad( thisExtent, thisRectPoly, mapTransform );
   QPolygonF intersectPolygon;

diff --git a/tests/src/core/testqgscomposermap.cpp b/tests/src/core/testqgscomposermap.cpp
@@ -170,6 +170,9 @@ void TestQgsComposerMap::mapPolygonVertices()
   QVERIFY( fabs( visibleExtent[3].x() - 781662.375 ) < 0.001 );
   QVERIFY( fabs( visibleExtent[3].y() - 3339523.125 ) < 0.001 );
 
+  //polygon should be closed
+  QVERIFY( visibleExtent.isClosed() );
+
   //now test with rotated map
   mComposerMap->setMapRotation( 10 );
   visibleExtent = mComposerMap->visibleExtentPolygon();
@@ -184,6 +187,9 @@ void TestQgsComposerMap::mapPolygonVertices()
   QVERIFY( fabs( visibleExtent[3].x() - 782243.868114 ) < 0.001 );
   QVERIFY( fabs( visibleExtent[3].y() - 3338576.62829 ) < 0.001 );
 
+  //polygon should be closed
+  QVERIFY( visibleExtent.isClosed() );
+
   mComposerMap->setMapRotation( 0 );
 
 }