1. 29 Jun, 2010 1 commit
    • Guillaume Lazzara's avatar
      Merge branches 'next' and 'exp/milena-z' into next · 98eedea5
      Guillaume Lazzara authored
      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
      98eedea5
  2. 24 Jun, 2010 1 commit
  3. 04 Jun, 2010 8 commits
    • Roland Levillain's avatar
      Clean Milena's tests' outputs during `make mostlyclean'. · 0d502d0c
      Roland Levillain authored
      	* apps/mesh-segm-skel/Makefile.am,
      	* apps/papers/levillain.09.ismm/Makefile.am
      	(CLEANFILES): Rename as...
      	(MOSTLYCLEANFILES): ...this.
      0d502d0c
    • Roland Levillain's avatar
      Canonize Swilena's tests' output file names. · ba369b62
      Roland Levillain authored
      	* 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.
      ba369b62
    • Roland Levillain's avatar
      Canonize Milena's tests' output file names. · 165770fe
      Roland Levillain authored
      	* 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,...
      165770fe
    • Roland Levillain's avatar
      Get C++ compiler flags for Scribo from configure. · 4ef67060
      Roland Levillain authored
      	* 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).
      4ef67060
    • Roland Levillain's avatar
      Add variables for C++ compiler flags for Scribo. · ace04a4f
      Roland Levillain authored
      	* configure.ac (SCRIBO_CXXFLAGS, SCRIBO_TESTS_CXXFLAGS):
      	New configure variables.
      ace04a4f
    • Roland Levillain's avatar
      Set decent compiler flags when the Intel C++ compiler is used. · 51c347f9
      Roland Levillain authored
      	* configure.ac: Here.
      51c347f9
    • Roland Levillain's avatar
      Add a simple test to identify the Intel C++ compiler. · 75c57adc
      Roland Levillain authored
      	* configure.ac: Here.
      75c57adc
    • Roland Levillain's avatar
      Add missing const qualifiers in iterators on complexes. · ceed6143
      Roland Levillain authored
      	* 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.
      ceed6143
  4. 03 Jun, 2010 9 commits
    • Roland Levillain's avatar
      Clean up some tests in tests/morpho/. · ccc4a321
      Roland Levillain authored
      	* 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.
      ccc4a321
    • Roland Levillain's avatar
      configure.ac: Clean up a bit. · 5758dd72
      Roland Levillain authored
      5758dd72
    • Roland Levillain's avatar
      Clean up a bit Scribo's Makefiles. · a32f582d
      Roland Levillain authored
      	* 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.
      a32f582d
    • Roland Levillain's avatar
      Clean up a bit Swilena's Makefiles. · 635ff15c
      Roland Levillain authored
      	* Makefile.am, python/Makefile.am: Here.
      635ff15c
    • Roland Levillain's avatar
      Clean up a bit Milena's Makefiles. · 70dedf8b
      Roland Levillain authored
      	* 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.
      70dedf8b
    • Roland Levillain's avatar
      Clean up a bit Olena's Makefiles. · 68624e4c
      Roland Levillain authored
      	* Makefile.am, external/Makefile.am: Here.
      68624e4c
    • Guillaume Lazzara's avatar
      Add a function to convert qt::rgb32 values to int_u8. · c5e55142
      Guillaume Lazzara authored
      	* 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.
      c5e55142
    • Guillaume Lazzara's avatar
      Use sites instead of pixels in canvas::labeling::blobs functors. · 1c596f64
      Guillaume Lazzara authored
      	* 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.
      1c596f64
    • Guillaume Lazzara's avatar
      70ca8455
  5. 02 Jun, 2010 1 commit
  6. 28 May, 2010 6 commits
  7. 25 May, 2010 5 commits
  8. 21 May, 2010 1 commit
    • Edwin Carlinet's avatar
      Add MLN_WO_GLOBAL_VARS directive that prevents globals vars to be included. · 482527bb
      Edwin Carlinet authored and Guillaume Lazzara's avatar Guillaume Lazzara committed
      	* 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.
      482527bb
  9. 12 May, 2010 2 commits
    • Roland Levillain's avatar
      Miscellaneous changes in graphs and graph-based images. · d53b4271
      Roland Levillain authored
      	* 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.
      d53b4271
    • Roland Levillain's avatar
      Fix make::edge_image. · 17734ea5
      Roland Levillain authored
      	* 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.
      17734ea5
  10. 10 May, 2010 1 commit
  11. 30 Apr, 2010 3 commits
    • Guillaume Lazzara's avatar
      Add some code in my sandbox. · 902b12ce
      Guillaume Lazzara authored
      	* 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.
      902b12ce
    • Guillaume Lazzara's avatar
      Add fastest implementations in labeling::compute. · 79ee98c0
      Guillaume Lazzara authored
      	* mln/labeling/compute.hh: New fastest implementations.
      79ee98c0
    • Guillaume Lazzara's avatar
      Small fixes in Milena. · 669c38a5
      Guillaume Lazzara authored
      	* 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.
      669c38a5
  12. 29 Apr, 2010 2 commits