Olena-patches August 2013

olena-patches@lrde.epita.fr

5 participants
171 discussions

olena: olena-2.0-775-g346ed70 configure.ac: Untabify.

by Roland Levillain

--- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7319560..2314fc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Untabify. + 2011-07-11 Roland Levillain <roland(a)lrde.epita.fr> Remove buggy symbol definitions. diff --git a/configure.ac b/configure.ac index e4032f4..b1e8b2e 100644 --- a/configure.ac +++ b/configure.ac @@ -386,7 +386,7 @@ AC_CONFIG_FILES([ scribo/src/primitive/extract/Makefile scribo/src/primitive/find/Makefile scribo/src/primitive/group/Makefile - scribo/src/primitive/remove/Makefile + scribo/src/primitive/remove/Makefile scribo/src/table/Makefile scribo/src/text/Makefile scribo/src/toolchain/Makefile -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-657-ga412a54 Fix a bug in the reimplementation of Trimesh algorithms.

by Roland Levillain

* apps/mesh-segm-skel/misc.hh (mln::geom::mesh_curvature): Always call algebra::ldlt_decomp, even when NDEBUG is defined. Typo. Avoid a warning about an undefined variable when NDEBUG is not defined. --- milena/ChangeLog | 10 ++++++++++ milena/apps/mesh-segm-skel/misc.hh | 15 +++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 54919d0..4ba89c2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2010-05-10 Roland Levillain <roland(a)lrde.epita.fr> + + Fix a bug in the reimplementation of Trimesh algorithms. + + * apps/mesh-segm-skel/misc.hh (mln::geom::mesh_curvature): + Always call algebra::ldlt_decomp, even when NDEBUG is defined. + Typo. + Avoid a warning about an undefined variable when NDEBUG is not + defined. + 2010-05-04 Roland Levillain <roland(a)lrde.epita.fr> Improve topo::skeleton::breadth_first_thinning. diff --git a/milena/apps/mesh-segm-skel/misc.hh b/milena/apps/mesh-segm-skel/misc.hh index 60c009e..325bd8f 100644 --- a/milena/apps/mesh-segm-skel/misc.hh +++ b/milena/apps/mesh-segm-skel/misc.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -622,10 +622,13 @@ namespace mln // Least squares solution. vec3f diag; -#ifndef NDEBUG - bool ldlt_decomp_sucess_p = algebra::ldlt_decomp(w, diag); -#endif // ! NDEBUG - mln_assertion(ldlt_decomp_sucess_p); + // Note that algebra::ldlt_decomp has side effects on its + // arguments; this call is not ``just an assertion''. + bool ldlt_decomp_success_p = algebra::ldlt_decomp(w, diag); + mln_assertion(ldlt_decomp_success_p); + // Avoid a warning about an undefined variable when NDEBUG + // is not defined. + (void) ldlt_decomp_success_p; algebra::ldlt_solve(w, diag, m, m); // Push it back out to the vertices -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-774-ga40ac76 Simplify even more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT.

by Roland Levillain

* src/Makefile.am, * src/binarization/Makefile.am: Here. --- scribo/ChangeLog | 8 ++++++++ scribo/src/Makefile.am | 1 - scribo/src/binarization/Makefile.am | 5 ----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 77ca627..62a4083 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify even more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT. + + * src/Makefile.am, + * src/binarization/Makefile.am: + Here. + 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> Fix inclusion paths in Scribo. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index eea9134..1b6da73 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -71,7 +71,6 @@ endif HAVE_TESSERACT utilexec_PROGRAMS += text_in_picture_dual - text_in_picture_dual_SOURCES = text_in_picture_dual.cc text_in_picture_dual_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) text_in_picture_dual_LDFLAGS = $(AM_LDFLAGS) \ diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 5bcc49f..24f151a 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -58,31 +58,26 @@ if HAVE_MAGICKXX sauvola_ms_fg_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - kim_SOURCES = kim.cc kim_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) kim_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - sauvola_SOURCES = sauvola.cc sauvola_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) sauvola_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - singh_SOURCES = singh.cc singh_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) singh_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - wolf_SOURCES = wolf.cc wolf_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) wolf_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - sauvola_debug_SOURCES = sauvola_debug.cc sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) \ -DSCRIBO_LOCAL_THRESHOLD_DEBUG \ $(MAGICKXX_CPPFLAGS) -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-773-gf8090ed Simplify even more Milena Makefiles thanks to AM_DEFAULT_SOURCE_EXT.

