* src/afp/components.hh, * src/afp/link.hh, * src/afp/regroup.hh: Add missing includes and headers. --- scribo/ChangeLog | 8 +++++ scribo/src/afp/components.hh | 69 +++++++++++++++++++++++++++++++----------- scribo/src/afp/link.hh | 49 ++++++++++++++++++++++++++--- scribo/src/afp/regroup.hh | 36 ++++++++++++++++++++++ 4 files changed, 139 insertions(+), 23 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d346428..e0da752 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-08-09 Guillaume Lazzara <z@lrde.epita.fr> + Add missing includes and headers in AFP's dedicated code. + + * src/afp/components.hh, + * src/afp/link.hh, + * src/afp/regroup.hh: Add missing includes and headers. + +2010-08-09 Guillaume Lazzara <z@lrde.epita.fr> + Add new routines in Scribo. * debug/highlight_text_area.hh, diff --git a/scribo/src/afp/components.hh b/scribo/src/afp/components.hh index fd463eb..7359d16 100644 --- a/scribo/src/afp/components.hh +++ b/scribo/src/afp/components.hh @@ -1,21 +1,53 @@ -#include <mln/io/pbm/load.hh> -#include <mln/io/pgm/save.hh> - -#include <mln/extension/adjust.hh> -#include <mln/extension/fill.hh> -#include <mln/data/fill.hh> -#include <mln/accu/shape/bbox.hh> - -#include <mln/core/alias/neighb2d.hh> -#include <mln/core/image/dmorph/image_if.hh> -#include <mln/pw/value.hh> -#include <mln/debug/println.hh> - -#include <mln/util/timer.hh> -#include <mln/labeling/foreground.hh> -#include <mln/labeling/wrap.hh> -#include <mln/extension/fill.hh> -#include <mln/data/compare.hh> +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_SRC_AFP_COMPONENTS_HH +# define SCRIBO_SRC_AFP_COMPONENTS_HH + +/// \file +/// +/// Specific implementation for AFP use case. + +# include <mln/io/pbm/load.hh> +# include <mln/io/pgm/save.hh> + +# include <mln/extension/adjust.hh> +# include <mln/extension/fill.hh> +# include <mln/data/fill.hh> +# include <mln/accu/shape/bbox.hh> + +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/pw/value.hh> +# include <mln/debug/println.hh> + +# include <mln/util/timer.hh> +# include <mln/labeling/foreground.hh> +# include <mln/labeling/wrap.hh> +# include <mln/extension/fill.hh> +# include <mln/data/compare.hh> namespace mln @@ -193,3 +225,4 @@ namespace mln } // mln +#endif // ! SCRIBO_SRC_AFP_COMPONENTS_HH diff --git a/scribo/src/afp/link.hh b/scribo/src/afp/link.hh index fc23991..dfcde88 100644 --- a/scribo/src/afp/link.hh +++ b/scribo/src/afp/link.hh @@ -1,8 +1,43 @@ -#include <mln/geom/ncols.hh> -#include <mln/geom/nrows.hh> -#include <mln/util/couple.hh> -#include <scribo/core/component_set.hh> -#include <scribo/core/macros.hh> +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_SRC_AFP_LINK_HH +# define SCRIBO_SRC_AFP_LINK_HH + +/// \file +/// +/// Specific implementation for AFP use case. + +# include <mln/geom/ncols.hh> +# include <mln/geom/nrows.hh> +# include <mln/util/couple.hh> +# include <mln/math/max.hh> + +# include <scribo/core/object_links.hh> +# include <scribo/core/component_set.hh> +# include <scribo/core/macros.hh> namespace scribo { @@ -13,6 +48,8 @@ namespace scribo namespace link { + using namespace mln; + template <typename L> util::couple<object_links<L>, object_links<L> > @@ -137,3 +174,5 @@ namespace scribo } // end of namespace scribo::primitive } // end of namespace scribo + +#endif // ! SCRIBO_SRC_AFP_LINK_HH diff --git a/scribo/src/afp/regroup.hh b/scribo/src/afp/regroup.hh index 44b5438..aacde7e 100644 --- a/scribo/src/afp/regroup.hh +++ b/scribo/src/afp/regroup.hh @@ -1,6 +1,40 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_SRC_AFP_REGROUP_HH +# define SCRIBO_SRC_AFP_REGROUP_HH + +/// \file +/// +/// Specific implementation for AFP use case. + #include <mln/geom/ncols.hh> #include <mln/geom/nrows.hh> #include <mln/util/couple.hh> + +#include <scribo/core/object_groups.hh> #include <scribo/core/component_set.hh> #include <scribo/core/macros.hh> @@ -81,3 +115,5 @@ namespace scribo } // end of namespace scribo::primitive } // end of namespace scribo + +#endif // ! SCRIBO_SRC_AFP_REGROUP_HH -- 1.5.6.5