--- milena/ChangeLog | 4 ++++ milena/mln/util/ztree_of_shapes.hh | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/milena/ChangeLog b/milena/ChangeLog index 20dff54..3ba10a9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-02-25 Guillaume Lazzara z@lrde.epita.fr + + * mln/util/ztree_of_shapes.hh: Add area_2face attribute. + 2013-02-12 Guillaume Lazzara z@lrde.epita.fr

* mln/util/ztree_of_shapes.hh: Fix warnings. diff --git a/milena/mln/util/ztree_of_shapes.hh b/milena/mln/util/ztree_of_shapes.hh index 7e8ddeb..7ea3718 100644 --- a/milena/mln/util/ztree_of_shapes.hh +++ b/milena/mln/util/ztree_of_shapes.hh @@ -66,6 +66,7 @@ namespace mln tag = None; own_area = 0; area = 0; + area_2face = 0; nchild = 0; color = literal::black; is_leaf = true; @@ -90,11 +91,16 @@ namespace mln // It is stored on any representatives. unsigned own_area;

- // Corresponds to the number of pixels of all the sub-shapes and + // Corresponds to the number of faces of all the sub-shapes and // at the same level. // It is stored on any representatives. unsigned area;

+ // Corresponds to the number of 2-faces of all the sub-shapes and + // at the same level. + // It is stored on any representatives. + unsigned area_2face; + // The bounding box. // It is stored on 0-representatives ONLY. box2d bbox; @@ -194,6 +200,7 @@ namespace mln return l.tag == r.tag && l.own_area == r.own_area && l.area == r.area + && l.area_2face == r.area_2face && l.bbox == r.bbox && l.color == r.color && l.nchild == r.nchild