* Makefile.am: Split and move data related to headers distribution... * headers.mk: here. * doc/tutorial/Makefile.am: add tutorial.tex in DIST_FILES. * doc/tutorial/outputs/labeling-compute-full.txt: removed. Not needed anymore. * doc/tutorial/samples/labeling-compute.cc: new reference file. * mln/core/alias/point2d.hh: Update comments. --- milena/ChangeLog | 16 + milena/Makefile.am | 1041 +------------------- milena/doc/tutorial/Makefile.am | 5 +- .../doc/tutorial/outputs/labeling-compute-full.txt | 3 - milena/doc/tutorial/samples/labeling-compute.cc | 2 - milena/{Makefile.am => headers.mk} | 14 - milena/mln/core/alias/point2d.hh | 15 +- 7 files changed, 49 insertions(+), 1047 deletions(-) delete mode 100644 milena/doc/tutorial/outputs/labeling-compute-full.txt copy milena/{Makefile.am => headers.mk} (99%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 41bf041..4edc4c2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2008-12-08 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix build system. + + * Makefile.am: Split and move data related to headers distribution... + * headers.mk: here. + + * doc/tutorial/Makefile.am: add tutorial.tex in DIST_FILES. + + * doc/tutorial/outputs/labeling-compute-full.txt: removed. Not needed + anymore. + + * doc/tutorial/samples/labeling-compute.cc: new reference file. + + * mln/core/alias/point2d.hh: Update comments. + 2008-12-08 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Make tests relative to mln::set pass. diff --git a/milena/Makefile.am b/milena/Makefile.am index 77a2633..767b64d 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -12,1021 +12,26 @@ SUBDIRS = \ doc: $(MAKE) -C doc doc -nobase_include_HEADERS = \ -mln/histo/all.hh \ -mln/histo/data.hh \ -mln/histo/compute.hh \ -mln/histo/compute.spe.hh \ -mln/histo/essential.hh \ -mln/geom/pmin_pmax.hh \ -mln/geom/max_row.hh \ -mln/geom/chamfer.hh \ -mln/geom/min_row.hh \ -mln/geom/seeds2tiling.hh \ -mln/geom/size1d.hh \ -mln/geom/all.hh \ -mln/geom/size2d.hh \ -mln/geom/max_ind.hh \ -mln/geom/max_col.hh \ -mln/geom/size3d.hh \ -mln/geom/ninds.hh \ -mln/geom/nslis.hh \ -mln/geom/delta.hh \ -mln/geom/resize.hh \ -mln/geom/nsites.hh \ -mln/geom/min_col.hh \ -mln/geom/complex_geometry.hh \ -mln/geom/ncols.hh \ -mln/geom/nrows.hh \ -mln/geom/min_ind.hh \ -mln/geom/bbox.hh \ -mln/geom/seeds2tiling_roundness.hh \ -mln/geom/min_sli.hh \ -mln/geom/essential.hh \ -mln/geom/max_sli.hh \ -mln/draw/box.hh \ -mln/draw/all.hh \ -mln/draw/plot.hh \ -mln/draw/line.hh \ -mln/draw/essential.hh \ -mln/pw/image.hh \ -mln/pw/all.hh \ -mln/pw/value.hh \ -mln/pw/cst.hh \ -mln/pw/var.hh \ -mln/pw/essential.hh \ -mln/literal/zero.hh \ -mln/literal/ops.hh \ -mln/literal/origin.hh \ -mln/literal/grays.hh \ -mln/literal/all.hh \ -mln/literal/colors.hh \ -mln/literal/black.hh \ -mln/literal/one.hh \ -mln/literal/white.hh \ -mln/literal/essential.hh \ -mln/registration/get_rtransf.hh \ -mln/registration/internal/rms.hh \ -mln/registration/get_rot.hh \ -mln/registration/all.hh \ -mln/registration/multiscale.hh \ -mln/registration/registration.hh \ -mln/registration/essential.hh \ -mln/registration/icp.hh \ -mln/util/graph.hh \ -mln/util/max.hh \ -mln/util/lazy_set.hh \ -mln/util/set.hh \ -mln/util/tree_to_image.hh \ -mln/util/lemmings.hh \ -mln/util/greater_point.hh \ -mln/util/internal/graph_iter_base.hh \ -mln/util/internal/boost_graph_access.hh \ -mln/util/internal/boost_graph_structure.hh \ -mln/util/internal/graph_iter.hh \ -mln/util/internal/graph_nbh_iter.hh \ -mln/util/internal/vertex_impl.hh \ -mln/util/internal/edge_impl.hh \ -mln/util/internal/graph_base.hh \ -mln/util/internal/boost_graph.hh \ -mln/util/internal/graph_nbh_iter_base.hh \ -mln/util/internal/boost_graph_property.hh \ -mln/util/ord_pair.hh \ -mln/util/edge.hh \ -mln/util/all.hh \ -mln/util/dindex.hh \ -mln/util/tracked_ptr.hh \ -mln/util/ignore.hh \ -mln/util/greater_psite.hh \ -mln/util/timer.hh \ -mln/util/yes.hh \ -mln/util/line_graph.hh \ -mln/util/ord.hh \ -mln/util/tree_fast_to_image.hh \ -mln/util/tree.hh \ -mln/util/index.hh \ -mln/util/multi_site.hh \ -mln/util/branch_iter.hh \ -mln/util/branch_iter_ind.hh \ -mln/util/tree_to_fast.hh \ -mln/util/array.hh \ -mln/util/vertex.hh \ -mln/util/pix.hh \ -mln/util/tree_fast.hh \ -mln/util/site_pair.hh \ -mln/util/nil.hh \ -mln/util/eat.hh \ -mln/util/essential.hh \ -mln/tag/init.hh \ -mln/tag/skeleton.hh \ -mln/tag/all.hh \ -mln/tag/essential.hh \ -mln/trace/entering.hh \ -mln/trace/all.hh \ -mln/trace/warning.hh \ -mln/trace/exiting.hh \ -mln/trace/resume.hh \ -mln/trace/quiet.hh \ -mln/trace/stop.hh \ -mln/trace/essential.hh \ -mln/make/graph.hh \ -mln/make/double_neighb2d.hh \ -mln/make/dpoint2d_h.hh \ -mln/make/w_window.hh \ -mln/make/image.hh \ -mln/make/vec.hh \ -mln/make/all.hh \ -mln/make/dual_neighb.hh \ -mln/make/w_window3d.hh \ -mln/make/mat.hh \ -mln/make/win_chamfer.hh \ -mln/make/w_window2d_int.hh \ -mln/make/box1d.hh \ -mln/make/voronoi.hh \ -mln/make/box2d.hh \ -mln/make/w_window2d.hh \ -mln/make/box3d.hh \ -mln/make/relabelfun.hh \ -mln/make/pixel.hh \ -mln/make/pix.hh \ -mln/make/box2d_h.hh \ -mln/make/w_window1d.hh \ -mln/make/image2d.hh \ -mln/make/w_window_directional.hh \ -mln/make/w_window3d_int.hh \ -mln/make/essential.hh \ -mln/make/w_window1d_int.hh \ -mln/make/point2d_h.hh \ -mln/display/all.hh \ -mln/display/essential.hh \ -mln/extension/adjust.hh \ -mln/extension/duplicate.hh \ -mln/extension/adjust_duplicate.hh \ -mln/extension/all.hh \ -mln/extension/adjust_fill.hh \ -mln/extension/fill.hh \ -mln/extension/essential.hh \ -mln/fun/p2b/chess.hh \ -mln/fun/p2b/all.hh \ -mln/fun/p2b/has.hh \ -mln/fun/p2b/big_chess.hh \ -mln/fun/p2b/essential.hh \ -mln/fun/p2p/mirror.hh \ -mln/fun/x2p/closest_point.hh \ -mln/fun/x2p/all.hh \ -mln/fun/x2p/essential.hh \ -mln/fun/ops.hh \ -mln/fun/c.hh \ -mln/fun/vv2v/max.hh \ -mln/fun/vv2v/lor.hh \ -mln/fun/vv2v/land_not.hh \ -mln/fun/vv2v/vec.hh \ -mln/fun/vv2v/all.hh \ -mln/fun/vv2v/macros.hh \ -mln/fun/vv2v/lxor.hh \ -mln/fun/vv2v/diff_abs.hh \ -mln/fun/vv2v/land.hh \ -mln/fun/vv2v/min.hh \ -mln/fun/vv2v/essential.hh \ -mln/fun/internal/array_base.hh \ -mln/fun/internal/x2x_linear_impl.hh \ -mln/fun/internal/selector.hh \ -mln/fun/p2v/ternary.hh \ -mln/fun/p2v/iota.hh \ -mln/fun/p2v/elifs.hh \ -mln/fun/p2v/all.hh \ -mln/fun/p2v/essential.hh \ -mln/fun/all.hh \ -mln/fun/v2b/lnot.hh \ -mln/fun/v2b/all.hh \ -mln/fun/v2b/threshold.hh \ -mln/fun/v2b/essential.hh \ -mln/fun/v2v/norm.hh \ -mln/fun/v2v/linear.hh \ -mln/fun/v2v/id.hh \ -mln/fun/v2v/saturate.hh \ -mln/fun/v2v/inc.hh \ -mln/fun/v2v/all.hh \ -mln/fun/v2v/dec.hh \ -mln/fun/v2v/abs.hh \ -mln/fun/v2v/cast.hh \ -mln/fun/v2v/rgb_to_hsi.hh \ -mln/fun/v2v/enc.hh \ -mln/fun/v2v/convert.hh \ -mln/fun/v2v/essential.hh \ -mln/fun/cast.hh \ -mln/fun/i2v/all.hh \ -mln/fun/i2v/array.hh \ -mln/fun/i2v/all_to.hh \ -mln/fun/i2v/essential.hh \ -mln/fun/l2l/relabel.hh \ -mln/fun/l2l/all.hh \ -mln/fun/l2l/essential.hh \ -mln/fun/x2x/composed.hh \ -mln/fun/x2x/all.hh \ -mln/fun/x2x/translation.hh \ -mln/fun/x2x/rotation.hh \ -mln/fun/x2x/essential.hh \ -mln/fun/x2v/linear.hh \ -mln/fun/x2v/bilinear.hh \ -mln/fun/x2v/all.hh \ -mln/fun/x2v/l1_norm.hh \ -mln/fun/x2v/nneighbor.hh \ -mln/fun/x2v/essential.hh \ -mln/fun/essential.hh \ -mln/all.hh \ -mln/convert/to_p_set.hh \ -mln/convert/to.hh \ -mln/convert/to_upper_window.hh \ -mln/convert/to_image.hh \ -mln/convert/to_fun.hh \ -mln/convert/all.hh \ -mln/convert/to_window.hh \ -mln/convert/from_to.hh \ -mln/convert/to_std_set.hh \ -mln/convert/impl/from_value_to_value.hh \ -mln/convert/impl/all.hh \ -mln/convert/impl/from_image_to_site_set.hh \ -mln/convert/to_dpoint.hh \ -mln/convert/to_p_array.hh \ -mln/convert/from_to.hxx \ -mln/convert/to_rgb.hh \ -mln/convert/essential.hh \ -mln/value/label.hh.bak \ -mln/value/float01_f.hh \ -mln/value/float01_16.hh \ -mln/value/lut_vec.hh \ -mln/value/glf.hh \ -mln/value/other.hh \ -mln/value/graylevel_f.hh \ -mln/value/aliases.hh \ -mln/value/label_16.hh \ -mln/value/ops.hh \ -mln/value/set.hh \ -mln/value/int_u_sat.hh \ -mln/value/float01_8.hh \ -mln/value/int_u8.hh \ -mln/value/equiv.hh \ -mln/value/internal/integer.hh \ -mln/value/internal/gray_f.hh \ -mln/value/internal/all.hh \ -mln/value/internal/value_like.hh \ -mln/value/internal/iterable_set.hh \ -mln/value/internal/encoding.hh \ -mln/value/internal/convert.hh \ -mln/value/internal/gray_.hh \ -mln/value/internal/essential.hh \ -mln/value/proxy.hh \ -mln/value/viter.hh \ -mln/value/graylevel.hh \ -mln/value/all.hh \ -mln/value/super_value.hh \ -mln/value/builtin/symbolics.hh \ -mln/value/builtin/ops.hh \ -mln/value/builtin/all.hh \ -mln/value/builtin/promotions.hh \ -mln/value/builtin/integers.hh \ -mln/value/builtin/floatings.hh \ -mln/value/builtin/essential.hh \ -mln/value/sign.hh \ -mln/value/hsi.hh \ -mln/value/interval.hh \ -mln/value/gl16.hh \ -mln/value/scalar.hh \ -mln/value/float01.hh \ -mln/value/cast.hh \ -mln/value/int_u.hh \ -mln/value/int_s8.hh \ -mln/value/int_s16.hh \ -mln/value/int_u16.hh \ -mln/value/label.hh \ -mln/value/rgb.hh \ -mln/value/stack.hh \ -mln/value/concept/integer.hh \ -mln/value/concept/structured.hh \ -mln/value/concept/built_in.hh \ -mln/value/concept/all.hh \ -mln/value/concept/scalar.hh \ -mln/value/concept/data.hh \ -mln/value/concept/floating.hh \ -mln/value/concept/symbolic.hh \ -mln/value/concept/vectorial.hh \ -mln/value/concept/essential.hh \ -mln/value/int_s.hh \ -mln/value/rgb8.hh \ -mln/value/int_s32.hh \ -mln/value/float01_.hh \ -mln/value/rgb16.hh \ -mln/value/int_u32.hh \ -mln/value/gl8.hh \ -mln/value/label_8.hh \ -mln/value/essential.hh \ -mln/accu/tuple.hh \ -mln/accu/min_h.hh \ -mln/accu/max.hh \ -mln/accu/lor.hh \ -mln/accu/rank.hh \ -mln/accu/transform_stop.hh \ -mln/accu/maj_h.hh \ -mln/accu/min_max.hh \ -mln/accu/internal/base.hh \ -mln/accu/transform_snake.hh \ -mln/accu/rank_high_quant.hh \ -mln/accu/count.hh \ -mln/accu/median_h.hh \ -mln/accu/all.hh \ -mln/accu/land_basic.hh \ -mln/accu/p.hh \ -mln/accu/transform.hh \ -mln/accu/median_alt.hh \ -mln/accu/volume.hh \ -mln/accu/sum.hh \ -mln/accu/height.hh \ -mln/accu/land.hh \ -mln/accu/take.hh \ -mln/accu/histo.hh \ -mln/accu/pair.hh \ -mln/accu/count_adjacent_vertices.hh \ -mln/accu/convolve.hh \ -mln/accu/v.hh \ -mln/accu/rank_bool.hh \ -mln/accu/min.hh \ -mln/accu/transform_directional.hh \ -mln/accu/compute.hh \ -mln/accu/mean.hh \ -mln/accu/lor_basic.hh \ -mln/accu/transform_diagonal.hh \ -mln/accu/nil.hh \ -mln/accu/bbox.hh \ -mln/accu/center.hh \ -mln/accu/line.hh \ -mln/accu/essential.hh \ -mln/accu/max_h.hh \ -mln/level/compare.hh \ -mln/level/memset_.hh \ -mln/level/transform_inplace.hh \ -mln/level/paste.spe.hh \ -mln/level/assign.spe.hh \ -mln/level/replace.hh \ -mln/level/memcpy_.hh \ -mln/level/apply.hh \ -mln/level/approx/all.hh \ -mln/level/approx/essential.hh \ -mln/level/approx/median.hh \ -mln/level/saturate.hh \ -mln/level/all.hh \ -mln/level/paste.hh \ -mln/level/fast_median.hh \ -mln/level/abs.hh \ -mln/level/fill_with_image.hh \ -mln/level/transform.hh \ -mln/level/fill_with_image.spe.hh \ -mln/level/fill_with_value.hh \ -mln/level/stretch.hh \ -mln/level/was.median.hh \ -mln/level/transform.spe.hh \ -mln/level/compute.hh \ -mln/level/fill_with_value.spe.hh \ -mln/level/convert.hh \ -mln/level/to_enc.hh \ -mln/level/apply.spe.hh \ -mln/level/naive/all.hh \ -mln/level/naive/essential.hh \ -mln/level/naive/median.hh \ -mln/level/sort_psites.hh \ -mln/level/update.hh \ -mln/level/fill.hh \ -mln/level/essential.hh \ -mln/level/assign.hh \ -mln/level/median.hh \ -mln/math/jacobi.hh \ -mln/math/max.hh \ -mln/math/sqr.hh \ -mln/math/all.hh \ -mln/math/sign.hh \ -mln/math/abs.hh \ -mln/math/diff_abs.hh \ -mln/math/round.hh \ -mln/math/min.hh \ -mln/math/sqrt.hh \ -mln/math/essential.hh \ -mln/math/round_sat.hh \ -mln/binarization/includes.hh \ -mln/binarization/all.hh \ -mln/binarization/binarization.hh \ -mln/binarization/threshold.hh \ -mln/binarization/essential.hh \ -mln/trait/site_set/props.hh \ -mln/trait/site_set/print.hh \ -mln/trait/promote.hh \ -mln/trait/solve_binary.hh \ -mln/trait/value_.hh \ -mln/trait/all.hh \ -mln/trait/value/all.hh \ -mln/trait/value/nature.hh \ -mln/trait/value/quant.hh \ -mln/trait/value/kind.hh \ -mln/trait/value/print.hh \ -mln/trait/value/essential.hh \ -mln/trait/images.hh \ -mln/trait/window/props.hh \ -mln/trait/window/print.hh \ -mln/trait/ch_value.hh \ -mln/trait/solve.hh \ -mln/trait/solve_unary.hh \ -mln/trait/op/postdec.hh \ -mln/trait/op/mod.hh \ -mln/trait/op/lor.hh \ -mln/trait/op/neq.hh \ -mln/trait/op/plus.hh \ -mln/trait/op/xor.hh \ -mln/trait/op/all.hh \ -mln/trait/op/geq.hh \ -mln/trait/op/uminus.hh \ -mln/trait/op/not.hh \ -mln/trait/op/times.hh \ -mln/trait/op/less.hh \ -mln/trait/op/decl.hh \ -mln/trait/op/ord.hh \ -mln/trait/op/and.hh \ -mln/trait/op/or.hh \ -mln/trait/op/predec.hh \ -mln/trait/op/minus.hh \ -mln/trait/op/div.hh \ -mln/trait/op/leq.hh \ -mln/trait/op/preinc.hh \ -mln/trait/op/greater.hh \ -mln/trait/op/postinc.hh \ -mln/trait/op/uplus.hh \ -mln/trait/op/essential.hh \ -mln/trait/op/eq.hh \ -mln/trait/concrete.hh \ -mln/trait/windows.hh \ -mln/trait/site_sets.hh \ -mln/trait/image_from_grid.hh \ -mln/trait/undef.hh \ -mln/trait/image/props.hh \ -mln/trait/image/print.hh \ -mln/trait/neighborhood.hh \ -mln/trait/essential.hh \ -mln/canvas/labeling.hh \ -mln/canvas/browsing/hyper_directional.hh \ -mln/canvas/browsing/snake_generic.hh \ -mln/canvas/browsing/backdiagonal2d.hh \ -mln/canvas/browsing/snake_vert.hh \ -mln/canvas/browsing/snake_fwd.hh \ -mln/canvas/browsing/all.hh \ -mln/canvas/browsing/diagonal2d.hh \ -mln/canvas/browsing/fwd.hh \ -mln/canvas/browsing/dir_struct_elt_incr_update.hh \ -mln/canvas/browsing/directional.hh \ -mln/canvas/browsing/essential.hh \ -mln/canvas/chamfer.hh \ -mln/canvas/distance_geodesic.hh \ -mln/canvas/all.hh \ -mln/canvas/distance_front.hh \ -mln/canvas/morpho/all.hh \ -mln/canvas/morpho/algebraic_union_find.hh \ -mln/canvas/morpho/essential.hh \ -mln/canvas/essential.hh \ -mln/metal/is_const.hh \ -mln/metal/none.hh \ -mln/metal/equal.hh \ -mln/metal/unptr.hh \ -mln/metal/not_equal.hh \ -mln/metal/is_ref.hh \ -mln/metal/ret.hh \ -mln/metal/unqualif.hh \ -mln/metal/is_not.hh \ -mln/metal/vec.hh \ -mln/metal/is.hh \ -mln/metal/bool.hh \ -mln/metal/all.hh \ -mln/metal/math/pow.hh \ -mln/metal/math/max.hh \ -mln/metal/math/all.hh \ -mln/metal/math/root.hh \ -mln/metal/math/sqrt.hh \ -mln/metal/mat.hh \ -mln/metal/is_not_const.hh \ -mln/metal/fix_return.hh \ -mln/metal/ands.hh \ -mln/metal/const.hh \ -mln/metal/is_unqualif.hh \ -mln/metal/unconst.hh \ -mln/metal/bexpr.hh \ -mln/metal/array2d.hh \ -mln/metal/is_not_a.hh \ -mln/metal/is_a.hh \ -mln/metal/array1d.hh \ -mln/metal/if.hh \ -mln/metal/unref.hh \ -mln/metal/array.hh \ -mln/metal/ref.hh \ -mln/metal/same_point.hh \ -mln/metal/int.hh \ -mln/metal/abort.hh \ -mln/metal/same_coord.hh \ -mln/metal/templated_by.hh \ -mln/metal/has_neighborhood.hh \ -mln/metal/goes_to.hh \ -mln/metal/is_not_ref.hh \ -mln/metal/converts_to.hh \ -mln/metal/essential.hh \ -mln/metal/array3d.hh \ -mln/algebra/vec.hh \ -mln/algebra/all.hh \ -mln/algebra/h_vec.hh \ -mln/algebra/mat.hh \ -mln/algebra/h_mat.hh \ -mln/algebra/quat.hh \ -mln/algebra/essential.hh \ -mln/linear/convolve_2x1d.hh \ -mln/linear/all.hh \ -mln/linear/ch_convolve.hh \ -mln/linear/gaussian.hh \ -mln/linear/convolve.hh \ -mln/linear/sobel_2d.hh \ -mln/linear/local/convolve.hh \ -mln/linear/lap.hh \ -mln/linear/convolve_directional.hh \ -mln/linear/log.hh \ -mln/linear/essential.hh \ -mln/morpho/thinning.hh \ -mln/morpho/meyer_wst.hh \ -mln/morpho/opening.hh \ -mln/morpho/includes.hh \ -mln/morpho/elementary/opening.hh \ -mln/morpho/elementary/gradient_internal.hh \ -mln/morpho/elementary/dilation.hh \ -mln/morpho/elementary/laplacian.hh \ -mln/morpho/elementary/all.hh \ -mln/morpho/elementary/gradient_external.hh \ -mln/morpho/elementary/like_ero_fun.hh \ -mln/morpho/elementary/gradient.hh \ -mln/morpho/elementary/like_ero_set.hh \ -mln/morpho/elementary/closing.hh \ -mln/morpho/elementary/top_hat.hh \ -mln/morpho/elementary/erosion.hh \ -mln/morpho/elementary/essential.hh \ -mln/morpho/thin_fit.hh \ -mln/morpho/skeleton_constrained.hh \ -mln/morpho/complementation.hh \ -mln/morpho/line_gradient.hh \ -mln/morpho/hit_or_miss.hh \ -mln/morpho/closing_height.hh \ -mln/morpho/plus.hh \ -mln/morpho/general.hh \ -mln/morpho/internal/elementary.hh \ -mln/morpho/contrast.hh \ -mln/morpho/opening_area.hh \ -mln/morpho/opening_height.hh \ -mln/morpho/thickening.hh \ -mln/morpho/dilation.hh \ -mln/morpho/laplacian.hh \ -mln/morpho/all.hh \ -mln/morpho/opening_attribute.hh \ -mln/morpho/opening_volume.hh \ -mln/morpho/closing_area_on_vertices.hh \ -mln/morpho/closing_volume.hh \ -mln/morpho/minus.hh \ -mln/morpho/gradient.hh \ -mln/morpho/tree/max.hh \ -mln/morpho/tree/compute_parent.hh \ -mln/morpho/tree/all.hh \ -mln/morpho/tree/utils.hh \ -mln/morpho/tree/data.hh \ -mln/morpho/tree/compute_attribute_image.hh \ -mln/morpho/opening_area_on_vertices.hh \ -mln/morpho/general.spe.hh \ -mln/morpho/min.hh \ -mln/morpho/closing.hh \ -mln/morpho/top_hat.hh \ -mln/morpho/erosion.hh \ -mln/morpho/Rd.hh \ -mln/morpho/closing_area.hh \ -mln/morpho/thick_miss.hh \ -mln/morpho/closing_attribute.hh \ -mln/morpho/rank_filter.hh \ -mln/morpho/essential.hh \ -mln/topo/n_face_iter.hh \ -mln/topo/face_iter.hh \ -mln/topo/is_simple_2d.hh \ -mln/topo/centered_iter_adapter.hh \ -mln/topo/internal/complex_set_iterator_base.hh \ -mln/topo/internal/complex_iterator_base.hh \ -mln/topo/internal/complex_relative_iterator_base.hh \ -mln/topo/internal/complex_relative_iterator_sequence.hh \ -mln/topo/algebraic_n_face.hh \ -mln/topo/attic/faces_iter.hh \ -mln/topo/adj_lower_dim_connected_n_face_iter.hh \ -mln/topo/n_face.hh \ -mln/topo/adj_lower_higher_face_iter.hh \ -mln/topo/all.hh \ -mln/topo/face_data.hh \ -mln/topo/static_n_face_iter.hh \ -mln/topo/face.hh \ -mln/topo/adj_m_face_iter.hh \ -mln/topo/complex.hh \ -mln/topo/adj_higher_face_iter.hh \ -mln/topo/adj_lower_face_iter.hh \ -mln/topo/complex_iterators.hh \ -mln/topo/center_only_iter.hh \ -mln/topo/adj_higher_dim_connected_n_face_iter.hh \ -mln/topo/algebraic_face.hh \ -mln/topo/n_faces_set.hh \ -mln/topo/essential.hh \ -mln/essential/1d.hh \ -mln/essential/routine.hh \ -mln/essential/3d.hh \ -mln/essential/2d.hh \ -mln/win/inter.hh \ -mln/win/backdiag2d.hh \ -mln/win/segment1d.hh \ -mln/win/cuboid3d.hh \ -mln/win/vline2d.hh \ -mln/win/octagon2d.hh \ -mln/win/all.hh \ -mln/win/multiple_size.hh \ -mln/win/cube3d.hh \ -mln/win/shift.hh \ -mln/win/sym.hh \ -mln/win/diff.hh \ -mln/win/multiple.hh \ -mln/win/diag2d.hh \ -mln/win/disk2d.hh \ -mln/win/rectangle2d.hh \ -mln/win/hline2d.hh \ -mln/win/line.hh \ -mln/win/essential.hh \ -mln/core/clock_neighb.hh \ -mln/core/pixter2d.hh \ -mln/core/def/low_quant_nbits.hh \ -mln/core/def/all.hh \ -mln/core/def/coordf.hh \ -mln/core/def/coord.hh \ -mln/core/def/essential.hh \ -mln/core/site_set/box.hh \ -mln/core/site_set/p_vertices.hh \ -mln/core/site_set/p_vaccess.hh \ -mln/core/site_set/p_if_piter.hh \ -mln/core/site_set/p_run_piter.hh \ -mln/core/site_set/p_key.hh \ -mln/core/site_set/p_double.hh \ -mln/core/site_set/p_complex_piter.hh \ -mln/core/site_set/p_complex.hh \ -mln/core/site_set/p_image.hh \ -mln/core/site_set/attic/p_complex_faces_piter.hh \ -mln/core/site_set/attic/p_faces_piter.hh \ -mln/core/site_set/p_priority.hh \ -mln/core/site_set/p_set_of.hh \ -mln/core/site_set/all.hh \ -mln/core/site_set/p_edges.hh \ -mln/core/site_set/box_piter.hh \ -mln/core/site_set/p_faces.hh \ -mln/core/site_set/p_set.hh \ -mln/core/site_set/p_queue.hh \ -mln/core/site_set/p_if.hh \ -mln/core/site_set/p_mutable_array_of.hh \ -mln/core/site_set/p_edges_psite.hh \ -mln/core/site_set/complex_psite.hh \ -mln/core/site_set/p_run.hh \ -mln/core/site_set/p_n_faces_piter.hh \ -mln/core/site_set/p_centered.hh \ -mln/core/site_set/p_bgraph.hh \ -mln/core/site_set/p_bgraph_piter.hh \ -mln/core/site_set/p_array.hh \ -mln/core/site_set/p_vertices_psite.hh \ -mln/core/site_set/status.txt \ -mln/core/site_set/p_line2d.hh \ -mln/core/site_set/p_queue_fast.hh \ -mln/core/site_set/p_graph_piter.hh \ -mln/core/site_set/essential.hh \ -mln/core/dpsites_piter.hh \ -mln/core/w_window.hh \ -mln/core/grids.hh \ -mln/core/dpoints_pixter.hh \ -mln/core/internal/graph_psite_base.hh \ -mln/core/internal/run_image.hh \ -mln/core/internal/pixel_impl.hh \ -mln/core/internal/site_set_base.hh \ -mln/core/internal/image_value_morpher.hh \ -mln/core/internal/site_iterator_base.hh \ -mln/core/internal/complex_neighborhood_base.hh \ -mln/core/internal/site_relative_iterator_base.hh \ -mln/core/internal/site_set_impl.hh \ -mln/core/internal/exact.hh \ -mln/core/internal/p_complex_piter_base.hh \ -mln/core/internal/neighb_niter_impl.hh \ -mln/core/internal/pixel_iterator_base.hh \ -mln/core/internal/classical_window_base.hh \ -mln/core/internal/data.hh \ -mln/core/internal/force_exact.hh \ -mln/core/internal/image_base.hh \ -mln/core/internal/check/image_fastest.hh \ -mln/core/internal/check/image_all.hh \ -mln/core/internal/fixme.hh \ -mln/core/internal/morpher_lvalue.hh \ -mln/core/internal/image_domain_morpher.hh \ -mln/core/internal/image_primary.hh \ -mln/core/internal/set_of.hh \ -mln/core/internal/complex_window_p_base.hh \ -mln/core/internal/graph_window_base.hh \ -mln/core/internal/piter_adaptor.hh \ -mln/core/internal/weighted_window_base.hh \ -mln/core/internal/neighborhood_base.hh \ -mln/core/internal/image_morpher.hh \ -mln/core/internal/coord_impl.hh \ -mln/core/internal/geom_bbox.hh \ -mln/core/internal/image_identity.hh \ -mln/core/internal/pseudo_site_base.hh \ -mln/core/internal/window_base.hh \ -mln/core/internal/box_impl.hh \ -mln/core/internal/site_set_iterator_base.hh \ -mln/core/contract.hh \ -mln/core/all.hh \ -mln/core/point.hh \ -mln/core/neighb.hh \ -mln/core/routine/initialize.hh \ -mln/core/routine/primary.hh \ -mln/core/routine/init.hh \ -mln/core/routine/ops.hh \ -mln/core/routine/all.hh \ -mln/core/routine/clone.hh \ -mln/core/routine/exact.hh \ -mln/core/routine/extend.hh \ -mln/core/routine/essential.hh \ -mln/core/trait/op_mult.hh \ -mln/core/trait/all.hh \ -mln/core/trait/pixter.hh \ -mln/core/trait/qlf_value.hh \ -mln/core/trait/essential.hh \ -mln/core/pixter1d.hh \ -mln/core/category.hh \ -mln/core/macros.hh \ -mln/core/box_runstart_piter.hh \ -mln/core/tags.hh \ -mln/core/dpoint.hh \ -mln/core/alias/dpoint2d_h.hh \ -mln/core/alias/p_run2d.hh \ -mln/core/alias/point3d.hh \ -mln/core/alias/neighb3d.hh \ -mln/core/alias/window3d.hh \ -mln/core/alias/neighb2d.hh \ -mln/core/alias/complex_image.hh \ -mln/core/alias/w_window1d_float.hh \ -mln/core/alias/neighb1d.hh \ -mln/core/alias/w_window2d_float.hh \ -mln/core/alias/w_window2d_int.hh \ -mln/core/alias/box1d.hh \ -mln/core/alias/box2d.hh \ -mln/core/alias/window1d.hh \ -mln/core/alias/point1d.hh \ -mln/core/alias/box3d.hh \ -mln/core/alias/dpoint3d.hh \ -mln/core/alias/complex_geometry.hh \ -mln/core/alias/w_window3d_float.hh \ -mln/core/alias/box2d_h.hh \ -mln/core/alias/point2d.hh \ -mln/core/alias/window2d.hh \ -mln/core/alias/p_runs2d.hh \ -mln/core/alias/point3df.hh \ -mln/core/alias/dpoint1d.hh \ -mln/core/alias/w_window3d_int.hh \ -mln/core/alias/dpoint2d.hh \ -mln/core/alias/w_window1d_int.hh \ -mln/core/alias/point2d_h.hh \ -mln/core/window.hh \ -mln/core/concept/site_proxy.hh \ -mln/core/concept/point_site.hh \ -mln/core/concept/box.hh \ -mln/core/concept/generalized_pixel.hh \ -mln/core/concept/graph.hh \ -mln/core/concept/iterator.hh \ -mln/core/concept/doc/point_site.hh \ -mln/core/concept/doc/box.hh \ -mln/core/concept/doc/generalized_pixel.hh \ -mln/core/concept/doc/iterator.hh \ -mln/core/concept/doc/image_fastest.hh \ -mln/core/concept/doc/image.hh \ -mln/core/concept/doc/value_set.hh \ -mln/core/concept/doc/weighted_window.hh \ -mln/core/concept/doc/pixel_iterator.hh \ -mln/core/concept/doc/value_iterator.hh \ -mln/core/concept/doc/dpoint.hh \ -mln/core/concept/doc/window.hh \ -mln/core/concept/doc/accumulator.hh \ -mln/core/concept/doc/site_set.hh \ -mln/core/concept/doc/object.hh \ -mln/core/concept/doc/neighborhood.hh \ -mln/core/concept/doc/point_iterator.hh \ -mln/core/concept/pseudo_site.hh \ -mln/core/concept/image.hh \ -mln/core/concept/value_set.hh \ -mln/core/concept/proxy.hh \ -mln/core/concept/site.hh \ -mln/core/concept/weighted_window.hh \ -mln/core/concept/gpoint.hh \ -mln/core/concept/site_iterator.hh \ -mln/core/concept/point.hh \ -mln/core/concept/literal.hh \ -mln/core/concept/pixel_iterator.hh \ -mln/core/concept/README \ -mln/core/concept/value_iterator.hh \ -mln/core/concept/meta_accumulator.hh \ -mln/core/concept/gdpoint.hh \ -mln/core/concept/regular_grid.hh \ -mln/core/concept/mesh.hh \ -mln/core/concept/dpoint.hh \ -mln/core/concept/function.hh \ -mln/core/concept/window.hh \ -mln/core/concept/value.hh \ -mln/core/concept/accumulator.hh \ -mln/core/concept/site_set.hh \ -mln/core/concept/proxy.hxx \ -mln/core/concept/object.hh \ -mln/core/concept/delta_point_site.hh \ -mln/core/concept/status.txt \ -mln/core/concept/neighborhood.hh \ -mln/core/concept/browsing.hh \ -mln/core/pixel.hh \ -mln/core/clock_neighb2d.hh \ -mln/core/pixter3d.hh \ -mln/core/image/obased_rle_encode.hh \ -mln/core/image/plain.hh \ -mln/core/image/graph_image.hh \ -mln/core/image/image3d.hh \ -mln/core/image/decorated_image.hh \ -mln/core/image/extension_ima.hh \ -mln/core/image/flat_image.hh \ -mln/core/image/complex_neighborhood_piter.hh \ -mln/core/image/tr_mesh.hh \ -mln/core/image/graph_elt_window.hh \ -mln/core/image/obased_rle_image.hh \ -mln/core/image/mono_obased_rle_image.hh \ -mln/core/image/interpolated.hh \ -mln/core/image/lazy_image.hh \ -mln/core/image/t_image.hh \ -mln/core/image/hexa_piter.hh \ -mln/core/image/value_enc_image.hh \ -mln/core/image/sub_image_if.hh \ -mln/core/image/all.hh \ -mln/core/image/mono_rle_image.hh \ -mln/core/image/complex_image.hh \ -mln/core/image/cast_image.hh \ -mln/core/image/rle_encode.hh \ -mln/core/image/complex_window_piter.hh \ -mln/core/image/tr_image.hh \ -mln/core/image/sub_image.hh \ -mln/core/image/rle_image.hh \ -mln/core/image/line_graph_elt_window.hh \ -mln/core/image/mono_rle_encode.hh \ -mln/core/image/bgraph_psite.hh \ -mln/core/image/sparse_image.hh \ -mln/core/image/bgraph_image.hh \ -mln/core/image/complex_neighborhoods.hh \ -mln/core/image/graph_window_piter.hh \ -mln/core/image/sparse_encode.hh \ -mln/core/image/safe.hh \ -mln/core/image/extension_fun.hh \ -mln/core/image/image1d.hh \ -mln/core/image/extension_val.hh \ -mln/core/image/image_if.hh \ -mln/core/image/hexa.hh \ -mln/core/image/extended.hh \ -mln/core/image/image2d_h.hh \ -mln/core/image/image2d.hh \ -mln/core/image/ch_piter.hh \ -mln/core/image/complex_windows.hh \ -mln/core/image/fi_adaptor.hh \ -mln/core/image/mono_obased_rle_encode.hh \ -mln/core/image/status.txt \ -mln/core/image/line_graph_image.hh \ -mln/core/image/value_encode.hh \ -mln/core/image/essential.hh \ -mln/core/a_point_of.hh \ -mln/core/var.hh \ -mln/core/essential.hh \ -mln/core/faces_psite.hh \ -mln/labeling/blobs.hh \ -mln/labeling/background.hh \ -mln/labeling/relabel.hh \ -mln/labeling/level.spe.hh \ -mln/labeling/all.hh \ -mln/labeling/level.hh \ -mln/labeling/flat_zones.hh \ -mln/labeling/foreground.hh \ -mln/labeling/regional_maxima.hh \ -mln/labeling/compute.hh \ -mln/labeling/regional_minima.hh \ -mln/labeling/essential.hh \ -mln/test/predicate.hh \ -mln/test/all.hh \ -mln/test/positive.hh \ -mln/test/essential.hh \ -mln/transform/distance_geodesic.hh \ -mln/transform/internal/all.hh \ -mln/transform/internal/distance_functor.hh \ -mln/transform/internal/influence_zone_functor.hh \ -mln/transform/all.hh \ -mln/transform/influence_zone_front.hh \ -mln/transform/distance_front.hh \ -mln/transform/influence_zone_geodesic.hh \ -mln/transform/essential.hh \ -mln/arith/includes.hh \ -mln/arith/min.spe.hh \ -mln/arith/plus.hh \ -mln/arith/revert.spe.hh \ -mln/arith/times.spe.hh \ -mln/arith/all.hh \ -mln/arith/times.hh \ -mln/arith/diff_abs.hh \ -mln/arith/minus.hh \ -mln/arith/min.hh \ -mln/arith/revert.hh \ -mln/arith/essential.hh \ -mln/io/pgm/load.hh \ -mln/io/pgm/all.hh \ -mln/io/pgm/save.hh \ -mln/io/ppm/load.hh \ -mln/io/ppm/all.hh \ -mln/io/ppm/save.hh \ -mln/io/pfm/load.hh \ -mln/io/pfm/all.hh \ -mln/io/pfm/save.hh \ -mln/io/all.hh \ -mln/io/pbm/load.hh \ -mln/io/pbm/all.hh \ -mln/io/pbm/save.hh \ -mln/io/pnm/max_component.hh \ -mln/io/pnm/load.hh \ -mln/io/pnm/load_header.hh \ -mln/io/pnm/all.hh \ -mln/io/pnm/macros.hh \ -mln/io/pnm/save.hh \ -mln/io/pnm/save_header.hh \ -mln/io/txt/all.hh \ -mln/io/txt/save.hh \ -mln/io/abort.hh \ -mln/io/fits/load.hh \ -mln/io/fits/all.hh \ -mln/io/off/load.hh \ -mln/io/off/all.hh \ -mln/io/off/save.hh \ -mln/io/essential.hh \ -mln/logical/includes.hh \ -mln/logical/and_not.hh \ -mln/logical/xor.hh \ -mln/logical/all.hh \ -mln/logical/not.hh \ -mln/logical/not.spe.hh \ -mln/logical/and.hh \ -mln/logical/or.hh \ -mln/logical/essential.hh \ -mln/norm/all.hh \ -mln/norm/l1.hh \ -mln/norm/l2.hh \ -mln/norm/linfty.hh \ -mln/norm/essential.hh \ -mln/debug/iota.hh \ -mln/debug/all.hh \ -mln/debug/println_with_border.hh \ -mln/debug/println.spe.hh \ -mln/debug/colorize.hh \ -mln/debug/draw_graph.hh \ -mln/debug/put_word.hh \ -mln/debug/println_with_border.spe.hh \ -mln/debug/format.hh \ -mln/debug/println.hh \ -mln/debug/iota.spe.hh \ -mln/debug/essential.hh \ -mln/estim/min_max.hh \ -mln/estim/all.hh \ -mln/estim/sum.hh \ -mln/estim/mean.hh \ -mln/estim/essential.hh \ -mln/set/uni.hh \ -mln/set/inter.hh \ -mln/set/all.hh \ -mln/set/get.hh \ -mln/set/sym_diff.hh \ -mln/set/has.hh \ -mln/set/is_subset_of.hh \ -mln/set/diff.hh \ -mln/set/compute.hh \ -mln/set/essential.hh \ -mln/border/adjust.hh \ -mln/border/duplicate.hh \ -mln/border/find.hh \ -mln/border/thickness.hh \ -mln/border/all.hh \ -mln/border/mirror.hh \ -mln/border/get.hh \ -mln/border/equalize.hh \ -mln/border/resize.hh \ -mln/border/fill.hh \ -mln/border/essential.hh \ -mln/subsampling/gaussian_subsampling.hh \ -mln/subsampling/all.hh \ -mln/subsampling/subsampling.hh \ -mln/subsampling/essential.hh +include $(top_srcdir)/milena/headers.mk + +EXTRA_DIST += \ +img/lena.pbm \ +img/fly.pbm \ +img/squares-lc.pgm \ +img/lena_16.ppm \ +img/squares.pgm \ +img/fly.pgm \ +img/toto.pbm \ +img/README \ +img/quite-small.pgm \ +img/test.fits \ +img/lena.pgm \ +img/tiny.pbm \ +img/tiny.pgm \ +img/picasso.pbm \ +img/space_debris.pgm \ +img/picasso.pgm \ +img/small.pbm \ +img/lena.ppm \ +img/small.pgm + diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 118b28e..2b93111 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -36,7 +36,9 @@ clean-local: rm -f tutorial.pdf rm -f *.haux *.hh *.html *.htoc -EXTRA_DIST = \ +EXTRA_DIST = tutorial.tex + +EXTRA_DIST += \ examples/cpp_issue.cc \ examples/sub_image.cc \ examples/sub_image_if.cc \ @@ -99,7 +101,6 @@ outputs/fill-call-1.txt \ outputs/ima2d-rot.txt \ outputs/paste-call-1.txt \ outputs/fun-p2v-1.txt \ -outputs/labeling-compute-full.txt \ outputs/estim-sites.txt \ outputs/parray-append.txt \ outputs/fill-subdomain.txt \ diff --git a/milena/doc/tutorial/outputs/labeling-compute-full.txt b/milena/doc/tutorial/outputs/labeling-compute-full.txt deleted file mode 100644 index 174807d..0000000 --- a/milena/doc/tutorial/outputs/labeling-compute-full.txt +++ /dev/null @@ -1,3 +0,0 @@ -[(0, 1)..(1, 2)] -[(3, 0)..(5, 1)] -[(3, 2)..(4, 4)] diff --git a/milena/doc/tutorial/samples/labeling-compute.cc b/milena/doc/tutorial/samples/labeling-compute.cc index 9f56730..381c401 100644 --- a/milena/doc/tutorial/samples/labeling-compute.cc +++ b/milena/doc/tutorial/samples/labeling-compute.cc @@ -36,10 +36,8 @@ int main() // \} - doc::begin_output(); // \{ for (unsigned i = 1; i <= nlabels; ++i) std::cout << boxes[i] << std::endl; // \} - doc::end_output(); } diff --git a/milena/Makefile.am b/milena/headers.mk similarity index 99% copy from milena/Makefile.am copy to milena/headers.mk index 77a2633..e87c752 100644 --- a/milena/Makefile.am +++ b/milena/headers.mk @@ -1,17 +1,3 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- - -##FIXME -SUBDIRS = \ - doc \ - mesh \ - tests \ - tools -# apps - -.PHONY: doc -doc: - $(MAKE) -C doc doc - nobase_include_HEADERS = \ mln/histo/all.hh \ mln/histo/data.hh \ diff --git a/milena/mln/core/alias/point2d.hh b/milena/mln/core/alias/point2d.hh index 208ee83..8c141e1 100644 --- a/milena/mln/core/alias/point2d.hh +++ b/milena/mln/core/alias/point2d.hh @@ -29,11 +29,10 @@ #ifndef MLN_CORE_ALIAS_POINT2D_HH # define MLN_CORE_ALIAS_POINT2D_HH -/*! \file mln/core/alias/point2d.hh - * - * \brief Definition of the mln::point2d alias and of its construction - * routine. - */ +/// \file mln/core/alias/point2d.hh +/// +/// Definition of the mln::point2d alias and of its construction +/// routine. # include <mln/core/point.hh> # include <mln/core/concept/site_proxy.hh> // For site_const_impl and site_mutable_impl. @@ -43,9 +42,9 @@ namespace mln { - /*! \brief Type alias for a point defined on the 2D square grid with - * integer coordinates. - */ + /// Type alias for a point defined on the 2D square grid with + /// integer coordinates. + /// typedef point<grid::square, def::coord> point2d; -- 1.5.6.5