From 661279ff6ea072d46b3cc06194c8d60c33944dc8 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Thu, 3 Jul 2014 14:06:22 +0300 Subject: [PATCH 1/2] [doc][algorithms][intersection] change/update behavior when output is a collection of (multi)linestrings; update copyright header --- doc/reference/algorithms/intersection.qbk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/reference/algorithms/intersection.qbk b/doc/reference/algorithms/intersection.qbk index a4d2c9fbf..ebcea3597 100644 --- a/doc/reference/algorithms/intersection.qbk +++ b/doc/reference/algorithms/intersection.qbk @@ -1,9 +1,14 @@ [/============================================================================ Boost.Geometry (aka GGL, Generic Geometry Library) - Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands. - Copyright (c) 2009-2012 Mateusz Loskot, London, UK. - Copyright (c) 2009-2012 Bruno Lalande, Paris, France. + Copyright (c) 2009-2014 Barend Gehrels, Amsterdam, the Netherlands. + Copyright (c) 2009-2014 Mateusz Loskot, London, UK. + Copyright (c) 2009-2014 Bruno Lalande, Paris, France. + + This file was modified by Oracle on 2014. + Modifications copyright (c) 2014, Oracle and/or its affiliates. + + Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle Use, modification and distribution is subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -18,7 +23,7 @@ [table [[Case] [Behavior] ] [[[qbk_out __point__]][Calculates intersection points of input geometries]] -[[[qbk_out __linestring__]][Calculates intersection linestrings of input geometries (NYI)]] +[[[qbk_out __linestring__]][Calculates intersection linestrings of input (multi)linestrings]] [[[qbk_out __polygon__]][Calculates intersection polygons of input (multi)polygons and/or boxes]] ] From 64bec1846e3670593d283ed2d3682981839d527b Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Thu, 3 Jul 2014 14:07:55 +0300 Subject: [PATCH 2/2] [doc][algorithms][union] addd behavior when output is a collection of points or linestrings --- doc/reference/algorithms/union.qbk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/reference/algorithms/union.qbk b/doc/reference/algorithms/union.qbk index 0a7a1099a..e105d44b6 100644 --- a/doc/reference/algorithms/union.qbk +++ b/doc/reference/algorithms/union.qbk @@ -1,9 +1,14 @@ [/============================================================================ Boost.Geometry (aka GGL, Generic Geometry Library) - Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands. - Copyright (c) 2009-2012 Mateusz Loskot, London, UK. - Copyright (c) 2009-2012 Bruno Lalande, Paris, France. + Copyright (c) 2009-2014 Barend Gehrels, Amsterdam, the Netherlands. + Copyright (c) 2009-2014 Mateusz Loskot, London, UK. + Copyright (c) 2009-2014 Bruno Lalande, Paris, France. + + This file was modified by Oracle on 2014. + Modifications copyright (c) 2014, Oracle and/or its affiliates. + + Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle Use, modification and distribution is subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -18,6 +23,8 @@ [heading Behavior] [table [[Case] [Behavior] ] +[[[qbk_out __point__]][Calculates union linestrings of input (multi)points]] +[[[qbk_out __linestring__]][Calculates union linestrings of input (multi)linestrings]] [[[qbk_out __polygon__]][Calculates union polygons of input (multi)polygons and/or boxes]] ]