by Roland Levillain

* apps/generic-skel/Makefile.am, * apps/mesh-segm-skel/Makefile.am, * tests/io/vtk/Makefile.am, * tests/transform/Makefile.am, * tools/Makefile.am: Here. --- milena/ChangeLog | 11 +++++++++++ milena/apps/generic-skel/Makefile.am | 19 ++++++------------- milena/apps/mesh-segm-skel/Makefile.am | 8 +------- milena/tests/io/vtk/Makefile.am | 7 ++----- milena/tests/transform/Makefile.am | 3 +-- milena/tools/Makefile.am | 7 +------ 6 files changed, 22 insertions(+), 33 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e248291..f91ace5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + Simplify even more Milena Makefiles thanks to AM_DEFAULT_SOURCE_EXT. + + * apps/generic-skel/Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * tests/io/vtk/Makefile.am, + * tests/transform/Makefile.am, + * tools/Makefile.am: + Here. + +2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + Regen images of the Milena documentation. * doc/figures/extend-1.ppm, diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 41f022e..1d4f73e 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2012 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010-2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -24,24 +24,17 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) # FIXME: Really install these programs? +# 2D cases. bin_PROGRAMS = \ image2d-skel-unconstrained \ - image2d-skel-with-end-points \ - \ + image2d-skel-with-end-points + +# 3D cases, slow versions. +bin_PROGRAMS += \ image3d-skel-unconstrained \ image3d-skel-with-end-points \ image3d-skel-with-1d-isthmuses -# 2D cases. -image2d_skel_unconstrained_SOURCES = image2d-skel-unconstrained.cc -image2d_skel_with_end_points_SOURCES = image2d-skel-with-end-points.cc - -# 3D cases, slow versions. -noinst_HEADERS = image3d-skel.hh -image3d_skel_unconstrained_SOURCES = image3d-skel-unconstrained.cc -image3d_skel_with_end_points_SOURCES = image3d-skel-with-end-points.cc -image3d_skel_with_1d_isthmuses_SOURCES = image3d-skel-with-1d-isthmuses.cc - EXTRA_DIST = \ test-image2d-skel-unconstrained.in \ test-image2d-skel-with-end-points.in diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index c738963..2faefb9 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -70,7 +70,6 @@ MOSTLYCLEANFILES += teapot-complex-max-curv.off # surface of a triangle mesh and displaying its local minima # (in blue) and maxima (in red). bin_PROGRAMS += mesh-complex-max-curv-extrema -mesh_complex_max_curv_extrema_SOURCES = mesh-complex-max-curv-extrema.cc TESTS += test-mesh-complex-max-curv-extrema MOSTLYCLEANFILES += \ socket-complex-max-curv-extrema.off \ @@ -104,7 +103,6 @@ MOSTLYCLEANFILES += \ # Likewise, but using pseudo-inverse curvature. bin_PROGRAMS += mesh-complex-pinv-curv-segm -mesh_complex_pinv_curv_segm_SOURCES = mesh-complex-pinv-curv-segm.cc TESTS += test-mesh-complex-pinv-curv-segm MOSTLYCLEANFILES += \ socket-complex-pinv-curv-segm.off \ @@ -126,7 +124,6 @@ edit = sed \ # Performing a 2-collapse on a pseudo-manifold. bin_PROGRAMS += mesh-complex-2-collapse -mesh_complex_2_collapse_SOURCES = mesh-complex-2-collapse.cc test-mesh-complex-2-collapse: test-mesh-complex-2-collapse.in Makefile rm -f $@ $@.tmp @@ -143,7 +140,6 @@ MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk # Program computing the max curvature from a mesh, then performing a # 2-collapse on it. bin_PROGRAMS += mesh-complex-max-curv-2-collapse -mesh_complex_max_curv_2_collapse_SOURCES = mesh-complex-max-curv-2-collapse.cc # FIXME: Factor action with test-mesh-complex-2-collapse's. test-mesh-complex-max-curv-2-collapse: test-mesh-complex-max-curv-2-collapse.in Makefile @@ -163,7 +159,6 @@ MOSTLYCLEANFILES += \ # Program computing the max curvature from a mesh, then performing a # 1-collapse on it. bin_PROGRAMS += mesh-complex-max-curv-1-collapse -mesh_complex_max_curv_1_collapse_SOURCES = mesh-complex-max-curv-1-collapse.cc # FIXME: Factor action with test-mesh-complex-1-collapse's. test-mesh-complex-max-curv-1-collapse: test-mesh-complex-max-curv-1-collapse.in Makefile @@ -215,7 +210,6 @@ MOSTLYCLEANFILES += \ # Convert a binary OFF file (e.g. no value attached to faces) into a # VTK file. bin_PROGRAMS += off-to-vtk-bin -off_to_vtk_bin_SOURCES = off-to-vtk-bin.cc ## ------------- ## ## Mixed tests. ## diff --git a/milena/tests/io/vtk/Makefile.am b/milena/tests/io/vtk/Makefile.am index 9554a4b..4caaf7a 100644 --- a/milena/tests/io/vtk/Makefile.am +++ b/milena/tests/io/vtk/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011, 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -18,10 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = load_bin load_save_bin save -load_bin_SOURCES = load_bin.cc -load_save_bin_SOURCES = load_save_bin.cc -save_SOURCES = save.cc - TESTS = $(check_PROGRAMS) MOSTLYCLEANFILES = \ diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index a49ae65..42d74c7 100644 --- a/milena/tests/transform/Makefile.am +++ b/milena/tests/transform/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -32,7 +32,6 @@ check_PROGRAMS = \ if HAVE_FFTW3 check_PROGRAMS += fft -fft_SOURCES = fft.cc fft_CPPFLAGS = $(AM_CPPFLAGS) $(FFTW3_CPPFLAGS) fft_LDFLAGS = $(AM_LDFLAGS) $(FFTW3_LDFLAGS) diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index dce1cad..0cbe661 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -27,7 +27,6 @@ noinst_PROGRAMS = compute_local_configurations noinst_HEADERS = connectivity_numbers_3d.hh noinst_PROGRAMS += connectivity_numbers_3d -connectivity_numbers_3d_SOURCES = connectivity_numbers_3d.cc # FIXME: Hard-coded paths. @@ -39,17 +38,14 @@ extra: $(EXTRA_PROGRAMS) noinst_HEADERS += connectivity_numbers_3d_tbb.hh EXTRA_PROGRAMS = connectivity_numbers_3d_tbb -connectivity_numbers_3d_tbb_SOURCES = connectivity_numbers_3d_tbb.cc connectivity_numbers_3d_tbb_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_TBB) connectivity_numbers_3d_tbb_LDFLAGS = $(LDFLAGS_TBB) noinst_HEADERS += simple_point3d_lut.hh EXTRA_PROGRAMS += simple_point3d_lut -simple_point3d_lut_SOURCES = simple_point3d_lut.cc noinst_HEADERS += simple_point3d_lut_tbb.hh EXTRA_PROGRAMS += simple_point3d_lut_tbb -simple_point3d_lut_tbb_SOURCES = simple_point3d_lut_tbb.cc simple_point3d_lut_tbb_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_TBB) simple_point3d_lut_tbb_LDFLAGS = $(LDFLAGS_TBB) @@ -83,7 +79,6 @@ nodist_libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.hh simple_point3d_lut_26_6.lo: simple_point3d_lut_26_6.hh EXTRA_PROGRAMS += test_simple_point3d_lut_26_6 -test_simple_point3d_lut_26_6_SOURCES = test_simple_point3d_lut_26_6.cc test_simple_point3d_lut_26_6_LDADD = libsimple_point3d_lut_26_6.la # Generate this build dependency of test_simple_point3d_lut_26_6. test_simple_point3d_lut_26_6.o: simple_point3d_lut_26_6.hh -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-771-g917fa3d Make remaining Milena copyright headers uniform.

