diff options
-rw-r--r-- | basegfx/source/polygon/b2dpolygontools.cxx | 51 | ||||
-rw-r--r-- | basegfx/test/basegfx2d.cxx | 71 |
2 files changed, 63 insertions, 59 deletions
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 6627e3cb65e7..2172fd71e1d1 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -1590,25 +1590,24 @@ namespace basegfx if(rtl::math::approxEqual(fZero, fRadiusX) || rtl::math::approxEqual(fZero, fRadiusY)) { - B2DPolygon aRetval; - // at least in one direction no radius, use rectangle. // Do not use createPolygonFromRect() here since original // creator (historical reasons) still creates a start point at the // bottom center, so do the same here to get the same line patterns. // Due to this the order of points is different, too. const B2DPoint aBottomCenter(rRect.getCenter().getX(), rRect.getMaxY()); - aRetval.append(aBottomCenter); - - aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMaxY() ) ); - aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMinY() ) ); - aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMinY() ) ); - aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMaxY() ) ); + B2DPolygon aPolygon { + aBottomCenter, + { rRect.getMinX(), rRect.getMaxY() }, + { rRect.getMinX(), rRect.getMinY() }, + { rRect.getMaxX(), rRect.getMinY() }, + { rRect.getMaxX(), rRect.getMaxY() } + }; // close - aRetval.setClosed( true ); + aPolygon.setClosed( true ); - return aRetval; + return aPolygon; } else if(rtl::math::approxEqual(fOne, fRadiusX) && rtl::math::approxEqual(fOne, fRadiusY)) { @@ -1684,17 +1683,17 @@ namespace basegfx B2DPolygon createPolygonFromRect( const B2DRectangle& rRect ) { - B2DPolygon aRetval; - - aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMinY() ) ); - aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMinY() ) ); - aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMaxY() ) ); - aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMaxY() ) ); + B2DPolygon aPolygon { + { rRect.getMinX(), rRect.getMinY() }, + { rRect.getMaxX(), rRect.getMinY() }, + { rRect.getMaxX(), rRect.getMaxY() }, + { rRect.getMinX(), rRect.getMaxY() } + }; // close - aRetval.setClosed( true ); + aPolygon.setClosed( true ); - return aRetval; + return aPolygon; } namespace @@ -1704,17 +1703,17 @@ namespace basegfx { B2DPolygon operator () () { - B2DPolygon aRetval; - - aRetval.append( B2DPoint( 0.0, 0.0 ) ); - aRetval.append( B2DPoint( 1.0, 0.0 ) ); - aRetval.append( B2DPoint( 1.0, 1.0 ) ); - aRetval.append( B2DPoint( 0.0, 1.0 ) ); + B2DPolygon aPolygon { + { 0.0, 0.0 }, + { 1.0, 0.0 }, + { 1.0, 1.0 }, + { 0.0, 1.0 } + }; // close - aRetval.setClosed( true ); + aPolygon.setClosed( true ); - return aRetval; + return aPolygon; } }; } diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index e215dcca0c5b..fbc093052a69 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -778,47 +778,52 @@ public: tools::createPolygonFromRect( B2DRange(0,0,1,1) ) ); - B2DPolygon aRect2; - aRect2.append( B2DPoint(0,0) ); - aRect2.append( B2DPoint(1,0) ); - aRect2.append( B2DPoint(1,.5)); - aRect2.append( B2DPoint(1,1) ); - aRect2.append( B2DPoint(0,1) ); + B2DPolygon aRect2 { + {0, 0}, + {1, 0}, + {1, 0.5}, + {1, 1}, + {0, 1} + }; aRect2.setClosed(true); - B2DPolygon aNonRect1; - aNonRect1.append( B2DPoint(0,0) ); - aNonRect1.append( B2DPoint(1,0) ); - aNonRect1.append( B2DPoint(1,1) ); - aNonRect1.append( B2DPoint(0.5,1) ); - aNonRect1.append( B2DPoint(0.5,0) ); + B2DPolygon aNonRect1 { + {0, 0}, + {1, 0}, + {0.5, 1}, + {0.5, 0} + }; aNonRect1.setClosed(true); - B2DPolygon aNonRect2; - aNonRect2.append( B2DPoint(0,0) ); - aNonRect2.append( B2DPoint(1,1) ); - aNonRect2.append( B2DPoint(1,0) ); - aNonRect2.append( B2DPoint(0,1) ); + B2DPolygon aNonRect2 { + {0, 0}, + {1, 1}, + {1, 0}, + {0, 1} + }; aNonRect2.setClosed(true); - B2DPolygon aNonRect3; - aNonRect3.append( B2DPoint(0,0) ); - aNonRect3.append( B2DPoint(1,0) ); - aNonRect3.append( B2DPoint(1,1) ); + B2DPolygon aNonRect3 { + {0, 0}, + {1, 0}, + {1, 1} + }; aNonRect3.setClosed(true); - B2DPolygon aNonRect4; - aNonRect4.append( B2DPoint(0,0) ); - aNonRect4.append( B2DPoint(1,0) ); - aNonRect4.append( B2DPoint(1,1) ); - aNonRect4.append( B2DPoint(0,1) ); - - B2DPolygon aNonRect5; - aNonRect5.append( B2DPoint(0,0) ); - aNonRect5.append( B2DPoint(1,0) ); - aNonRect5.append( B2DPoint(1,1) ); - aNonRect5.append( B2DPoint(0,1) ); - aNonRect5.setControlPoints(1,B2DPoint(1,0),B2DPoint(-11,0)); + B2DPolygon aNonRect4 { + {0, 0}, + {1, 0}, + {1, 1}, + {0, 1} + }; + + B2DPolygon aNonRect5 { + {0, 0}, + {1, 0}, + {1, 1}, + {0, 1} + }; + aNonRect5.setControlPoints(1, B2DPoint(1,0), B2DPoint(-11,0)); aNonRect5.setClosed(true); CPPUNIT_ASSERT_MESSAGE("checking rectangle-ness of rectangle 1", |