Avoid redundant calculation in QgsMapToPixelSimplifier

nyalldawson · nyalldawson · commit fcacd00a3053 · 2019-05-30T17:27:00.000+10:00
diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp
@@ -162,8 +162,6 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry
     }
 
     double x = 0.0, y = 0.0, lastX = 0.0, lastY = 0.0;
-    QgsRectangle r;
-    r.setMinimal();
 
     if ( numPoints <= ( isaLinearRing ? 4 : 2 ) )
       isGeneralizable = false;
@@ -225,8 +223,6 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry
             lastX = x;
             lastY = y;
           }
-
-          r.combineExtentWith( x, y );
         }
         break;
       }
@@ -300,8 +296,6 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry
 
             hasLongSegments |= isLongSegment;
           }
-
-          r.combineExtentWith( x, y );
         }
       }
     }
@@ -317,7 +311,7 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry
       {
         // approximate the geometry's shape by its bounding box
         // (rect for linear ring / one segment for line string)
-        return generalizeWkbGeometryByBoundingBox( wkbType, geometry, r, isaLinearRing );
+        return generalizeWkbGeometryByBoundingBox( wkbType, geometry, envelope, isaLinearRing );
       }
       else
       {

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,6 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`double x = 0.0, y = 0.0, lastX = 0.0, lastY = 0.0;`
`165`		`- QgsRectangle r;`
`166`		`- r.setMinimal();`
`167`	`165`
`168`	`166`	`if ( numPoints <= ( isaLinearRing ? 4 : 2 ) )`
`169`	`167`	`isGeneralizable = false;`
`@@ -225,8 +223,6 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry`
`225`	`223`	`lastX = x;`
`226`	`224`	`lastY = y;`
`227`	`225`	`}`
`228`		`-`
`229`		`- r.combineExtentWith( x, y );`
`230`	`226`	`}`
`231`	`227`	`break;`
`232`	`228`	`}`
`@@ -300,8 +296,6 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry`
`300`	`296`
`301`	`297`	`hasLongSegments \|= isLongSegment;`
`302`	`298`	`}`
`303`		`-`
`304`		`- r.combineExtentWith( x, y );`
`305`	`299`	`}`
`306`	`300`	`}`
`307`	`301`	`}`
`@@ -317,7 +311,7 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry`
`317`	`311`	`{`
`318`	`312`	`// approximate the geometry's shape by its bounding box`
`319`	`313`	`// (rect for linear ring / one segment for line string)`
`320`		`- return generalizeWkbGeometryByBoundingBox( wkbType, geometry, r, isaLinearRing );`
	`314`	`+ return generalizeWkbGeometryByBoundingBox( wkbType, geometry, envelope, isaLinearRing );`
`321`	`315`	`}`
`322`	`316`	`else`
`323`	`317`	`{`