by Roland Levillain

* 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. --- milena/ChangeLog | 18 +++++++++++++ .../generic-skel/image2d-skel-unconstrained.cc | 28 +++++++++----------- .../generic-skel/image2d-skel-with-end-points.cc | 28 +++++++++----------- .../apps/mesh-segm-skel/mesh-complex-2-collapse.cc | 28 +++++++++----------- .../mesh-complex-max-curv-1-collapse.cc | 28 +++++++++----------- .../mesh-complex-max-curv-2-collapse.cc | 28 +++++++++----------- .../mesh-complex-max-curv-extrema.cc | 28 +++++++++----------- .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 28 +++++++++----------- .../mesh-segm-skel/mesh-complex-pinv-curv-segm.cc | 28 +++++++++----------- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 28 +++++++++----------- milena/apps/mesh-segm-skel/off-to-vtk-bin.cc | 28 +++++++++----------- milena/mln/topo/is_not_1d_isthmus.hh | 28 +++++++++----------- milena/mln/topo/is_not_end_point.hh | 28 +++++++++----------- 13 files changed, 174 insertions(+), 180 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 23da5b8..2a47e5a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + Make remaining Milena copyright headers uniform. + + * 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. + +2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + Disable tests/value/int_u32 in Milena. * tests/value/Makefile.am: Here. diff --git a/milena/apps/generic-skel/image2d-skel-unconstrained.cc b/milena/apps/generic-skel/image2d-skel-unconstrained.cc index 68578f6..239b4c8 100644 --- a/milena/apps/generic-skel/image2d-skel-unconstrained.cc +++ b/milena/apps/generic-skel/image2d-skel-unconstrained.cc @@ -1,29 +1,27 @@ // Copyright (C) 2010-2012 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file /// \brief A program computing an unconstrained skeleton of a 2D image. diff --git a/milena/apps/generic-skel/image2d-skel-with-end-points.cc b/milena/apps/generic-skel/image2d-skel-with-end-points.cc index ed7fc22..8b6048d 100644 --- a/milena/apps/generic-skel/image2d-skel-with-end-points.cc +++ b/milena/apps/generic-skel/image2d-skel-with-end-points.cc @@ -1,29 +1,27 @@ // Copyright (C) 2010, 2012 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file /// \brief A program computing a skeleton of a 2D image, preserving diff --git a/milena/apps/mesh-segm-skel/mesh-complex-2-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-2-collapse.cc index acc053b..397b751 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-2-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-2-collapse.cc @@ -1,30 +1,28 @@ // Copyright (C) 2008, 2009, 2011 EPITA Research and Development // Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file /// \brief A program computing the ultimate 2-collapse of a triangle diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc index 300b201..9e04285 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc @@ -1,29 +1,27 @@ // Copyright (C) 2008-2013 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file /// \brief A program computing the maximal curvature values from the diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc index 30bf8e5..4bdd51c 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc @@ -1,29 +1,27 @@ // Copyright (C) 2008-2013 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file /// \brief A program computing the maximal curvature values from the diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc index b57b9aa..d36ec55 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc @@ -1,30 +1,28 @@ // Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc /// \brief A program computing the max curvature at each (2-)face of diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index a3c4364..87c3ced 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -1,30 +1,28 @@ // Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc /// \brief A program computing the maximal curvature values from the diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc index d69959e..48fa8ef 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc @@ -1,30 +1,28 @@ // Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc /// \brief A program computing the pseudo-inverse curvature values diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index f020794..5eb1747 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -1,30 +1,28 @@ // Copyright (C) 2008-2010, 2012-2013 EPITA Research and Development // Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc /// \brief A program computing the pseudo-inverse curvature values diff --git a/milena/apps/mesh-segm-skel/off-to-vtk-bin.cc b/milena/apps/mesh-segm-skel/off-to-vtk-bin.cc index 926da7d..6282fff 100644 --- a/milena/apps/mesh-segm-skel/off-to-vtk-bin.cc +++ b/milena/apps/mesh-segm-skel/off-to-vtk-bin.cc @@ -1,29 +1,27 @@ // Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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. /// \file diff --git a/milena/mln/topo/is_not_1d_isthmus.hh b/milena/mln/topo/is_not_1d_isthmus.hh index 03ab080..101cdf2 100644 --- a/milena/mln/topo/is_not_1d_isthmus.hh +++ b/milena/mln/topo/is_not_1d_isthmus.hh @@ -1,29 +1,27 @@ // Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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 MLN_TOPO_IS_NOT_1D_ISTHMUS_HH # define MLN_TOPO_IS_NOT_1D_ISTHMUS_HH diff --git a/milena/mln/topo/is_not_end_point.hh b/milena/mln/topo/is_not_end_point.hh index f958a59..31ac02d 100644 --- a/milena/mln/topo/is_not_end_point.hh +++ b/milena/mln/topo/is_not_end_point.hh @@ -1,29 +1,27 @@ // Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// 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 this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// 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 library without restriction. Specifically, if other files +// 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. +// 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 MLN_TOPO_IS_NOT_END_POINT_HH # define MLN_TOPO_IS_NOT_END_POINT_HH -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-770-g7c470ab Disable tests/value/int_u32 in Milena.

