GitLab

Conflicts:
	ChangeLog
	milena/ChangeLog
	milena/doc/tutorial/tutorial.tex
	milena/tests/geom/Makefile.am
	milena/tests/io/pbms/load.cc
	milena/tests/io/pgms/load.cc
	milena/tests/io/ppms/load.cc
	scribo/ChangeLog
	scribo/core/object_image.hh
	scribo/demo/Makefile.am
	scribo/primitive/link/internal/anchors_3.hh
	scribo/scribo.mk
	scribo/src/binarization/Makefile.am
	scribo/src/binarization/sauvola_ms.cc
	scribo/src/debug/Makefile.am

	* lrde-upload.sh: Here.

	* apps/mesh-segm-skel/Makefile.am,
	* apps/papers/levillain.09.ismm/Makefile.am
	(CLEANFILES): Rename as...
	(MOSTLYCLEANFILES): ...this.

	* python/morpho-fun.py,
	* python/morpho-segm.py:
	Add the name of the test as prefix of its output file names.
	* python/Makefile.am (CLEANFILES): Adjust.
	Add morpho-segm-gradient.pgm.
	Rename as...
	(MOSTLYCLEANFILES): ...this.

	* tests/binarization/threshold.cc,
	* tests/data/approx/median.cc,
	* tests/data/median.cc,
	* tests/data/median_fast.cc,
	* tests/data/naive/median.cc,
	* tests/io/dump/dump.cc,
	* tests/io/fits/fits.cc,
	* tests/io/magick/save.cc,
	* tests/io/off/load_save_bin.cc,
	* tests/io/pbm/pbm.cc,
	* tests/io/pbm/pbm_ascii.cc,
	* tests/io/pbms/load.cc,
	* tests/io/pgm/pgm.cc,
	* tests/io/pgm/pgm16.cc,
	* tests/io/pgm/pgm19.cc,
	* tests/io/pgm/pgm27.cc,
	* tests/io/pgm/pgm_ascii.cc,
	* tests/io/pgms/load.cc,
	* tests/io/ppm/ppm.cc,
	* tests/io/ppm/ppm16.cc,
	* tests/io/ppm/ppm23.cc,
	* tests/io/ppms/load.cc,
	* tests/linear/convolve.cc,
	* tests/linear/convolve_2x1d.cc,
	* tests/linear/convolve_directional.cc,
	* tests/linear/gaussian.cc,
	* tests/linear/gaussian/filter.cc,
	* tests/linear/lap.cc,
	* tests/linear/log.cc,
	* tests/linear/sobel_2d.cc,
	* tests/morpho/approx/dilation.cc,
	* tests/morpho/approx/erosion.cc,
	* tests/morpho/artificial_line_graph_image_wst.cc,...

	* scribo.mk (SCRIBO_CXXFLAGS): New.
	(AM_CXXFLAGS): Set to $(SCRIBO_CXXFLAGS).
	* tests/tests.mk (SCRIBO_TESTS_CXXFLAGS): New.
	(AM_CXXFLAGS): Set to $(SCRIBO_TESTS_CXXFLAGS).

	* configure.ac (SCRIBO_CXXFLAGS, SCRIBO_TESTS_CXXFLAGS):
	New configure variables.

	* configure.ac: Here.

	* configure.ac: Here.

	* mln/topo/internal/complex_set_iterator_base.hh
	(complex_set_iterator_base<F, E>::complex_set_iterator_base)
	(complex_set_iterator_base<F, E>::set_cplx):
	Add const qualifier to argument.

	* tests/morpho/rank_filter.cc: Do not include mln/io/pgm/save.hh.
	* tests/morpho/skeleton_constrained.cc: Likewise.
	(mln::show_connectivity_numbers): Move this function into the
	global namespace to avoid the pollution of the `mln' namespace.
	Aesthetic changes.

	* Makefile.am,
	* demo/Makefile.am,
	* src/Makefile.am,
	* src/binarization/Makefile.am,
	* src/debug/Makefile.am,
	* src/filter/Makefile.am,
	* src/misc/Makefile.am,
	* src/multi_scale/Makefile.am,
	* src/preprocessing/Makefile.am,
	* src/primitive/Makefile.am,
	* src/primitive/extract/Makefile.am,
	* src/primitive/find/Makefile.am,
	* src/primitive/group/Makefile.am,
	* src/table/Makefile.am,
	* src/text/Makefile.am,
	* tests/Makefile.am,
	* tests/filter/Makefile.am,
	* tests/preprocessing/Makefile.am,
	* tests/table/Makefile.am,
	* tests/text/Makefile.am,
	* tests/unit_test/Makefile.am:
	Here.

	* Makefile.am, python/Makefile.am: Here.

	* Makefile.am,
	* apps/mesh-segm-skel/Makefile.am,
	* mesh/Makefile.am,
	* tests/Makefile.am,
	* tests/accu/Makefile.am,
	* tests/accu/image/Makefile.am,
	* tests/accu/math/Makefile.am,
	* tests/accu/shape/Makefile.am,
	* tests/accu/site_set/Makefile.am,
	* tests/accu/stat/Makefile.am,
	* tests/algebra/Makefile.am,
	* tests/arith/Makefile.am,
	* tests/binarization/Makefile.am,
	* tests/border/Makefile.am,
	* tests/canvas/Makefile.am,
	* tests/canvas/browsing/Makefile.am,
	* tests/canvas/morpho/Makefile.am,
	* tests/convert/Makefile.am,
	* tests/convert/impl/Makefile.am,
	* tests/core/Makefile.am,
	* tests/core/alias/Makefile.am,
	* tests/core/image/Makefile.am,
	* tests/core/image/dmorph/Makefile.am,
	* tests/core/image/imorph/Makefile.am,
	* tests/core/image/vmorph/Makefile.am,
	* tests/core/other/Makefile.am,
	* tests/core/routine/Makefile.am,
	* tests/core/site_set/Makefile.am,
	* tests/data/Makefile.am,
	* tests/data/approx/Makefile.am,
	* tests/data/naive/Makefile.am,
	* tests/debug/Makefile.am,
	* tests/display/Makefile.am,
	* tests/draw/Makefile.am,
	* tests/estim/Makefile.am,
	* tests/extension/Makefile.am,
	* tests/extract/Makefile.am,
	* tests/fun/Makefile.am,
	* tests/fun/i2v/Makefile.am,
	* tests/fun/p2b/Makefile.am,
	* tests/fun/p2p/Makefile.am,
	* tests/fun/p2v/Makefile.am,
	* tests/fun/stat/Makefile.am,
	* tests/fun/v2i/Makefile.am,
	* tests/fun/v2v/Makefile.am,
	* tests/fun/vv2v/Makefile.am,
	* tests/fun/x2x/Makefile.am,
	* tests/geom/Makefile.am,
	* tests/graph/Makefile.am,
	* tests/graph/attribute/Makefile.am,
	* tests/histo/Makefile.am,
	* tests/io/Makefile.am,
	* tests/io/dicom/Makefile.am,
	* tests/io/dump/Makefile.am,
	* tests/io/fits/Makefile.am,
	* tests/io/fld/Makefile.am,
	* tests/io/magick/Makefile.am,
	* tests/io/off/Makefile.am,
	* tests/io/pbm/Makefile.am,
	* tests/io/pbms/Makefile.am,
	* tests/io/pfm/Makefile.am,
	* tests/io/pgm/Makefile.am,
	* tests/io/pgms/Makefile.am,
	* tests/io/pnm/Makefile.am,
	* tests/io/ppm/Makefile.am,
	* tests/io/ppms/Makefile.am,
	* tests/io/tiff/Makefile.am,
	* tests/labeling/Makefile.am,
	* tests/linear/Makefile.am,
	* tests/linear/gaussian/Makefile.am,
	* tests/linear/local/Makefile.am,
	* tests/literal/Makefile.am,
	* tests/logical/Makefile.am,
	* tests/make/Makefile.am,
	* tests/math/Makefile.am,
	* tests/metal/Makefile.am,
	* tests/metal/make/Makefile.am,
	* tests/metal/math/Makefile.am,
	* tests/morpho/Makefile.am,
	* tests/morpho/approx/Makefile.am,
	* tests/morpho/attribute/Makefile.am,
	* tests/morpho/closing/Makefile.am,
	* tests/morpho/closing/approx/Makefile.am,
	* tests/morpho/elementary/Makefile.am,
	* tests/morpho/opening/Makefile.am,
	* tests/morpho/opening/approx/Makefile.am,
	* tests/morpho/reconstruction/Makefile.am,
	* tests/morpho/reconstruction/by_dilation/Makefile.am,
	* tests/morpho/reconstruction/by_erosion/Makefile.am,
	* tests/morpho/tree/Makefile.am,
	* tests/morpho/tree/filter/Makefile.am,
	* tests/morpho/watershed/Makefile.am,
	* tests/norm/Makefile.am,
	* tests/opt/Makefile.am,
	* tests/pw/Makefile.am,
	* tests/registration/Makefile.am,
	* tests/set/Makefile.am,
	* tests/subsampling/Makefile.am,
	* tests/tag/Makefile.am,
	* tests/test/Makefile.am,
	* tests/topo/Makefile.am,
	* tests/topo/skeleton/Makefile.am,
	* tests/trace/Makefile.am,
	* tests/trait/Makefile.am,
	* tests/trait/image/Makefile.am,
	* tests/trait/op/Makefile.am,
	* tests/trait/value/Makefile.am,
	* tests/transform/Makefile.am,
	* tests/unit_test/Makefile.am,
	* tests/upscaling/Makefile.am,
	* tests/upscaling/art/Makefile.am,
	* tests/util/Makefile.am,
	* tests/value/Makefile.am,
	* tests/value/builtin/Makefile.am,
	* tests/value/concept/Makefile.am,
	* tests/win/Makefile.am,
	* tests/world/Makefile.am,
	* tests/world/binary_2d/Makefile.am,
	* tests/world/inter_pixel/Makefile.am,
	* tests/world/inter_pixel/dim2/Makefile.am,
	* tools/Makefile.am:
	Here.

	* Makefile.am, external/Makefile.am: Here.

	* mln/fun/v2v/qt_rgb_to_int_u.hh: New.

	* tests/fun/v2v/Makefile.am,
	* tests/fun/v2v/qt_rgb_to_int_u.cc: New test.

	* mln/canvas/labeling/blobs.hh,
	* mln/labeling/blobs.hh: Update members prototypes.

	* mln/labeling/blobs_and_compute.hh: Do not construct on-the-fly
	pixels anymore.

	* Makefile.am,
	* gluit/Makefile.am,
	* include/Makefile.am,
	* libsrc/Makefile.am,
	* utilsrc/Makefile.am:
	Here.

	* scribo/Doxyfile,
	* scribo/Doxyfile_tex,
	* scribo/demo/Makefile.am:
	Here.

	* apps/constrained-connectivity/test-constrained-connectivity.in,
	* apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
	* apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
	* apps/mesh-segm-skel/test-mesh-complex-segm.in,
	* apps/mesh-segm-skel/test-mesh-complex-skel.in,
	* apps/mesh-segm-skel/test-mesh-max-curv.in,
	* apps/mesh-segm-skel/test-mesh-segm.in,
	* doc/graphicx.hva,
	* doc/tools/clearbanner.sh,
	* doc/tools/split_sample.sh:
	Here.

	* build-aux/devtools.sh,
	* build-aux/devtools_utils.sh,
	* build-aux/generate_dist_headers.sh,
	* build-aux/make_report_utils.sh,
	* configure.ac,
	* lrde-upload.sh:
	Here.

	* lrde-upload.sh: Here.
	Add a copyright header.

	* mln/labeling/compute.hh: Add a missing include.

	* mln/literal/colors.hh: Revamp header.

	* mln/value/internal/make_generic_name.hh: Add a missing inline.

	* mln/value/qt/rgb32.hh: Add a missing inline and a useless
	literal.

	* mln/value/rgb.hh: Add a fixme.

	mln/core/routine/extend.hh: Introduce a new macro
	mln_extension_type.

	mln/geom/rotate.hh: Make use of this new macro.

	* milena/mln/core/image/imorph/interpolated.hh: Make the vector
	type more generic.

	* milena/mln/core/point.hh: Provide specific conversion operators
	for float and double.

	* milena/mln/fun/internal/x2x_linear_impl.hh: Allow to set the
	matrix value type.

	* milena/mln/fun/x2x/composed.hh,
	* milena/mln/fun/x2x/rotation.hh,
	* milena/mln/fun/x2x/translation.hh: Introduce data_t typedef
	passed to x2x_linear_impl.

Edwin Carlinet authored May 21, 2010 and Guillaume Lazzara committed May 21, 2010

	* mln/border/thickness.hh,
	* mln/core/alias/dpoint1d.hh,
	* mln/core/alias/dpoint2d.hh,
	* mln/core/alias/dpoint3d.hh,
	* mln/fun/v2v/hsl_to_rgb.hh,
	* mln/literal/black.hh,
	* mln/literal/colors.hh,
	* mln/literal/identity.hh,
	* mln/literal/one.hh,
	* mln/literal/origin.hh,
	* mln/literal/white.hh,
	* mln/literal/zero.hh,
	* mln/tag/init.hh,
	* mln/trace/entering.hh,
	* mln/trace/quiet.hh,
	* mln/value/sign.hh : Add MLN_WO_GLOBAL_VARS define.

	* mln/util/graph.hh,
	* mln/util/line_graph.hh,
	* mln/core/image/vertex_image.hh,
	* mln/core/image/edge_image.hh:
	Fix the Doxygen documentation.
	* mln/util/vertex.hh: Aesthetic changes.
	* mln/util/edge.hh: Aesthetic changes.
	(util::edge<G>::invalidate): Remove dead code.
	* tests/morpho/line_graph_image_morpho.cc:
	Fix (non) Doxygen comments.

	* mln/make/edge_image.hh: Fix Doxygen comments.
	(make::edge_image(const Graph<G>&, const fun::i2v::array<V>&))
	(make::edge_image(const Graph<G>&, const Function_v2v<FP>&,
	const Function_v2v<FV>&))):
	Properly build the required p_edges site sets.
	(make::edge_image(const vertex_image<P,V,G>&, const Function_v2b<F>&)):
	Actually use the predicate passed as second argument.
	Remove debug code.

	* lrde-upload.sh: Here.
	Inspired from Vaucanson's lrde-upload.sh.

	* milena/sandbox/lazzara/scribo/binarization_naive/main.cc,
	* milena/sandbox/lazzara/scribo/binarization_naive/toto.cc,
	* milena/sandbox/lazzara/scribo/fill_holes/main.cc,
	* milena/sandbox/lazzara/scribo/separateurs_materialises/lines_pattern.cc,
	* milena/sandbox/lazzara/scribo/skeleton_crest/main.cc,
	* milena/sandbox/lazzara/skeleton_crest/main.cc: New.

	* mln/labeling/compute.hh: New fastest implementations.

	* milena/mln/canvas/labeling/blobs.hh: Fill extension.

	* milena/mln/data/paste_without_localization.hh: Check whether the
	two images have the same domain.

	* milena/mln/labeling/blobs_and_compute.hh: Rename members.

	* milena/mln/labeling/colorize.hh: Add missing includes.

	* milena/mln/world/binary_2d/enlarge.hh: use def::coord.

	* lrde-upload.sh: Here.

	* lrde-upload.sh: Here.