1. 09 Sep, 2013 4 commits
  2. 06 Sep, 2013 4 commits
  3. 05 Sep, 2013 1 commit
  4. 02 Sep, 2013 2 commits
    • Roland Levillain's avatar
      Add parentheses around complex operands of operator `|'. · bb6ddb7e
      Roland Levillain authored
      	* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc:
      	Here, as suggested by g++ 4.7.
      bb6ddb7e
    • Roland Levillain's avatar
      Do not run test-mixed in Milena apps with the `check' target. · abdd5eb7
      Roland Levillain authored
      	* apps/generic-skel/test-mixed.in,
      	* apps/mesh-segm-skel/test-mixed.in:
      	Add a `-wadgmm-2010' suffix to saved images to distinguish them
      	from outputs of other tests.
      	* apps/generic-skel/Makefile.am,
      	* apps/mesh-segm-skel/Makefile.am
      	(MOSTLYCLEANFILES): Adjust.
      	Add files generated by disabled test cases.
      	(generated_checked_tests): New.
      	Contain all generated checked tests.
      	(generated_tests): Set it to contain all test (checked
      	automatically and run manually).
      	(TESTS): Set it to $(generated_checked_tests).
      	Aesthetic changes.
      abdd5eb7
  5. 31 Aug, 2013 6 commits
  6. 30 Aug, 2013 23 commits
    • Roland Levillain's avatar
      0774f862
    • Roland Levillain's avatar
      configure.ac: Untabify. · 346ed701
      Roland Levillain authored
      346ed701
    • Roland Levillain's avatar
      Simplify even more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT. · a40ac76c
      Roland Levillain authored
      	* src/Makefile.am,
      	* src/binarization/Makefile.am:
      	Here.
      a40ac76c
    • Roland Levillain's avatar
      Simplify even more Milena Makefiles thanks to AM_DEFAULT_SOURCE_EXT. · f8090ed8
      Roland Levillain authored
      	* apps/generic-skel/Makefile.am,
      	* apps/mesh-segm-skel/Makefile.am,
      	* tests/io/vtk/Makefile.am,
      	* tests/transform/Makefile.am,
      	* tools/Makefile.am:
      	Here.
      f8090ed8
    • Roland Levillain's avatar
      Regen images of the Milena documentation. · 32fe23ae
      Roland Levillain authored
      	* doc/figures/extend-1.ppm,
      	* doc/figures/extend-2.ppm,
      	* doc/figures/extend-3.ppm,
      	* doc/figures/extend-4.ppm,
      	* doc/figures/extend-5.ppm,
      	* doc/figures/fill-1.ppm,
      	* doc/figures/fill-2.ppm,
      	* doc/figures/fill-imageif-cfun-1.ppm,
      	* doc/figures/fill-subdomain-1.pbm,
      	* doc/figures/fill-subdomain-2.ppm,
      	* doc/figures/fill-subdomain-3.ppm,
      	* doc/figures/fill-subdomain-4.ppm,
      	* doc/figures/ima2d-rot-1.ppm,
      	* doc/figures/ima2d-rot-2.ppm,
      	* doc/figures/ima_save.pbm,
      	* doc/figures/labeling-compute-1.pbm,
      	* doc/figures/labeling-compute-2.ppm,
      	* doc/figures/logical-not-1.pbm,
      	* doc/figures/logical-not-2.pbm,
      	* doc/figures/logical-not-3.pbm,
      	* doc/figures/tuto2_first_image-1.pbm,
      	* doc/figures/tuto3_colorize-1.pgm,
      	* doc/figures/tuto3_colorize-2.ppm,
      	* doc/figures/tuto3_rw_image-1.ppm,
      	* doc/figures/tuto3_rw_image-2.ppm,
      	* doc/figures/tuto3_rw_image-3.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-1.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-2.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-3.pbm,
      	* doc/figures/tuto4_genericity_and_algorithms-4.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-5.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-6.ppm:
      	Regen.
      32fe23ae
    • Roland Levillain's avatar
      Make remaining Milena copyright headers uniform. · 917fa3dc
      Roland Levillain authored
      	* apps/generic-skel/image2d-skel-unconstrained.cc,
      	* apps/generic-skel/image2d-skel-with-end-points.cc,
      	* apps/mesh-segm-skel/mesh-complex-2-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc,
      	* apps/mesh-segm-skel/off-to-vtk-bin.cc,
      	* mln/topo/is_not_1d_isthmus.hh,
      	* mln/topo/is_not_end_point.hh:
      	Here.
      917fa3dc
    • Roland Levillain's avatar
      Disable tests/value/int_u32 in Milena. · 7c470abe
      Roland Levillain authored
      	* tests/value/Makefile.am: Here.
      7c470abe
    • Roland Levillain's avatar
      Fix 3D simple point generators in Milena tools. · 2cbfa7dc
      Roland Levillain authored
      	* tools/Makefile.am: Fix build rules of optional programs.
      	* tools/simple_point3d_lut_tbb.cc: Rename as...
      	* tools/simple_point_3d_lut_tbb.cc: ...this.
      	s/point_3d/point3d/.
      2cbfa7dc
    • Roland Levillain's avatar
      Kill warnings about unused variables. · e20e4109
      Roland Levillain authored
      	* mln/io/vtk/save.hh,
      	* tools/connectivity_numbers_3d_tbb.hh,
      	* tools/simple_point3d_lut_tbb.hh:
      	Here.
      e20e4109
    • Roland Levillain's avatar
      Fix inclusion paths in Swilena. · c01c1740
      Roland Levillain authored
      	* python/Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/milena.
      c01c1740
    • Roland Levillain's avatar
      Fix inclusion paths in Scribo. · 314a240d
      Roland Levillain authored
      	* demo/viewer/Makefile.am: Here.
      314a240d
    • Roland Levillain's avatar
      Kill warnings about signed vs unsigned values. · bdade6e5
      Roland Levillain authored
      	* mln/topo/is_not_1d_isthmus.hh
      	(mln::topo::is_not_1d_isthmus<I, N>::operator()): Here.
      bdade6e5
    • Roland Levillain's avatar
      Catch up with the current interface of breadth_first_thinning. · 1cbfcbe8
      Roland Levillain authored
      	* apps/morphers/recorder-bft.cc: Here.
      1cbfcbe8
    • Roland Levillain's avatar
      Catch up with the current interface of mln::image3d. · d05185f5
      Roland Levillain authored
      	* apps/generic-skel/image3d-skel-unconstrained.cc,
      	* apps/generic-skel/image3d-skel.hh:
      	Here.
      d05185f5
    • Roland Levillain's avatar
      Replace meyer_wst with watershed::flooding. · 8caa6a0f
      Roland Levillain authored
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc: Here.
      8caa6a0f
    • Roland Levillain's avatar
      Convert remaining Milena code to mln_trace. · 5028921e
      Roland Levillain authored
      	* doc/examples/devel/facade.cc.raw,
      	* doc/examples/devel/impl.cc.raw,
      	* mln/io/vtk/save.hh,
      	* mln/topo/skeleton/breadth_first_thinning.hh,
      	* mln/topo/skeleton/priority_driven_thinning.hh,
      	* new-header:
      	Here.
      5028921e
    • Roland Levillain's avatar
      Fix the use of Pi in Milena's apps/mesh-segm-skel. · 5d8a1259
      Roland Levillain authored
      	* apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc:
      	Here.
      5d8a1259
    • Roland Levillain's avatar
      Fix header inclusions in Milena's apps/mesh-segm-skel. · e9bf0a68
      Roland Levillain authored
      	* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc:
      	Here.
      e9bf0a68
    • Roland Levillain's avatar
      Add tests to generate figures for the WADGMM 2010/LNCS submission. · b77aca0a
      Roland Levillain authored
      	* apps/generic-skel/image2d-skel-unconstrained.cc,
      	* apps/generic-skel/image2d-skel-with-end-points.cc,
      	* apps/generic-skel/image3d-skel-unconstrained.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc:
      	Display the size of the input.
      	Time the thinning step.
      	* milena/apps/generic-skel/test-mixed.in,
      	* milena/apps/mesh-segm-skel/test-mixed.in:
      	New.
      	* apps/generic-skel/Makefile.am (generated_tests): Add test-mixed.
      	(test-mixed): New target.
      	(check-mixed): New (phony) target.
      	* apps/mesh-segm-skel/Makefile.am: Likewise.
      	($(generated_tests)): New target.
      	(AM_CPPFLAGS): Add -I$(top_builddir)/milena so that
      	mln/version.hh, which is a generated header, can be found by the
      	compiler.
      b77aca0a
    • Roland Levillain's avatar
      Introduce a no-constraint functor to replace fun::p2b::tautology. · fe72eddb
      Roland Levillain authored
      	* mln/fun/p2b/antilogy.hh,
      	* mln/fun/p2b/tautology.hh:
      	Do not include mln/core/alias/point2d.hh.
      	* mln/topo/no_constraint.hh: New file.
      	* mln/topo/skeleton/breadth_first_thinning.hh,
      	* mln/topo/skeleton/priority_driven_thinning.hh:
      	Use mln::topo::no_constraint instead of mln::fun::p2b::tautology.
      	Do not include the standard header `algorithm'.
      	* headers.mk, tests/unit_test/unit-tests.mk: Regen.
      fe72eddb
    • Roland Levillain's avatar
      Factor code of 2D skeletonizations in apps/generic-skel/. · 91582ecb
      Roland Levillain authored
      	* mln/topo/is_not_end_point.hh: s/nbh/nbh_fg/.
      	(is_not_end_point<I, N>::is_not_end_point(const Neighborhood<N>&)):
      	New ctor.
      	(is_not_end_point<I, N>::set_image): New method.
      	(is_not_end_point<I, N>::ima_): Turn this reference into a pointer.
      	Adjust.
      	* mln/topo/is_simple_point2d.hh
      	(mln::topo::is_simple_point2d<I, N>::operator())
      	* mln/topo/detach_point.hh
      	(mln::topo::detach_point<I>::operator()):
      	Add preconditions.
      	* apps/generic-skel/image2d-skel-with-end-points.cc:
      	Use `mln::topo::is_simple_point2d' and `mln:: topo::detach_point'
      	from mln/topo/, instead of `is_simple_2d' and `detach' from
      	image2d-skel.hh
      	* apps/generic-skel/image2d-skel-unconstrained.cc: Likewise.
      	Remove the (lack of) constraint, as
      	mln::topo::skeleton::breadth_first_thinning already takes care of
      	this.
      	* apps/generic-skel/image2d-skel.hh: Remove.
      	* apps/generic-skel/Makefile.am
      	(image2d_skel_unconstrained_SOURCES)
      	(image2d_skel_with_end_points_SOURCES):
      	Remove image2d-skel.hh.
      91582ecb
    • Roland Levillain's avatar
      Misc changes in apps/generic-skel/ and tools/. · fea1bdb0
      Roland Levillain authored
      	* apps/generic-skel/image3d-skel-unconstrained.cc:
      	Remove a useless header inclusion.
      	* apps/generic-skel/image3d-skel-with-end-points.cc:
      	Fix a comment.
      	* tools/compute_local_configurations.cc:
      	Add a comment.
      	* tools/connectivity_numbers_3d.hh: Add a FIXME.
      fea1bdb0
    • Roland Levillain's avatar
      Exercise breadth-first thinning with predicate is_not_1d_isthmus. · d06e84f0
      Roland Levillain authored
      	* apps/generic-skel/image3d-skel-with-1d-isthmuses.cc: New.
      	* apps/generic-skel/Makefile.am (bin_PROGRAMS):
      	Add image3d-skel-with-1d-isthmuses.
      	(image3d_skel_with_1d_isthmuses_SOURCES): New.
      	(TESTS): Add image3d-skel-with-1d-isthmuses.
      	(MOSTLYCLEANFILES): Add
      	image3d-skel-with-1d-isthmuses-input.raw,
      	image3d-skel-with-1d-isthmuses-input.vtk,
      	image3d-skel-with-1d-isthmuses-skel.raw and
      	image3d-skel-with-1d-isthmuses-skel.vtk.
      d06e84f0