by Roland Levillain

* tests/value/Makefile.am: Here. --- milena/ChangeLog | 6 ++++++ milena/tests/value/Makefile.am | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7cfb2ac..23da5b8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + + Disable tests/value/int_u32 in Milena. + + * tests/value/Makefile.am: Here. + 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> Fix 3D simple point generators in Milena tools. diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index a953f3f..21ca6f4 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -29,19 +29,21 @@ check_PROGRAMS = \ int_s \ int_s16 \ int_u8 \ - int_u32 \ interop \ label \ proxy \ rgb8 \ set \ sign + +# FIXME: Disabled tests. +# int_u32 \ # float01 # float01_bis # float01_f # graylevel_f - -XFAIL_TESTS = int_u32 +# +## XFAIL_TESTS = int_u32 # FIXME: Enable when make check_full works. -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-759-ge9bf0a6 Fix header inclusions in Milena's apps/mesh-segm-skel.

by Roland Levillain

* 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. --- milena/ChangeLog | 12 ++++++++++++ .../mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc | 4 ++-- .../mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc | 4 ++-- .../apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc | 4 ++-- milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc | 4 ++-- milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc | 4 ++-- milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 4 ++-- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9a638de..58df7ec 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix header inclusions in Milena's apps/mesh-segm-skel. + + * 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. + 2012-02-17 Roland Levillain <roland(a)lrde.epita.fr> Add tests to generate figures for the WADGMM 2010/LNCS submission. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc index 47a5a20..300b201 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008-2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -62,7 +62,7 @@ #include <mln/util/timer.hh> -#include "trimesh/misc.hh" +#include "misc.hh" int diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc index 7c779e3..30bf8e5 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008-2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -62,7 +62,7 @@ #include <mln/util/timer.hh> -#include "trimesh/misc.hh" +#include "misc.hh" int diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc index 8f68b3d..e17c477 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -62,7 +62,7 @@ #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index 2d55ff2..a3c4364 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -59,7 +59,7 @@ morphed mln::complex_image (i.e., seen through image_if). */ #include "save_bin_alt.hh" -#include "trimesh/misc.hh" +#include "misc.hh" int diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc index fe7ee70..ced95a0 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -53,7 +53,7 @@ #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index c4b9bb8..d9e6ae4 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2010, 2012 EPITA Research and Development +// Copyright (C) 2008-2010, 2012-2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -61,7 +61,7 @@ morphed mln::complex_image (i.e., seen through image_if). */ #include "save_bin_alt.hh" -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-769-g2cbfa7d Fix 3D simple point generators in Milena tools.

by Roland Levillain

* 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/. --- milena/ChangeLog | 9 ++++++++ milena/tools/Makefile.am | 24 ++++++++++++++------ ...int_3d_lut_tbb.cc => simple_point3d_lut_tbb.cc} | 12 +++++----- 3 files changed, 32 insertions(+), 13 deletions(-) rename milena/tools/{simple_point_3d_lut_tbb.cc => simple_point3d_lut_tbb.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 48d5c46..7cfb2ac 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix 3D simple point generators in Milena tools. + + * 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/. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Kill warnings about unused variables. * mln/io/vtk/save.hh, diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index 504d1b0..dce1cad 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -58,10 +58,8 @@ simple_point3d_lut_tbb_LDFLAGS = $(LDFLAGS_TBB) simple_point_luts: simple_point3d_lut_26_6.hh CLEANFILES = simple_point3d_lut_26_6.txt -# Careful, there is no dependency on the generator (on purpose, -# because regenerating these files takes time). -simple_point3d_lut_26_6.txt: - ./simple_point3d_lut_tbb$(EXEEXT) 26_6 >$@ +simple_point3d_lut_26_6.txt: simple_point3d_lut_tbb$(EXEEXT) + ./$< 26_6 >$@ EXTRA_DIST = gen_cxx_lut CLEANFILES += simple_point3d_lut_26_6.hh @@ -73,9 +71,21 @@ simple_point3d_lut_26_6.hh: simple_point3d_lut_26_6.txt $(srcdir)/gen_cxx_lut # Very long (both to compile and execute) optional test, checking the # consistency of the LUT in simple_point3d_lut_26_6.hh. Moreover, it # should be turned into a parallel program. -noinst_LTLIBRARIES = libsimple_point3d_lut_26_6.la -libsimple_point3d_lut_26_6_la_SOURCES = \ - simple_point3d_lut_26_6.hh simple_point3d_lut_26_6.cc + +.PHONY: check-extra +check-extra: test_simple_point3d_lut_26_6$(EXEEXT) + ./$< + +EXTRA_LTLIBRARIES = libsimple_point3d_lut_26_6.la +libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.cc +nodist_libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.hh +# Generate this build dependency of libsimple_point3d_lut_26_6.la. +simple_point3d_lut_26_6.lo: simple_point3d_lut_26_6.hh + EXTRA_PROGRAMS += test_simple_point3d_lut_26_6 test_simple_point3d_lut_26_6_SOURCES = test_simple_point3d_lut_26_6.cc test_simple_point3d_lut_26_6_LDADD = libsimple_point3d_lut_26_6.la +# Generate this build dependency of test_simple_point3d_lut_26_6. +test_simple_point3d_lut_26_6.o: simple_point3d_lut_26_6.hh + +CLEANFILES += $(EXTRA_PROGRAMS) $(EXTRA_LTLIBRARIES) diff --git a/milena/tools/simple_point_3d_lut_tbb.cc b/milena/tools/simple_point3d_lut_tbb.cc similarity index 78% rename from milena/tools/simple_point_3d_lut_tbb.cc rename to milena/tools/simple_point3d_lut_tbb.cc index 57a44dd..7ba9654 100644 --- a/milena/tools/simple_point_3d_lut_tbb.cc +++ b/milena/tools/simple_point3d_lut_tbb.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,7 @@ /// 3D point is simple or not, in parallel, using Intel Threading /// Building Blocks. -#include "simple_point_3d_lut_tbb.hh" +#include "simple_point3d_lut_tbb.hh" int main(int argc, char* argv[]) @@ -37,10 +37,10 @@ main(int argc, char* argv[]) std::string nbhs = argv[1]; simple_point_lut_t simple_point_lut; - if (nbhs == "6_26") simple_point_lut = simple_point_3d_lut_tbb__6_26(); - else if (nbhs == "26_6") simple_point_lut = simple_point_3d_lut_tbb__26_6(); - else if (nbhs == "6p_18") simple_point_lut = simple_point_3d_lut_tbb__6p_18(); - else if (nbhs == "18_6p") simple_point_lut = simple_point_3d_lut_tbb__18_6p(); + if (nbhs == "6_26") simple_point_lut = simple_point3d_lut_tbb__6_26(); + else if (nbhs == "26_6") simple_point_lut = simple_point3d_lut_tbb__26_6(); + else if (nbhs == "6p_18") simple_point_lut = simple_point3d_lut_tbb__6p_18(); + else if (nbhs == "18_6p") simple_point_lut = simple_point3d_lut_tbb__18_6p(); else usage(argv[0]); -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-768-ge20e410 Kill warnings about unused variables.

by Roland Levillain

* mln/io/vtk/save.hh, * tools/connectivity_numbers_3d_tbb.hh, * tools/simple_point3d_lut_tbb.hh: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/io/vtk/save.hh | 2 +- milena/tools/connectivity_numbers_3d_tbb.hh | 6 +----- milena/tools/simple_point3d_lut_tbb.hh | 6 +----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e43f313..48d5c46 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Kill warnings about unused variables. + + * mln/io/vtk/save.hh, + * tools/connectivity_numbers_3d_tbb.hh, + * tools/simple_point3d_lut_tbb.hh: + Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Kill warnings about signed vs unsigned values. * mln/topo/is_not_1d_isthmus.hh diff --git a/milena/mln/io/vtk/save.hh b/milena/mln/io/vtk/save.hh index e8c8e09..0971f2d 100644 --- a/milena/mln/io/vtk/save.hh +++ b/milena/mln/io/vtk/save.hh @@ -231,7 +231,7 @@ namespace mln // Concept checking. void (E::*m1)(std::ostream&, const I&) const = &E::write_face_data; - m1 = 0; + (void) m1; } diff --git a/milena/tools/connectivity_numbers_3d_tbb.hh b/milena/tools/connectivity_numbers_3d_tbb.hh index edea434..514bb6d 100644 --- a/milena/tools/connectivity_numbers_3d_tbb.hh +++ b/milena/tools/connectivity_numbers_3d_tbb.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -63,10 +63,6 @@ struct connectivity_numbers_3d_tbb_range I ima(b, 0); P p(0, 0, 0); - const unsigned dim = 3; - const unsigned max_nneighbs = mlc_pow_int(3, dim) - 1; - const unsigned nconfigs = mlc_pow_int(2, max_nneighbs); - for (config_3d_t i = r.begin(); i != r.end(); ++i) { /* Create the local i-th configuration around P. diff --git a/milena/tools/simple_point3d_lut_tbb.hh b/milena/tools/simple_point3d_lut_tbb.hh index b8c0a15..670394f 100644 --- a/milena/tools/simple_point3d_lut_tbb.hh +++ b/milena/tools/simple_point3d_lut_tbb.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -67,10 +67,6 @@ struct simple_point3d_lut_tbb_range I bg_ima(b, 0); P p(0, 0, 0); - const unsigned dim = 3; - const unsigned max_nneighbs = mlc_pow_int(3, dim) - 1; - const unsigned nconfigs = mlc_pow_int(2, max_nneighbs); - for (config_3d_t i = r.begin(); i != r.end(); ++i) { /* Create the local i-th configuration around P. -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-767-gc01c174 Fix inclusion paths in Swilena.

by Roland Levillain

* python/Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/milena. --- swilena/ChangeLog | 6 ++++++ swilena/python/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 292b4c7..38ccc2b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix inclusion paths in Swilena. + + * python/Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/milena. + 2013-04-12 Roland Levillain <roland(a)lrde.epita.fr> Adjust Swilena to Automake parallel tests. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 2d8dfa7..66630b9 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -22,7 +22,7 @@ ## FIXME: Factor as much as possible. See how we handled this in TC. -AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena +AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena -I$(top_builddir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -- 1.7.10.4

11 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches August 2013