October 2012 - Olena-patches

olena-2.0-51-g8fbf9f2 Address g++-4.7 compilation errors.
by Roland Levillain 08 Oct '12

08 Oct '12

* apps/morphers/image2d-skel.hh (is_simple_2d::operator()): Qualify a call to a base class member. --- milena/ChangeLog | 7 +++++++ milena/apps/morphers/image2d-skel.hh | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c1289de..4320702 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2012-10-08 Roland Levillain <roland(a)lrde.epita.fr> + + Address g++-4.7 compilation errors. + + * apps/morphers/image2d-skel.hh (is_simple_2d::operator()): + Qualify a call to a base class member. + 2012-09-25 Roland Levillain <roland(a)lrde.epita.fr> Fix file names in apps/morphers/recorder-bft. diff --git a/milena/apps/morphers/image2d-skel.hh b/milena/apps/morphers/image2d-skel.hh index 392122c..46dc3ff 100644 --- a/milena/apps/morphers/image2d-skel.hh +++ b/milena/apps/morphers/image2d-skel.hh @@ -84,7 +84,7 @@ public: /// Based on connectivity numbers. bool operator()(const mln_psite(I)& p) const { - return check(*ima_, p); + return this->check(*ima_, p); } private: -- 1.7.2.5

1 0

branch cleanup updated: olena-2.0-40-gd4b9819
by git＠lrde.epita.fr 05 Oct '12

05 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch cleanup has been updated via d4b9819e60f71e7f6e56f4fa48a9246ad5720225 (commit) via 996b7f6c5acfd0d00dadc2029d18c2e08f028cec (commit) via 26f95b1755a17fd2493f70fddde58f1f92362c31 (commit) via fddc057bccf8cb5a54f17d2d14a22f8a56126273 (commit) via 3cf38cdc895c378bab0a62dac04988850ef17e0f (commit) via 9e4ce856d1d29493dab00b083740dad80e701f1f (commit) via 4eb9bb1fcae2fa1ec32ccb3dd5975b09d7255421 (commit) via aa29f39128e0a0dcb09361568357d3b3217bc35e (commit) from cfc65f324dbe578cea17162f954e90e696f260c3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- d4b9819 Fix Swilena's build. 996b7f6 Wrap mln::value::int_u24. 26f95b1 Provide typedefs mln::value::int_s24 and mln::value::int_u24. fddc057 Update texi2dvi from upstream. 3cf38cd Remove Trimesh sources from Olena. 9e4ce85 Rename Trimesh reimplementations in apps/mesh-segm-skel/. 4eb9bb1 No longer configure tests of apps depending on Trimesh. aa29f39 Remove anything depending on the Trimesh library. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 27 + Makefile.am | 2 +- README | 15 - build-aux/texi2dvi | 146 +- configure.ac | 21 +- external/Makefile.am | 21 - external/README | 71 - external/trimesh/.gitignore | 6 - external/trimesh/COPYING | 302 --- external/trimesh/ChangeLog | 95 - external/trimesh/Makedefs.Darwin | 53 - external/trimesh/Makedefs.Linux | 59 - external/trimesh/Makedefs.Linux64 | 59 - external/trimesh/Makedefs.SunOS | 50 - external/trimesh/Makedefs.Win32 | 69 - external/trimesh/Makefile.am | 19 - external/trimesh/Makerules | 80 - external/trimesh/README | 144 - external/trimesh/configure.ac | 62 - external/trimesh/gluit/COPYING.freeglut | 27 - external/trimesh/gluit/COPYING.glui | 504 ---- external/trimesh/gluit/Makefile.am | 91 - external/trimesh/gluit/freeglut_callbacks.c | 336 --- external/trimesh/gluit/freeglut_cursor.c | 270 -- external/trimesh/gluit/freeglut_display.c | 99 - external/trimesh/gluit/freeglut_ext.c | 205 -- external/trimesh/gluit/freeglut_font.c | 368 --- external/trimesh/gluit/freeglut_font_data.c | 2024 -------------- external/trimesh/gluit/freeglut_gamemode.c | 598 ----- external/trimesh/gluit/freeglut_geometry.c | 1147 -------- .../trimesh/gluit/freeglut_glutfont_definitions.c | 77 - external/trimesh/gluit/freeglut_init.c | 899 ------- external/trimesh/gluit/freeglut_internal.h | 854 ------ external/trimesh/gluit/freeglut_joystick.c | 1805 ------------- external/trimesh/gluit/freeglut_main.c | 1982 -------------- external/trimesh/gluit/freeglut_menu.c | 949 ------- external/trimesh/gluit/freeglut_misc.c | 179 -- external/trimesh/gluit/freeglut_overlay.c | 49 - external/trimesh/gluit/freeglut_state.c | 694 ----- .../trimesh/gluit/freeglut_stroke_mono_roman.c | 2821 -------------------- external/trimesh/gluit/freeglut_stroke_roman.c | 2821 -------------------- external/trimesh/gluit/freeglut_structure.c | 651 ----- external/trimesh/gluit/freeglut_teapot.c | 207 -- external/trimesh/gluit/freeglut_teapot_data.h | 2428 ----------------- external/trimesh/gluit/freeglut_videoresize.c | 54 - external/trimesh/gluit/freeglut_window.c | 1092 -------- external/trimesh/gluit/glui.cc | 1960 -------------- external/trimesh/gluit/glui_add_controls.cc | 742 ----- external/trimesh/gluit/glui_algebra3.cc | 1037 ------- external/trimesh/gluit/glui_algebra3.h | 474 ---- external/trimesh/gluit/glui_arcball.cc | 223 -- external/trimesh/gluit/glui_arcball.h | 80 - external/trimesh/gluit/glui_bitmap_img_data.cc | 22 - external/trimesh/gluit/glui_bitmaps.cc | 104 - external/trimesh/gluit/glui_button.cc | 208 -- external/trimesh/gluit/glui_checkbox.cc | 313 --- external/trimesh/gluit/glui_column.cc | 76 - external/trimesh/gluit/glui_control.cc | 1223 --------- external/trimesh/gluit/glui_edittext.cc | 1045 -------- external/trimesh/gluit/glui_img_checkbox_0.c | 38 - external/trimesh/gluit/glui_img_checkbox_0_dis.c | 38 - external/trimesh/gluit/glui_img_checkbox_1.c | 38 - external/trimesh/gluit/glui_img_checkbox_1_dis.c | 38 - external/trimesh/gluit/glui_img_downarrow.c | 56 - external/trimesh/gluit/glui_img_leftarrow.c | 56 - external/trimesh/gluit/glui_img_listbox_down.c | 42 - external/trimesh/gluit/glui_img_listbox_up.c | 42 - external/trimesh/gluit/glui_img_listbox_up_dis.c | 42 - external/trimesh/gluit/glui_img_radiobutton_0.c | 44 - .../trimesh/gluit/glui_img_radiobutton_0_dis.c | 44 - external/trimesh/gluit/glui_img_radiobutton_1.c | 44 - .../trimesh/gluit/glui_img_radiobutton_1_dis.c | 44 - external/trimesh/gluit/glui_img_rightarrow.c | 56 - external/trimesh/gluit/glui_img_spindown_0.c | 24 - external/trimesh/gluit/glui_img_spindown_1.c | 24 - external/trimesh/gluit/glui_img_spindown_dis.c | 24 - external/trimesh/gluit/glui_img_spinup_0.c | 24 - external/trimesh/gluit/glui_img_spinup_1.c | 24 - external/trimesh/gluit/glui_img_spinup_dis.c | 24 - external/trimesh/gluit/glui_img_uparrow.c | 56 - external/trimesh/gluit/glui_listbox.cc | 445 --- external/trimesh/gluit/glui_mouse_iaction.cc | 212 -- external/trimesh/gluit/glui_node.cc | 175 -- external/trimesh/gluit/glui_panel.cc | 178 -- external/trimesh/gluit/glui_quaternion.cc | 229 -- external/trimesh/gluit/glui_quaternion.h | 97 - external/trimesh/gluit/glui_radio.cc | 341 --- external/trimesh/gluit/glui_rollout.cc | 286 -- external/trimesh/gluit/glui_rotation.cc | 389 --- external/trimesh/gluit/glui_separator.cc | 60 - external/trimesh/gluit/glui_slider.cc | 725 ----- external/trimesh/gluit/glui_spinner.cc | 579 ---- external/trimesh/gluit/glui_statictext.cc | 124 - external/trimesh/gluit/glui_stdinc.h | 131 - external/trimesh/gluit/glui_translation.cc | 518 ---- external/trimesh/gluit/gluit.mk | 16 - external/trimesh/include/Color.h | 107 - external/trimesh/include/GL/freeglut.h | 22 - external/trimesh/include/GL/freeglut_ext.h | 124 - external/trimesh/include/GL/freeglut_std.h | 579 ---- external/trimesh/include/GL/glui.h | 1767 ------------ external/trimesh/include/GL/glut.h | 29 - external/trimesh/include/GLCamera.h | 74 - external/trimesh/include/ICP.h | 40 - external/trimesh/include/KDtree.h | 46 - external/trimesh/include/Makefile.am | 21 - external/trimesh/include/TriMesh.h | 161 -- external/trimesh/include/TriMesh_algo.h | 145 - external/trimesh/include/Vec.h | 459 ---- external/trimesh/include/XForm.h | 317 --- external/trimesh/include/bsphere.h | 273 -- external/trimesh/include/lineqn.h | 358 --- external/trimesh/include/mempool.h | 88 - external/trimesh/include/noise3d.h | 127 - external/trimesh/include/timestamp.h | 69 - external/trimesh/libsrc/GLCamera.cc | 378 --- external/trimesh/libsrc/ICP.cc | 859 ------ external/trimesh/libsrc/KDtree.cc | 299 --- external/trimesh/libsrc/Makefile.am | 34 - external/trimesh/libsrc/TriMesh_bounding.cc | 135 - external/trimesh/libsrc/TriMesh_connectivity.cc | 124 - external/trimesh/libsrc/TriMesh_curvature.cc | 325 --- external/trimesh/libsrc/TriMesh_grid.cc | 109 - external/trimesh/libsrc/TriMesh_io.cc | 1925 ------------- external/trimesh/libsrc/TriMesh_normals.cc | 118 - external/trimesh/libsrc/TriMesh_pointareas.cc | 77 - external/trimesh/libsrc/TriMesh_stats.cc | 46 - external/trimesh/libsrc/TriMesh_tstrips.cc | 245 -- external/trimesh/libsrc/diffuse.cc | 353 --- external/trimesh/libsrc/edgeflip.cc | 176 -- external/trimesh/libsrc/faceflip.cc | 30 - external/trimesh/libsrc/filter.cc | 491 ---- external/trimesh/libsrc/lmsmooth.cc | 76 - external/trimesh/libsrc/mesh_align.cc | 78 - external/trimesh/libsrc/mesh_view.cc | 599 ----- external/trimesh/libsrc/remove.cc | 137 - external/trimesh/libsrc/reorder_verts.cc | 210 -- external/trimesh/libsrc/subdiv.cc | 396 --- external/trimesh/utilsrc/Makefile.am | 26 - external/trimesh/utilsrc/mesh_align.cc | 91 - external/trimesh/utilsrc/mesh_cat.cc | 84 - external/trimesh/utilsrc/mesh_cc.cc | 333 --- external/trimesh/utilsrc/mesh_filter.cc | 394 --- external/trimesh/utilsrc/mesh_make.cc | 976 ------- external/trimesh/utilsrc/mesh_shade.cc | 508 ---- external/trimesh/utilsrc/mesh_view.cc | 598 ----- milena/ChangeLog | 37 + milena/apps/mesh-segm-skel/Makefile.am | 76 +- milena/apps/mesh-segm-skel/io.hh | 205 -- .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 2 +- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 2 +- milena/apps/mesh-segm-skel/mesh-max-curv.cc | 125 - milena/apps/mesh-segm-skel/mesh-pinv-curv.cc | 105 - milena/apps/mesh-segm-skel/mesh-segm.cc | 230 -- milena/apps/mesh-segm-skel/mesh-skel.cc | 207 -- milena/apps/mesh-segm-skel/{trimesh => }/misc.hh | 3 +- milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 23 - milena/apps/mesh-segm-skel/test-mesh-segm.in | 26 - milena/apps/mesh-segm-skel/trimesh/README | 4 - milena/headers.mk | 2 + milena/mln/value/{int_s32.hh => int_s24.hh} | 20 +- milena/mln/value/{int_u8.hh => int_u24.hh} | 17 +- milena/tests/unit_test/unit-tests.mk | 4 + swilena/ChangeLog | 15 + swilena/Makefile.am | 4 +- swilena/image2d_int_u8.i | 15 +- swilena/{int_u32.i => int_u24.i} | 14 +- swilena/python/Makefile.am | 12 +- 168 files changed, 226 insertions(+), 53324 deletions(-) delete mode 100644 external/Makefile.am delete mode 100644 external/README delete mode 100644 external/trimesh/.gitignore delete mode 100644 external/trimesh/COPYING delete mode 100644 external/trimesh/ChangeLog delete mode 100644 external/trimesh/Makedefs.Darwin delete mode 100644 external/trimesh/Makedefs.Linux delete mode 100644 external/trimesh/Makedefs.Linux64 delete mode 100644 external/trimesh/Makedefs.SunOS delete mode 100644 external/trimesh/Makedefs.Win32 delete mode 100644 external/trimesh/Makefile.am delete mode 100644 external/trimesh/Makerules delete mode 100644 external/trimesh/README delete mode 100644 external/trimesh/configure.ac delete mode 100644 external/trimesh/gluit/COPYING.freeglut delete mode 100644 external/trimesh/gluit/COPYING.glui delete mode 100644 external/trimesh/gluit/Makefile.am delete mode 100644 external/trimesh/gluit/freeglut_callbacks.c delete mode 100644 external/trimesh/gluit/freeglut_cursor.c delete mode 100644 external/trimesh/gluit/freeglut_display.c delete mode 100644 external/trimesh/gluit/freeglut_ext.c delete mode 100644 external/trimesh/gluit/freeglut_font.c delete mode 100644 external/trimesh/gluit/freeglut_font_data.c delete mode 100644 external/trimesh/gluit/freeglut_gamemode.c delete mode 100644 external/trimesh/gluit/freeglut_geometry.c delete mode 100644 external/trimesh/gluit/freeglut_glutfont_definitions.c delete mode 100644 external/trimesh/gluit/freeglut_init.c delete mode 100644 external/trimesh/gluit/freeglut_internal.h delete mode 100644 external/trimesh/gluit/freeglut_joystick.c delete mode 100644 external/trimesh/gluit/freeglut_main.c delete mode 100644 external/trimesh/gluit/freeglut_menu.c delete mode 100644 external/trimesh/gluit/freeglut_misc.c delete mode 100644 external/trimesh/gluit/freeglut_overlay.c delete mode 100644 external/trimesh/gluit/freeglut_state.c delete mode 100644 external/trimesh/gluit/freeglut_stroke_mono_roman.c delete mode 100644 external/trimesh/gluit/freeglut_stroke_roman.c delete mode 100644 external/trimesh/gluit/freeglut_structure.c delete mode 100644 external/trimesh/gluit/freeglut_teapot.c delete mode 100644 external/trimesh/gluit/freeglut_teapot_data.h delete mode 100644 external/trimesh/gluit/freeglut_videoresize.c delete mode 100644 external/trimesh/gluit/freeglut_window.c delete mode 100644 external/trimesh/gluit/glui.cc delete mode 100644 external/trimesh/gluit/glui_add_controls.cc delete mode 100644 external/trimesh/gluit/glui_algebra3.cc delete mode 100644 external/trimesh/gluit/glui_algebra3.h delete mode 100644 external/trimesh/gluit/glui_arcball.cc delete mode 100644 external/trimesh/gluit/glui_arcball.h delete mode 100644 external/trimesh/gluit/glui_bitmap_img_data.cc delete mode 100644 external/trimesh/gluit/glui_bitmaps.cc delete mode 100644 external/trimesh/gluit/glui_button.cc delete mode 100644 external/trimesh/gluit/glui_checkbox.cc delete mode 100644 external/trimesh/gluit/glui_column.cc delete mode 100644 external/trimesh/gluit/glui_control.cc delete mode 100644 external/trimesh/gluit/glui_edittext.cc delete mode 100644 external/trimesh/gluit/glui_img_checkbox_0.c delete mode 100644 external/trimesh/gluit/glui_img_checkbox_0_dis.c delete mode 100644 external/trimesh/gluit/glui_img_checkbox_1.c delete mode 100644 external/trimesh/gluit/glui_img_checkbox_1_dis.c delete mode 100644 external/trimesh/gluit/glui_img_downarrow.c delete mode 100644 external/trimesh/gluit/glui_img_leftarrow.c delete mode 100644 external/trimesh/gluit/glui_img_listbox_down.c delete mode 100644 external/trimesh/gluit/glui_img_listbox_up.c delete mode 100644 external/trimesh/gluit/glui_img_listbox_up_dis.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_0.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_0_dis.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_1.c delete mode 100644 external/trimesh/gluit/glui_img_radiobutton_1_dis.c delete mode 100644 external/trimesh/gluit/glui_img_rightarrow.c delete mode 100644 external/trimesh/gluit/glui_img_spindown_0.c delete mode 100644 external/trimesh/gluit/glui_img_spindown_1.c delete mode 100644 external/trimesh/gluit/glui_img_spindown_dis.c delete mode 100644 external/trimesh/gluit/glui_img_spinup_0.c delete mode 100644 external/trimesh/gluit/glui_img_spinup_1.c delete mode 100644 external/trimesh/gluit/glui_img_spinup_dis.c delete mode 100644 external/trimesh/gluit/glui_img_uparrow.c delete mode 100644 external/trimesh/gluit/glui_listbox.cc delete mode 100644 external/trimesh/gluit/glui_mouse_iaction.cc delete mode 100644 external/trimesh/gluit/glui_node.cc delete mode 100644 external/trimesh/gluit/glui_panel.cc delete mode 100644 external/trimesh/gluit/glui_quaternion.cc delete mode 100644 external/trimesh/gluit/glui_quaternion.h delete mode 100644 external/trimesh/gluit/glui_radio.cc delete mode 100644 external/trimesh/gluit/glui_rollout.cc delete mode 100644 external/trimesh/gluit/glui_rotation.cc delete mode 100644 external/trimesh/gluit/glui_separator.cc delete mode 100644 external/trimesh/gluit/glui_slider.cc delete mode 100644 external/trimesh/gluit/glui_spinner.cc delete mode 100644 external/trimesh/gluit/glui_statictext.cc delete mode 100644 external/trimesh/gluit/glui_stdinc.h delete mode 100644 external/trimesh/gluit/glui_translation.cc delete mode 100644 external/trimesh/gluit/gluit.mk delete mode 100644 external/trimesh/include/Color.h delete mode 100644 external/trimesh/include/GL/freeglut.h delete mode 100644 external/trimesh/include/GL/freeglut_ext.h delete mode 100644 external/trimesh/include/GL/freeglut_std.h delete mode 100644 external/trimesh/include/GL/glui.h delete mode 100644 external/trimesh/include/GL/glut.h delete mode 100644 external/trimesh/include/GLCamera.h delete mode 100644 external/trimesh/include/ICP.h delete mode 100644 external/trimesh/include/KDtree.h delete mode 100644 external/trimesh/include/Makefile.am delete mode 100644 external/trimesh/include/TriMesh.h delete mode 100644 external/trimesh/include/TriMesh_algo.h delete mode 100644 external/trimesh/include/Vec.h delete mode 100644 external/trimesh/include/XForm.h delete mode 100644 external/trimesh/include/bsphere.h delete mode 100644 external/trimesh/include/lineqn.h delete mode 100644 external/trimesh/include/mempool.h delete mode 100644 external/trimesh/include/noise3d.h delete mode 100644 external/trimesh/include/timestamp.h delete mode 100644 external/trimesh/libsrc/GLCamera.cc delete mode 100644 external/trimesh/libsrc/ICP.cc delete mode 100644 external/trimesh/libsrc/KDtree.cc delete mode 100644 external/trimesh/libsrc/Makefile.am delete mode 100644 external/trimesh/libsrc/TriMesh_bounding.cc delete mode 100644 external/trimesh/libsrc/TriMesh_connectivity.cc delete mode 100644 external/trimesh/libsrc/TriMesh_curvature.cc delete mode 100644 external/trimesh/libsrc/TriMesh_grid.cc delete mode 100644 external/trimesh/libsrc/TriMesh_io.cc delete mode 100644 external/trimesh/libsrc/TriMesh_normals.cc delete mode 100644 external/trimesh/libsrc/TriMesh_pointareas.cc delete mode 100644 external/trimesh/libsrc/TriMesh_stats.cc delete mode 100644 external/trimesh/libsrc/TriMesh_tstrips.cc delete mode 100644 external/trimesh/libsrc/diffuse.cc delete mode 100644 external/trimesh/libsrc/edgeflip.cc delete mode 100644 external/trimesh/libsrc/faceflip.cc delete mode 100644 external/trimesh/libsrc/filter.cc delete mode 100644 external/trimesh/libsrc/lmsmooth.cc delete mode 100644 external/trimesh/libsrc/mesh_align.cc delete mode 100644 external/trimesh/libsrc/mesh_view.cc delete mode 100644 external/trimesh/libsrc/remove.cc delete mode 100644 external/trimesh/libsrc/reorder_verts.cc delete mode 100644 external/trimesh/libsrc/subdiv.cc delete mode 100644 external/trimesh/utilsrc/Makefile.am delete mode 100644 external/trimesh/utilsrc/mesh_align.cc delete mode 100644 external/trimesh/utilsrc/mesh_cat.cc delete mode 100644 external/trimesh/utilsrc/mesh_cc.cc delete mode 100644 external/trimesh/utilsrc/mesh_filter.cc delete mode 100644 external/trimesh/utilsrc/mesh_make.cc delete mode 100644 external/trimesh/utilsrc/mesh_shade.cc delete mode 100644 external/trimesh/utilsrc/mesh_view.cc delete mode 100644 milena/apps/mesh-segm-skel/io.hh delete mode 100644 milena/apps/mesh-segm-skel/mesh-max-curv.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-pinv-curv.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-segm.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-skel.cc rename milena/apps/mesh-segm-skel/{trimesh => }/misc.hh (99%) delete mode 100644 milena/apps/mesh-segm-skel/test-mesh-max-curv.in delete mode 100755 milena/apps/mesh-segm-skel/test-mesh-segm.in delete mode 100644 milena/apps/mesh-segm-skel/trimesh/README copy milena/mln/value/{int_s32.hh => int_s24.hh} (81%) copy milena/mln/value/{int_u8.hh => int_u24.hh} (81%) copy swilena/{int_u32.i => int_u24.i} (83%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-40-gd4b9819 Fix Swilena's build.
by Roland Levillain 05 Oct '12

05 Oct '12

* image2d_int_u8.i: Use int_u24 instead of int_u32 to avoid overflow problems in mln::metal::math::pow. --- swilena/ChangeLog | 7 +++++++ swilena/image2d_int_u8.i | 15 ++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6047f18..f1a243b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Fix Swilena's build. + + * image2d_int_u8.i: Use int_u24 instead of int_u32 to avoid + overflow problems in mln::metal::math::pow. + +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Wrap mln::value::int_u24. * int_u24.i: New. diff --git a/swilena/image2d_int_u8.i b/swilena/image2d_int_u8.i index 109f8bc..1bcb1d4 100644 --- a/swilena/image2d_int_u8.i +++ b/swilena/image2d_int_u8.i @@ -1,5 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -74,17 +75,17 @@ instantiate_morpho(mln::image2d< mln::value::int_u<8> >, mln::neighb2d) /*---------------------------------------. -| image2d<int_u8> and image2d<int_u32>. | +| image2d<int_u8> and image2d<int_u24>. | `---------------------------------------*/ -instantiate_meyer_wst(meyer_wst32, - mln::value::int_u<32>, +instantiate_meyer_wst(meyer_wst24, + mln::value::int_u<24>, mln::image2d< mln::value::int_u<8> >, mln::neighb2d) // FIXME: Rearrange and move this elsewhere. -instantiate_image2d(image2d_int_u32, mln::value::int_u<32>) +instantiate_image2d(image2d_int_u24, mln::value::int_u<24>) -%template(println32) mln::debug::println< - mln::image2d< mln::value::int_u<32> > +%template(println24) mln::debug::println< + mln::image2d< mln::value::int_u<24> > >; -- 1.7.2.5

1 0

olena-2.0-39-g996b7f6 Wrap mln::value::int_u24.
by Roland Levillain 05 Oct '12

05 Oct '12

* int_u24.i: New. * Makefile.am (wrappers): Add int_u24.i. * python/Makefile.am: Generate Python wrapper from int_u24.i. --- swilena/ChangeLog | 8 ++++++++ swilena/Makefile.am | 4 +++- swilena/{int_u32.i => int_u24.i} | 14 +++++++------- swilena/python/Makefile.am | 12 +++++++++++- 4 files changed, 29 insertions(+), 9 deletions(-) copy swilena/{int_u32.i => int_u24.i} (83%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index c5aed82..6047f18 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,11 @@ +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + + Wrap mln::value::int_u24. + + * int_u24.i: New. + * Makefile.am (wrappers): Add int_u24.i. + * python/Makefile.am: Generate Python wrapper from int_u24.i. + 2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> Clean up Swilena Makefiles. diff --git a/swilena/Makefile.am b/swilena/Makefile.am index 109fb2e..ee2d642 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -42,6 +43,7 @@ wrappers = \ dpoint2d.i \ image2d_int.i \ image2d_int_u8.i \ + int_u24.i \ int_u32.i \ int_u8.i \ neighb2d.i \ diff --git a/swilena/int_u32.i b/swilena/int_u24.i similarity index 83% copy from swilena/int_u32.i copy to swilena/int_u24.i index b11662b..fe07b51 100644 --- a/swilena/int_u32.i +++ b/swilena/int_u24.i @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,17 +24,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file int_u32.i -/// \brief A wrapper of mln::value::int_u32. +/// \file int_u24.i +/// \brief A wrapper of mln::value::int_u24. -%module int_u32 +%module int_u24 %include "int_u.ixx" %{ -#include "mln/value/int_u32.hh" +#include "mln/value/int_u24.hh" %} -%include "mln/value/int_u32.hh" +%include "mln/value/int_u24.hh" -%template (int_u32) mln::value::int_u<32>; +%template (int_u24) mln::value::int_u<24>; diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index e522233..6bdc815 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -125,6 +125,16 @@ CLEANFILES += $(nodist__int_u8_la_SOURCES) int_u8.py int_u8.py[co] @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u8-wrap.Pcc@am__quote@ nodist_python_PYTHON += int_u8.py +## int_u24. +pyexec_LTLIBRARIES += _int_u24.la +nodist__int_u24_la_SOURCES = int_u24-wrap.cc +_int_u24_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__int_u24_la_SOURCES) int_u24.py int_u24.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u24-wrap.Pcc@am__quote@ +nodist_python_PYTHON += int_u24.py + ## int_u32. pyexec_LTLIBRARIES += _int_u32.la nodist__int_u32_la_SOURCES = int_u32-wrap.cc -- 1.7.2.5

1 0

olena-2.0-38-g26f95b1 Provide typedefs mln::value::int_s24 and mln::value::int_u24.
by Roland Levillain 05 Oct '12

05 Oct '12

* mln/value/int_s24.hh, * mln/value/int_u24.hh: New. --- milena/ChangeLog | 8 ++++++++ milena/headers.mk | 2 ++ milena/mln/value/{int_s32.hh => int_s24.hh} | 20 ++++++++------------ milena/mln/value/{int_u8.hh => int_u24.hh} | 17 +++++++---------- milena/tests/unit_test/unit-tests.mk | 4 ++++ 5 files changed, 29 insertions(+), 22 deletions(-) copy milena/mln/value/{int_s32.hh => int_s24.hh} (81%) copy milena/mln/value/{int_u8.hh => int_u24.hh} (81%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 266f7d4..99a5929 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Provide typedefs mln::value::int_s24 and mln::value::int_u24. + + * mln/value/int_s24.hh, + * mln/value/int_u24.hh: + New. + +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Rename Trimesh reimplementations in apps/mesh-segm-skel/. * apps/mesh-segm-skel/trimesh/misc.hh: Move... diff --git a/milena/headers.mk b/milena/headers.mk index 3d93101..20f2f35 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1215,11 +1215,13 @@ mln/value/graylevel_f.hh \ mln/value/hsl.hh \ mln/value/int_s.hh \ mln/value/int_s16.hh \ +mln/value/int_s24.hh \ mln/value/int_s32.hh \ mln/value/int_s8.hh \ mln/value/int_u.hh \ mln/value/int_u12.hh \ mln/value/int_u16.hh \ +mln/value/int_u24.hh \ mln/value/int_u32.hh \ mln/value/int_u8.hh \ mln/value/int_u_sat.hh \ diff --git a/milena/mln/value/int_s32.hh b/milena/mln/value/int_s24.hh similarity index 81% copy from milena/mln/value/int_s32.hh copy to milena/mln/value/int_s24.hh index 4303597..e947b47 100644 --- a/milena/mln/value/int_s32.hh +++ b/milena/mln/value/int_s24.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,13 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_INT_S32_HH -# define MLN_VALUE_INT_S32_HH +#ifndef MLN_VALUE_INT_S24_HH +# define MLN_VALUE_INT_S24_HH -/*! \file - * - * \brief Define the alias value::int_s32. - */ +/// \file +/// \brief Define the alias mln::value::int_s24. # include <mln/value/int_s.hh> @@ -40,14 +38,12 @@ namespace mln namespace value { - - /// Alias for signed 32-bit integers. - typedef int_s<32> int_s32; - + /// Alias for signed 24-bit integers. + typedef mln::value::int_s<24> int_s24; } // end of namespace mln::value } // end of namespace mln -#endif // ! MLN_VALUE_INT_S32_HH +#endif // ! MLN_VALUE_INT_S24_HH diff --git a/milena/mln/value/int_u8.hh b/milena/mln/value/int_u24.hh similarity index 81% copy from milena/mln/value/int_u8.hh copy to milena/mln/value/int_u24.hh index 5260f42..1a4935d 100644 --- a/milena/mln/value/int_u8.hh +++ b/milena/mln/value/int_u24.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,12 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_INT_U8_HH -# define MLN_VALUE_INT_U8_HH +#ifndef MLN_VALUE_INT_U24_HH +# define MLN_VALUE_INT_U24_HH /// \file -/// -/// Define the alias value::int_u8. +/// \brief Define the alias mln::value::int_u24. # include <mln/value/int_u.hh> @@ -39,14 +38,12 @@ namespace mln namespace value { - - /// Alias for unsigned 8-bit integers. - typedef mln::value::int_u<8> int_u8; - + /// Alias for unsigned 24-bit integers. + typedef mln::value::int_u<24> int_u24; } // end of namespace mln::value } // end of namespace mln -#endif // ! MLN_VALUE_INT_U8_HH +#endif // ! MLN_VALUE_INT_U24_HH diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index d2dde46..2d2864e 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1257,11 +1257,13 @@ mln_value_graylevel_f \ mln_value_hsl \ mln_value_int_s \ mln_value_int_s16 \ +mln_value_int_s24 \ mln_value_int_s32 \ mln_value_int_s8 \ mln_value_int_u \ mln_value_int_u12 \ mln_value_int_u16 \ +mln_value_int_u24 \ mln_value_int_u32 \ mln_value_int_u8 \ mln_value_int_u_sat \ @@ -2506,11 +2508,13 @@ mln_value_graylevel_f_SOURCES = mln_value_graylevel_f.cc mln_value_hsl_SOURCES = mln_value_hsl.cc mln_value_int_s_SOURCES = mln_value_int_s.cc mln_value_int_s16_SOURCES = mln_value_int_s16.cc +mln_value_int_s24_SOURCES = mln_value_int_s24.cc mln_value_int_s32_SOURCES = mln_value_int_s32.cc mln_value_int_s8_SOURCES = mln_value_int_s8.cc mln_value_int_u_SOURCES = mln_value_int_u.cc mln_value_int_u12_SOURCES = mln_value_int_u12.cc mln_value_int_u16_SOURCES = mln_value_int_u16.cc +mln_value_int_u24_SOURCES = mln_value_int_u24.cc mln_value_int_u32_SOURCES = mln_value_int_u32.cc mln_value_int_u8_SOURCES = mln_value_int_u8.cc mln_value_int_u_sat_SOURCES = mln_value_int_u_sat.cc -- 1.7.2.5

1 0

olena-2.0-37-gfddc057 Update texi2dvi from upstream.
by Roland Levillain 05 Oct '12

05 Oct '12

* build-aux/texi2dvi: Update from CVS Texinfo. --- ChangeLog | 6 ++ build-aux/texi2dvi | 146 +++++++++++++++++++++++++++++---------------------- 2 files changed, 89 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index c65aef6..efd4106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Update texi2dvi from upstream. + + * build-aux/texi2dvi: Update from CVS Texinfo. + +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Remove Trimesh sources from Olena. * external/trimesh/, diff --git a/build-aux/texi2dvi b/build-aux/texi2dvi index 7d1f2ab..1f346e1 100755 --- a/build-aux/texi2dvi +++ b/build-aux/texi2dvi @@ -1,9 +1,10 @@ #! /bin/sh # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources. -# $Id: texi2dvi,v 1.157 2010/02/09 18:37:08 karl Exp $ +# $Id: texi2dvi,v 1.173 2012/04/20 18:52:48 karl Exp $ # -# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +# Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,7 +34,7 @@ unset RUNNING_KSH set -e # This string is expanded automatically when this file is checked out. -rcs_revision='$Revision: 1.157 $' +rcs_revision='$Revision: 1.173 $' rcs_version=`set - $rcs_revision; echo $2` program=`echo $0 | sed -e 's!.*/!!'` @@ -58,6 +59,7 @@ quiet=false # let the tools' message be displayed recode=false set_language= src_specials= +shell_escape= latex2html=hevea # or set to tex4ht textra= # Extra TeX commands to insert in the input file. txiprereq=19990129 # minimum texinfo.tex version with macro expansion @@ -129,13 +131,15 @@ test -n "$TEX" && test -d "$TEX" && unset TEX test_local () { local foo=foo } - test_local + test_local >/dev/null 2>&1 test $foo = bar -) || local () { +) || eval ' +local () { case $1 in *=*) eval "$1";; esac } +' # cd_orig @@ -186,8 +190,8 @@ absolute () local rel rel=$orig_pwd/`func_dirname "$1"` if test -d "$rel"; then - (cd "$rel" 2>/dev/null && - local n + (cd "$rel" 2>/dev/null \ + && local n n=`pwd`/`basename "$1"`"$slashes" echo "$n") else @@ -218,7 +222,7 @@ ensure_dir () # error EXIT_STATUS LINE1 LINE2... # -------------------------------- -# Report an error and exit with failure if EXIT_STATUS is non null. +# Report an error and exit with failure if EXIT_STATUS is non-null. error () { local s="$1" @@ -248,8 +252,8 @@ findprog () # design decisions, so there is little chance to make them consistent.) # Thusly, it seems to be difficult to make use of these enhancements. # - if { test -f "$dir/$1" && test -x "$dir/$1"; } || - { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then + if { test -f "$dir/$1" && test -x "$dir/$1"; } \ + || { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then return 0 fi done @@ -274,8 +278,8 @@ report () run () { verbose "Running $@" - "$@" 2>&5 1>&2 || - error 1 "$1 failed" + "$@" 2>&5 1>&2 \ + || error 1 "$1 failed" } @@ -295,8 +299,8 @@ usage () # where % denotes the eol character. cat <<EOF Usage: $program [OPTION]... FILE... - texi2pdf [OPTION]... FILE... - pdftexi2dvi [OPTION]... FILE... + or: texi2pdf [OPTION]... FILE... + or: pdftexi2dvi [OPTION]... FILE... Run each Texinfo or (La)TeX FILE through TeX in turn until all cross-references are resolved, building all indices. The directory @@ -316,13 +320,21 @@ General options: -b, --batch no interaction -D, --debug turn on shell debugging (set -x) -h, --help display this help and exit successfully - -o, --output=OFILE leave output in OFILE (implies --clean); - only one input FILE may be specified in this case + -o, --output=OFILE leave output in OFILE; only one input FILE is allowed -q, --quiet no output unless errors (implies --batch) -s, --silent same as --quiet -v, --version display version information and exit successfully -V, --verbose report on what is done +Output format: + --dvi output a DVI file [default] + --dvipdf output a PDF file via DVI (using a dvi-to-pdf program) + --html output an HTML file from LaTeX, using HeVeA + --info output an Info file from LaTeX, using HeVeA + -p, --pdf use pdftex or pdflatex for processing + --ps output a PostScript file via DVI (using dvips) + --text output a plain text file from LaTeX, using HeVeA + TeX tuning: -@ use @input instead of \input for preloaded Texinfo -e, -E, --expand force macro expansion using makeinfo @@ -331,20 +343,12 @@ TeX tuning: --no-line-error do not pass --file-line-error to TeX -r, --recode call recode before TeX to translate input --recode-from=ENC recode from ENC to the @documentencoding + --shell-escape pass --shell-escape to TeX --src-specials pass --src-specials to TeX -t, --command=CMD insert CMD in copy of input file or --texinfo=CMD multiple values accumulate --translate-file=FILE use given charset translation file for TeX -Output format: - --dvi output a DVI file [default] - --dvipdf output a PDF file via DVI (using dvipdf) - --html output an HTML file. Use HeVeA for LaTeX files - --info output an Info file. Use HeVeA for LaTeX files - -p, --pdf use pdftex or pdflatex for processing - --ps output a PDF file via DVI (using dvips) - --text output a plain text file. Use HeVeA for LaTeX files - Build modes: --build=MODE specify the treatment of auxiliary files [$build_mode] --tidy same as --build=tidy @@ -374,7 +378,7 @@ Using the \`tidy' mode brings several advantages: directories are stored there. - clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d or --build-dir=\$HOME/.t2d. - - the output file is updated after every succesful TeX run, for + - the output file is updated after every successful TeX run, for sake of concurrent visualization of the output. In a \`local' build the viewer stops during the whole TeX run. - if the compilation fails, the previous state of the output file @@ -384,13 +388,19 @@ Using the \`tidy' mode brings several advantages: On the other hand, because \`tidy' compilation takes place in another directory, occasionally TeX won't be able to find some files (e.g., when -using \\graphicspath): in that case use -I to specify the additional +using \\graphicspath): in that case, use -I to specify the additional directories to consider. -The values of the BIBTEX, DVIPDF, DVIPS, LATEX, MAKEINDEX, MAKEINFO, -PDFLATEX, PDFTEX, TEX, TEXINDEX, and THUMBPDF environment variables are used -to run those commands, if they are set. Any CMD strings are added after -@setfilename for Texinfo input, in the first line for LaTeX input. +The values of the BIBTEX, DVIPDF, DVIPS, HEVEA, LATEX, MAKEINDEX, +MAKEINFO, PDFLATEX, PDFTEX, T4HT, TEX, TEX4HT, TEXINDEX, and THUMBPDF +environment variables are used to run those commands, if they are set. + +Regarding --dvipdf, if DVIPDF is not set in the environment, the +following programs are looked for (in this order): dvipdfmx dvipdfm +dvipdf dvi2pdf dvitopdf. + +Any CMD strings are added after @setfilename for Texinfo input, or in +the first line for LaTeX input. Report bugs to bug-texinfo(a)gnu.org, general questions and discussion to help-texinfo(a)gnu.org. @@ -414,13 +424,13 @@ verbose () # version # ------- -# Display version info and exit succesfully. +# Display version info and exit successfully. version () { cat <<EOF -texi2dvi (GNU Texinfo 4.13) $rcs_version +texi2dvi (GNU Texinfo 4.13+dev) $rcs_version -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -673,7 +683,10 @@ destdir () # an auxiliary file with the same base name. move_to_dest () { - # If we built in place, there is nothing to install, leave. +# echo "move_to_dest $*, tidy=$tidy, oname=$oname" + + # If we built in place and have no output name, there is nothing to + # do, so just return. case $tidy:$oname in false:) return;; esac @@ -686,14 +699,17 @@ move_to_dest () for file do - test -f "$file" || - error 1 "no such file or directory: $file" + test -f "$file" \ + || error 1 "no such file or directory: $file" case $tidy:$oname in true:) destdir=$orig_pwd destfile=$destdir/$file;; - *:*) destfile=`output_base_name "$file"` + true:*) destfile=`output_base_name "$file"` destdir=`dirname "$destfile"`;; + false:*) destfile=$oname + destdir=`dirname "$destfile"`;; esac + # We want to compare the source location and the output location, # and if they are different, do the move. But if they are the # same, we must preserve the source. Since we can't assume @@ -987,6 +1003,9 @@ run_tex () # source, given a sufficiently smart editor), if specified. test -n "$src_specials" && cmd="$cmd $src_specials" + # Tell TeX to allow running external executables + test -n "$shell_escape" && cmd="$cmd $shell_escape" + # Tell TeX to be batch if requested. if $batch; then # \batchmode does not show terminal output at all, so we don't @@ -1103,9 +1122,10 @@ run_bibtex () # won't know that if the index files are out of date or nonexistent. run_index () { - local index_files=`generated_files_get $in_noext index_file_p` - test -n "$index_files" || - return 0 + local index_files + index_files=`generated_files_get $in_noext index_file_p` + test -n "$index_files" \ + || return 0 : ${MAKEINDEX:=makeindex} : ${TEXINDEX:=texindex} @@ -1154,7 +1174,7 @@ run_tex4ht () { case $in_lang:$latex2html:`out_lang_tex` in latex:tex4ht:html) - : ${TEX4HT=tex4ht} ${T4HT=t4ht} + : ${TEX4HT:=tex4ht} ${T4HT:=t4ht} run "$TEX4HT" "-f/$in_noext" # Do not remove the / after the destdir. run "$T4HT" "-d`destdir`/" "-f/$in_noext" @@ -1191,8 +1211,7 @@ run_dvipdf () { # Find which dvi->pdf program is available. if test -z "$dvipdf"; then - for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf; - do + for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf; do if findprog $i; then dvipdf=$i fi @@ -1259,8 +1278,8 @@ run_tex_suite () move_to_dest "$in_noext.`out_lang_ext`" ;; *:ps) - : {DVIPS=dvips} - $DVIPS -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`" + : ${DVIPS:=dvips} + run $DVIPS -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`" move_to_dest "$in_noext.`out_lang_ext`" ;; esac @@ -1274,7 +1293,7 @@ run_tex_suite () # A sed script that preprocesses Texinfo sources in order to keep the -# iftex sections only. We want to remove non TeX sections, and comment +# iftex sections only. We want to remove non-TeX sections, and comment # (with `@c _texi2dvi') TeX sections so that makeinfo does not try to # parse them. Nevertheless, while commenting TeX sections, don't # comment @macro/@end macro so that makeinfo does propagate them. @@ -1330,22 +1349,21 @@ run_makeinfo () # Check if texinfo.tex performs macro expansion by looking for # its version. The version is a date of the form YEAR-MO-DA. # We don't need to use [0-9] to match the digits since anyway - # the comparison with $txiprereq, a number, will fail with non - # digits. + # the comparison with $txiprereq, a number, will fail with non-digits. # Run in a temporary directory to avoid leaving files. version_test_dir=$t2ddir/version_test ensure_dir "$version_test_dir" - ( + if ( cd "$version_test_dir" echo '\input texinfo.tex @bye' >txiversion.tex # Be sure that if tex wants to fail, it is not interactive: # close stdin. $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err - ) - if test $? != 0; then + ); then :; else + report "texinfo.tex appears to be broken:" cat "$version_test_dir/txiversion.out" cat "$version_test_dir/txiversion.err" >&2 - error 1 "texinfo.tex appears to be broken, quitting." + error 1 "quitting." fi eval `sed -n 's/^.*\[$.*$version $....$-$..$-$..$.*$/txiformat=\1 txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"` verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..." @@ -1699,6 +1717,7 @@ while test x"$1" != x"$arg_sep"; do -r | --recode) recode=true;; --recode-from) shift; recode=true; recode_from="$1";; --src-specials) src_specials=--src-specials;; + --shell-escape) shell_escape=--shell-escape;; --tex4ht) latex2html=tex4ht;; -t | --texinfo | --command ) shift; textra="$textra\\ "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;; @@ -1800,14 +1819,15 @@ fi # Enable tracing, and auxiliary tools output. -# -# Should be used where you'd typically use /dev/null to throw output -# away. But sometimes it is convenient to see that output (e.g., from -# a grep) to aid debugging. Especially debugging at distance, via the -# user. +# +# This fd should be used where you'd typically use /dev/null to throw +# output away. But sometimes it is convenient to see that output (e.g., +# from a grep) to aid debugging. Especially debugging at distance, via +# the user. +# if $debug; then exec 6>&1 - set -x + set -vx else exec 6>/dev/null fi @@ -1848,15 +1868,15 @@ input_file_name_decode () # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex), # prepend `./' in order to avoid that the tools take it as an option. - echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \ + echo "$command_line_filename" | LC_ALL=C $EGREP '^(/|[A-Za-z]:/)' >&6 \ || command_line_filename="./$command_line_filename" # See if the file exists. If it doesn't we're in trouble since, even # though the user may be able to reenter a valid filename at the tex # prompt (assuming they're attending the terminal), this script won't # be able to find the right xref files and so forth. - test -r "$command_line_filename" || - error 1 "cannot read $command_line_filename, skipping." + test -r "$command_line_filename" \ + || error 1 "cannot read $command_line_filename, skipping." # Get the name of the current directory. in_dir=`func_dirname "$command_line_filename"` -- 1.7.2.5

1 0

olena-2.0-35-g9e4ce85 Rename Trimesh reimplementations in apps/mesh-segm-skel/.
by Roland Levillain 05 Oct '12

05 Oct '12

* apps/mesh-segm-skel/trimesh/misc.hh: Move... * apps/mesh-segm-skel/misc.hh: ...here. Update comments. * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, * apps/mesh-segm-skel/mesh-complex-max-curv.cc: Adjust. * apps/mesh-segm-skel/trimesh/README: Remove. * apps/mesh-segm-skel/Makefile.am (noinst_HEADERS, EXTRA_DIST): Adjust. --- milena/ChangeLog | 14 ++++++++++++++ milena/apps/mesh-segm-skel/Makefile.am | 4 +--- .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 2 +- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 2 +- milena/apps/mesh-segm-skel/{trimesh => }/misc.hh | 3 ++- milena/apps/mesh-segm-skel/trimesh/README | 4 ---- 6 files changed, 19 insertions(+), 10 deletions(-) rename milena/apps/mesh-segm-skel/{trimesh => }/misc.hh (99%) delete mode 100644 milena/apps/mesh-segm-skel/trimesh/README diff --git a/milena/ChangeLog b/milena/ChangeLog index bb0f61c..266f7d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Rename Trimesh reimplementations in apps/mesh-segm-skel/. + + * apps/mesh-segm-skel/trimesh/misc.hh: Move... + * apps/mesh-segm-skel/misc.hh: ...here. + Update comments. + * apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv.cc: + Adjust. + * apps/mesh-segm-skel/trimesh/README: Remove. + * apps/mesh-segm-skel/Makefile.am (noinst_HEADERS, EXTRA_DIST): + Adjust. + +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Remove anything depending on the Trimesh library. * apps/mesh-segm-skel/io.hh, diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 55ef805..37e6b6a 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -34,9 +34,7 @@ MOSTLYCLEANFILES = # A Milena re-implementation of some features from Trimesh. This code # is completely independent from the Trimesh library. -# FIXME: Change the name of this directory, as it is confusing. -noinst_HEADERS = trimesh/misc.hh -EXTRA_DIST = trimesh/README +noinst_HEADERS = misc.hh ## Segmentation. ## ------------ diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc index 15ea4fb..f766005 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc @@ -48,7 +48,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.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc index 6fe5032..85a0adc 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc @@ -51,7 +51,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/trimesh/misc.hh b/milena/apps/mesh-segm-skel/misc.hh similarity index 99% rename from milena/apps/mesh-segm-skel/trimesh/misc.hh rename to milena/apps/mesh-segm-skel/misc.hh index 58fef6b..60c009e 100644 --- a/milena/apps/mesh-segm-skel/trimesh/misc.hh +++ b/milena/apps/mesh-segm-skel/misc.hh @@ -24,7 +24,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// FIXME: Split this file. +// FIXME: Split this file and eventually move its content into the +// library. // FIXME: Address license-related issues? #ifndef MILENA_APPS_MESH_SEGM_SKEL_MISC_HH diff --git a/milena/apps/mesh-segm-skel/trimesh/README b/milena/apps/mesh-segm-skel/trimesh/README deleted file mode 100644 index 20fe1e7..0000000 --- a/milena/apps/mesh-segm-skel/trimesh/README +++ /dev/null @@ -1,4 +0,0 @@ -Files from this directory are adaptation of some Trimesh code into -Milena. We might want to push them into Milena someday. - -Don't forget to add authors / copyright owners where necessary. -- 1.7.2.5

1 0

olena-2.0-34-g4eb9bb1 No longer configure tests of apps depending on Trimesh.
by Roland Levillain 05 Oct '12

05 Oct '12

* configure.ac: No longer configure milena/apps/mesh-segm-skel/test-mesh-max-curv nor milena/apps/mesh-segm-skel/test-mesh-segm. --- ChangeLog | 8 ++++++++ configure.ac | 6 +----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d7436a..c504471 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + + No longer configure tests of apps depending on Trimesh. + + * configure.ac: No longer configure + milena/apps/mesh-segm-skel/test-mesh-max-curv nor + milena/apps/mesh-segm-skel/test-mesh-segm. + 2012-06-20 Roland Levillain <roland(a)lrde.epita.fr> Ensure `bootstrap -r' regenerates all files. diff --git a/configure.ac b/configure.ac index 1ca8d4d..9b4195d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -563,12 +563,8 @@ AC_CONFIG_FILES([ # Configure tests. # FIXME: Consider using `sed' instead of `configure' to create these # tests for the sake of speed. -AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv], [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv]) -AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm], [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm], -- 1.7.2.5

1 0

olena-2.0-33-gaa29f39 Remove anything depending on the Trimesh library.
by Roland Levillain 05 Oct '12

05 Oct '12

* apps/mesh-segm-skel/io.hh, * apps/mesh-segm-skel/mesh-max-curv.cc, * apps/mesh-segm-skel/mesh-pinv-curv.cc, * apps/mesh-segm-skel/mesh-segm.cc, * apps/mesh-segm-skel/mesh-skel.cc, * apps/mesh-segm-skel/test-mesh-max-curv.in, * apps/mesh-segm-skel/test-mesh-segm.in: Remove. * apps/mesh-segm-skel/Makefile.am: Remove anything related to the Trimesh library. --- milena/ChangeLog | 15 ++ milena/apps/mesh-segm-skel/Makefile.am | 72 +------ milena/apps/mesh-segm-skel/io.hh | 205 ------------------- milena/apps/mesh-segm-skel/mesh-max-curv.cc | 125 ------------ milena/apps/mesh-segm-skel/mesh-pinv-curv.cc | 105 ---------- milena/apps/mesh-segm-skel/mesh-segm.cc | 230 ---------------------- milena/apps/mesh-segm-skel/mesh-skel.cc | 207 ------------------- milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 23 --- milena/apps/mesh-segm-skel/test-mesh-segm.in | 26 --- 9 files changed, 21 insertions(+), 987 deletions(-) delete mode 100644 milena/apps/mesh-segm-skel/io.hh delete mode 100644 milena/apps/mesh-segm-skel/mesh-max-curv.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-pinv-curv.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-segm.cc delete mode 100644 milena/apps/mesh-segm-skel/mesh-skel.cc delete mode 100644 milena/apps/mesh-segm-skel/test-mesh-max-curv.in delete mode 100755 milena/apps/mesh-segm-skel/test-mesh-segm.in diff --git a/milena/ChangeLog b/milena/ChangeLog index 83f5520..bb0f61c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,18 @@ +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + + Remove anything depending on the Trimesh library. + + * apps/mesh-segm-skel/io.hh, + * apps/mesh-segm-skel/mesh-max-curv.cc, + * apps/mesh-segm-skel/mesh-pinv-curv.cc, + * apps/mesh-segm-skel/mesh-segm.cc, + * apps/mesh-segm-skel/mesh-skel.cc, + * apps/mesh-segm-skel/test-mesh-max-curv.in, + * apps/mesh-segm-skel/test-mesh-segm.in: + Remove. + * apps/mesh-segm-skel/Makefile.am: Remove anything related to the + Trimesh library. + 2012-06-15 Roland Levillain <roland(a)lrde.epita.fr> Remove dependencies on suppressed files. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 9768f25..55ef805 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -14,25 +15,11 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# Linking with gluit and GLUT/OpenGL. -gluit_builddir = $(top_builddir)/external/trimesh/gluit -include $(top_srcdir)/external/trimesh/gluit/gluit.mk - -# Find Milena and trimesh headers. +# Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) -# Find the trimesh library and its dependencies. -# -# Don't use TRIMESH_LDFLAGS, since it looks like the LDFLAGS of the -# program `TRIMESH' and triggers Automake warnings; use -# LDFLAGS_trimesh instead. Likewise for CPPFLAGS_trimesh and -# LDADD_trimesh, for symmetry reasons. -LDFLAGS_trimesh = $(GLFLAGS) -LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) - bin_PROGRAMS = TESTS = @@ -41,56 +28,9 @@ MOSTLYCLEANFILES = # FIXME: Have program names embed the type of structure used (either # graph or complex). -## FIXME: Likewise, programs' names should reflect a dependency on -## Trimesh, if any. - -## ------------------------------------------------ ## -## Graph-based applications, depending on Trimesh. ## -## ------------------------------------------------ ## - -if ENABLE_TRIMESH -# bin_PROGRAMS += mesh-segm mesh-skel -# -# mesh_segm_SOURCES = mesh-segm.cc io.hh -# mesh_segm_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) -# mesh_segm_LDFLAGS = $(LDFLAGS_trimesh) -# mesh_segm_LDADD = $(LDADD_trimesh) -# -# TESTS += test-mesh-segm -# MOSTLYCLEANFILES += socket-segm.off teapot-segm.off - -# FIXME: mesh_skel is unfinished. Anyway, it should be superseded by -# another program, using no Trimesh code. - -# mesh_skel_SOURCES = mesh-skel.cc io.hh -# mesh_skel_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) -# mesh_skel_LDFLAGS = $(LDFLAGS_trimesh) -# mesh_skel_LDADD = $(LDADD_trimesh) -endif ENABLE_TRIMESH - -## -------------------------------------------------- ## -## Complex-based applications, depending on Trimesh. ## -## -------------------------------------------------- ## - -if ENABLE_TRIMESH - bin_PROGRAMS += mesh-pinv-curv mesh-max-curv - - mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh - mesh_pinv_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) - mesh_pinv_curv_LDFLAGS = $(LDFLAGS_trimesh) - mesh_pinv_curv_LDADD = $(LDADD_trimesh) - - mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh - mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) - mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) - mesh_max_curv_LDADD = $(LDADD_trimesh) - TESTS += test-mesh-max-curv - MOSTLYCLEANFILES += teapot-max-curv-skel.off -endif ENABLE_TRIMESH - -## ---------------------------------------------------- ## -## Complex-based applications, independent of Trimesh. ## -## ---------------------------------------------------- ## +## ---------------------------- ## +## Complex-based applications. ## +## ---------------------------- ## # A Milena re-implementation of some features from Trimesh. This code # is completely independent from the Trimesh library. diff --git a/milena/apps/mesh-segm-skel/io.hh b/milena/apps/mesh-segm-skel/io.hh deleted file mode 100644 index 4d7516c..0000000 --- a/milena/apps/mesh-segm-skel/io.hh +++ /dev/null @@ -1,205 +0,0 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// 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. - -#ifndef APPS_MESH_SEGM_SKEL_IO_HH -# define APPS_MESH_SEGM_SKEL_IO_HH - -/// \file apps/mesh-segm-skel/io.hh -/// \brief I/O routines adapted from TriMesh's ones. - -#include <cstdio> - -#include <algorithm> - -#include <TriMesh.h> - -#include <mln/value/rgb8.hh> - - -/// Taken from TriMesh_io.cc -/// \{ -// Convert colors float -> uchar -inline unsigned char color2uchar(float p) -{ - return min(max(int(255.0f * p + 0.5f), 0), 255); -} - -// Write a bunch of vertices to an ASCII file -inline void write_verts_asc(TriMesh *mesh, FILE *f, - const char *before_vert, - const char *before_norm, - const char *before_color, - bool float_color, - const char *before_conf, - const char *after_line) -{ - for (unsigned i = 0; i < mesh->vertices.size(); i++) { - fprintf(f, "%s%.7g %.7g %.7g", before_vert, - mesh->vertices[i][0], - mesh->vertices[i][1], - mesh->vertices[i][2]); - if (!mesh->normals.empty() && before_norm) - fprintf(f, "%s%.7g %.7g %.7g", before_norm, - mesh->normals[i][0], - mesh->normals[i][1], - mesh->normals[i][2]); - if (!mesh->colors.empty() && before_color && float_color) - fprintf(f, "%s%.7g %.7g %.7g", before_color, - mesh->colors[i][0], - mesh->colors[i][1], - mesh->colors[i][2]); - if (!mesh->colors.empty() && before_color && !float_color) - fprintf(f, "%s%d %d %d", before_color, - color2uchar(mesh->colors[i][0]), - color2uchar(mesh->colors[i][1]), - color2uchar(mesh->colors[i][2])); - if (!mesh->confidences.empty() && before_conf) - fprintf(f, "%s%.7g", before_conf, mesh->confidences[i]); - fprintf(f, "%s\n", after_line); - } -} -/// \} - - -/// Taken and adapted from TriMesh_io.cc -/// \{ - -/*----------------------. -| OFF with color data. | -`----------------------*/ - -/// Write a bunch of faces to an ASCII file with colors. -inline void write_faces_asc_colored(TriMesh *mesh, - const std::vector<mln::value::rgb8>& colors, - FILE *f, - const char *before_face, - const char *after_line) -{ - mesh->need_faces(); - for (unsigned i = 0; i < mesh->faces.size(); i++) - { - fprintf(f, "%s%d %d %d %d %d %d%s\n", - before_face, - mesh->faces[i][0], mesh->faces[i][1], mesh->faces[i][2], - int(colors[i].red()), - int(colors[i].green()), - int(colors[i].blue()), - after_line); - } -} - -/// Write an off file with colors. -inline void write_off_colored(TriMesh *mesh, - const std::vector<mln::value::rgb8>& colors, - FILE *f) -{ - fprintf(f, "OFF\n"); - mesh->need_faces(); - fprintf(f, "%lu %lu 0\n", (unsigned long) mesh->vertices.size(), - (unsigned long) mesh->faces.size()); - write_verts_asc(mesh, f, "", 0, 0, false, 0, ""); - write_faces_asc_colored(mesh, colors, f, "3 ", ""); -} - -/*----------------------. -| OFF with float data. | -`----------------------*/ - -/// Write a bunch of faces to an ASCII file with colors. -inline void write_faces_asc_float(TriMesh *mesh, - const std::vector<float>& values, - FILE *f, - const char *before_face, - const char *after_line) -{ - mesh->need_faces(); - for (unsigned i = 0; i < mesh->faces.size(); i++) - { - // Vertices Color - // -------- ------------ - // V0 V1 V2 R G B A - fprintf(f, "%s%d %d %d %f %f %f 1.0%s\n", - before_face, - mesh->faces[i][0], mesh->faces[i][1], mesh->faces[i][2], - values[i], values[i], values[i], - after_line); - } -} - -/// Write an off file with floating-point values. -inline void write_off_float(TriMesh *mesh, const std::vector<float>& values, - FILE *f) -{ - fprintf(f, "OFF\n"); - mesh->need_faces(); - fprintf(f, "%lu %lu 0\n", (unsigned long) mesh->vertices.size(), - (unsigned long) mesh->faces.size()); - write_verts_asc(mesh, f, "", 0, 0, false, 0, ""); - write_faces_asc_float(mesh, values, f, "3 ", ""); -} -/// \} - - -/*---------------------------------------. -| OFF without data (``binary values''). | -`---------------------------------------*/ - -/// Taken and adapted from TriMesh_io.cc -/// \{ -/// Write a bunch of faces to an ASCII file, removing the ones tagged -/// as ``false'' in \a face_value. -inline void write_faces_asc_binary(TriMesh *mesh, - const std::vector<bool>& face_value, - FILE *f, - const char *before_face, - const char *after_line) -{ - mesh->need_faces(); - for (unsigned i = 0; i < mesh->faces.size(); i++) - if (face_value[i]) - { - fprintf(f, "%s%d %d %d%s\n", - before_face, - mesh->faces[i][0], mesh->faces[i][1], mesh->faces[i][2], - after_line); - } -} - -/// Write an off file, removing faces tagged as ``false'' in \a face_value. -inline void write_off_binary(TriMesh *mesh, - const std::vector<bool>& face_value, - FILE *f) -{ - fprintf(f, "OFF\n"); - mesh->need_faces(); - unsigned long nfaces = - std::count(face_value.begin(), face_value.end(), true); - fprintf(f, "%lu %lu 0\n", (unsigned long) mesh->vertices.size(), nfaces); - write_verts_asc(mesh, f, "", 0, 0, false, 0, ""); - write_faces_asc_binary(mesh, face_value, f, "3 ", ""); -} -/// \} - -#endif // ! APPS_MESH_SEGM_SKEL_IO_HH diff --git a/milena/apps/mesh-segm-skel/mesh-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-max-curv.cc deleted file mode 100644 index 8376fc0..0000000 --- a/milena/apps/mesh-segm-skel/mesh-max-curv.cc +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// 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 apps/mesh-segm-skel/mesh-max-curv.cc -/// \brief A program computing the max curvature at each (2-)face of -/// a mesh. - -#include <cstdlib> - -#include <algorithm> -#include <vector> -#include <iostream> -#include <utility> - -#include <TriMesh.h> - -#include <mln/math/max.hh> -#include <mln/math/sqr.hh> -#include <mln/accu/stat/min_max.hh> -#include <mln/fun/v2v/linear.hh> - -#include "io.hh" - - -int main(int argc, char* argv[]) -{ - if (argc != 3) - { - std::cerr << "usage: " << argv[0] << " input.off output.off" - << std::endl; - std::exit(1); - } - - std::string input_filename = argv[1]; - std::string output_filename = argv[2]; - - - // TriMesh is a pain: it systematically allocates on the heap. - // Introduce another name to manipulate the mesh as a (non-pointer) - // object. - TriMesh* mesh_ptr = TriMesh::read(input_filename.c_str()); - if (!mesh_ptr) - std::exit(2); - TriMesh& mesh = *mesh_ptr; - - // Computes faces (triangles). - mesh.need_faces(); - // Computation of the curvature on each vertex of the mesh. - mesh.need_curvatures(); - - std::vector<float> vertex_m(mesh.vertices.size(), 0.f); - for (unsigned v = 0; v < mesh.vertices.size(); ++v) - // Max curvature. - vertex_m[v] = mln::math::max(mln::math::sqr(mesh.curv1[v]), - mln::math::sqr(mesh.curv2[v])); - - // For each face of the mesh, computean an average curvature value - // from the mean curvature at its vertices. - std::vector<float> face_m(mesh.faces.size(), 0.f); - mln::accu::stat::min_max<float> acc; - for (unsigned f = 0; f < mesh.faces.size(); ++f) - { - float m = (vertex_m[mesh.faces[f][0]] + - vertex_m[mesh.faces[f][1]] + - vertex_m[mesh.faces[f][2]]) / 3; - face_m[f] = m; - acc.take(m); - } - - /* Shrink the values of FACE_M into the range 0..1, as these are - the only values accepted a an RGB floating-point component in the - OFF file format. */ - std::vector<float> normalized_face_m(face_m.size(), 0.0f); - std::pair<float, float> min_max(acc); - // FIXME: Taken from mln/data/stretch.hh (this should be factored). - float min = min_max.first; - float max = min_max.second; - // Don't normalize actually if the curvature is constant (i.e., - // if min == max). - if (min != max) - { - float m = 0.0f; - float M = 1.0f; - float a = (M - m) / (max - min); - float b = (m * max - M * min) / (max - min); - mln::fun::v2v::linear<float, float, float> f(a, b); - std::transform(face_m.begin(), face_m.end(), - normalized_face_m.begin(), f); - } - - // Taken and adapted from TriMesh_io.cc - FILE* f_out = fopen(output_filename.c_str(), "wb"); - if (!f_out) - { - std::cerr << "Error opening " << output_filename.c_str() - << " for writing." << std::endl; - std::exit(2); - } - write_off_float(mesh_ptr, normalized_face_m, f_out); - fclose(f_out); - - delete mesh_ptr; -} diff --git a/milena/apps/mesh-segm-skel/mesh-pinv-curv.cc b/milena/apps/mesh-segm-skel/mesh-pinv-curv.cc deleted file mode 100644 index af51c97..0000000 --- a/milena/apps/mesh-segm-skel/mesh-pinv-curv.cc +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// 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 apps/mesh-segm-skel/mesh-pinv-curv.cc -/// \brief A program computing the pseudo-inverse curvature at each -/// (2-)face of a mesh. - -#include <cstdlib> -#include <cmath> - -#include <algorithm> -#include <vector> -#include <iostream> -#include <utility> - -#include <TriMesh.h> - -#include "io.hh" - - -// Doesn't C++ have a better way to express Pi? -static const float pi = 4 * atanf(1); - - -int main(int argc, char* argv[]) -{ - if (argc != 3) - { - std::cerr << "usage: " << argv[0] << " input.off output.off" - << std::endl; - std::exit(1); - } - - std::string input_filename = argv[1]; - std::string output_filename = argv[2]; - - - // TriMesh is a pain: it systematically allocates on the heap. - // Introduce another name to manipulate the mesh as a (non-pointer) - // object. - TriMesh* mesh_ptr = TriMesh::read(input_filename.c_str()); - if (!mesh_ptr) - std::exit(2); - TriMesh& mesh = *mesh_ptr; - - // Computes faces (triangles). - mesh.need_faces(); - // Computation of the curvature on each vertex of the mesh. - mesh.need_curvatures(); - std::vector<float> vertex_h_inv(mesh.vertices.size(), 0.f); - for (unsigned v = 0; v < mesh.vertices.size(); ++v) - { - float h = (mesh.curv1[v] + mesh.curv2[v]) / 2; - // Pseudo-inverse curvature. - float h_inv = 1 / pi * (atan(-h) + pi / 2); - vertex_h_inv[v] = h_inv; - } - // For each face of the mesh, computean an average curvature value - // from the mean curvature at its vertices. - std::vector<float> face_h_inv(mesh.faces.size(), 42.f); - for (unsigned f = 0; f < mesh.faces.size(); ++f) - { - float h_inv = (vertex_h_inv[mesh.faces[f][0]] + - vertex_h_inv[mesh.faces[f][1]] + - vertex_h_inv[mesh.faces[f][2]]) / 3; - mln_invariant(0.f <= h_inv); - mln_invariant(h_inv <= 1.f); - face_h_inv[f] = h_inv; - } - - // Taken and adapted from TriMesh_io.cc - FILE* f_out = fopen(output_filename.c_str(), "wb"); - if (!f_out) - { - std::cerr << "Error opening " << output_filename.c_str() - << " for writing." << std::endl; - std::exit(2); - } - write_off_float(mesh_ptr, face_h_inv, f_out); - fclose(f_out); - - delete mesh_ptr; -} diff --git a/milena/apps/mesh-segm-skel/mesh-segm.cc b/milena/apps/mesh-segm-skel/mesh-segm.cc deleted file mode 100644 index 63e707d..0000000 --- a/milena/apps/mesh-segm-skel/mesh-segm.cc +++ /dev/null @@ -1,230 +0,0 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// 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 apps/mesh-segm-skel/mesh-segm.cc -/// \brief A program performing a WST-based segmentation of the -/// surface of the (triangle) mesh of a statue. - -// FIXME: Factor commons parts between mesh-segm and mesh-skel. - -#include <cstdlib> -#include <cmath> - -#include <utility> -#include <iostream> - -#include <TriMesh.h> - -#include <mln/core/alias/point3d.hh> -#include <mln/core/alias/point3d.hh> - -#include <mln/util/graph.hh> -#include <mln/core/image/line_graph_image.hh> -#include <mln/core/image/line_graph_elt_neighborhood.hh> - -#include <mln/morpho/closing/area.hh> -#include <mln/morpho/meyer_wst.hh> - -#include "io.hh" - - -// Doesn't C++ have a better way to express Pi ? -const float pi = 4 * atanf(1); - - -int main(int argc, char* argv[]) -{ - if (argc != 4) - { - std::cerr << "usage: " << argv[0] << " input.off lambda output.off" - << std::endl; - std::exit(1); - } - - std::string input_filename = argv[1]; - unsigned lambda = atoi(argv[2]); - std::string output_filename = argv[3]; - - - /*-------. - | Mesh. | - `-------*/ - - // TriMesh is a pain: it systematically allocates on the heap. - // Introduce another name to manipulate the mesh as a (non-pointer) - // object. - TriMesh* mesh_ptr = TriMesh::read(input_filename.c_str()); - if (!mesh_ptr) - std::exit(2); - TriMesh& mesh = *mesh_ptr; - - // Computes faces (triangles). - mesh.need_faces(); - // Computation of the mean curvature on each vertex of the mesh. - mesh.need_curvatures(); - /* FIXME: Our implementation of the WST doesn't work well with - floats (yet). Convert floating point values to a proportional - integer value for the moment. */ - typedef int curv_t; - std::vector<curv_t> vertex_h_inv(mesh.vertices.size(), 0.f); - for (unsigned v = 0; v < mesh.vertices.size(); ++v) - { - float h = (mesh.curv1[v] + mesh.curv2[v]) / 2; - float h_inv = 1 / pi * atan(-h) + pi / 2; - /* FIXME: This coefficient is used to distinguish small - curvature values. We should get rid of it as soon as - morpho::meyer_wst works correctly on images of float - values. */ - vertex_h_inv[v] = 1000 * h_inv; - } - - /*--------. - | Graph. | - `--------*/ - - /* Build a graph whose vertices correspond to the faces of the mesh, - whose edges (between two vertices) correspond to edges (between - two faces) of the mesh. */ - - // Values associated to the graph sites. - // (Reminder: currently, values associated to vertices in a - // line_graph_image are dummy.) - std::vector<curv_t> vertex_values (mesh.faces.size(), 0.f); - std::vector<curv_t> edge_values; - - /* FIXME: We don't have the required site type yet. Simulate with a - dummy type (point3d). */ - mln::util::graph<mln::point3d> g; - // Populate the graph with vertices. - for (unsigned i = 0; i < mesh.faces.size(); ++i) - g.add_vertex (mln::point3d(i, i, i)); - - // Populate the graph with edges. - mesh.need_across_edge(); - for (unsigned f = 0; f < mesh.faces.size(); ++f) - for (unsigned e = 0; e < 3; ++e) - { - int f_adj = mesh.across_edge[f][e]; - if (f_adj != -1) - { - // Add an edge into the graph. - if (g.add_edge(f, f_adj) != mln_max(mln::util::edge_id::equiv)) - { - // Find the edge (i.e., the two vertices) common to faces - // F and F_ADJ. - /* FIXME: We lack a proper interface from the TriMesh - structure to do this elegantly. */ - std::vector<int> adj_vertices; - adj_vertices.reserve(2); - for (unsigned i = 0; i < 3; ++i) - for (unsigned j = 0; j < 3; ++j) - if (mesh.faces[f][i] == mesh.faces[f_adj][j]) - adj_vertices.push_back(mesh.faces[f][i]); - mln_assertion(adj_vertices.size() == 2); - - // Compute the mean curvature on the edge. - edge_values.push_back((vertex_h_inv[adj_vertices[0]] + - vertex_h_inv[adj_vertices[1]]) - / 2); - } - - // Check the consistency of the two arrays. - mln_assertion(g.edges().size() == edge_values.size()); - } - } - - /*-------------------. - | Line graph image. | - `-------------------*/ - - mln::p_line_graph<mln::point3d> plg(g); - - typedef mln::line_graph_image<mln::point3d, curv_t> ima_t; - ima_t lg_ima(plg, vertex_values, edge_values); - - /*-----------------. - | Simplification. | - `-----------------*/ - - typedef mln::line_graph_elt_neighborhood<mln::point3d> nbh_t; - nbh_t nbh; - - ima_t closed_lg_ima = mln::morpho::closing::area(lg_ima, nbh, lambda); - - /*------. - | WST. | - `------*/ - - typedef unsigned wst_val_t; - wst_val_t nbasins; - typedef mln::line_graph_image<mln::point3d, wst_val_t> wst_ima_t; - wst_ima_t wshed = mln::morpho::meyer_wst(closed_lg_ima, nbh, nbasins); - std::cout << "nbasins = " << nbasins << std::endl; - - /*------------------------------------------. - | Label graph vertices (i.e., mesh faces). | - `------------------------------------------*/ - - /* FIXME: We should be using wshed.vertex_values_ if - mln::line_graph_image were fully functional... */ - std::vector<unsigned> vertex_label(wshed.domain().nvertices(), 0); - mln_piter_(wst_ima_t) pw(wshed.domain()); - for_all(pw) - if (wshed(pw) != 0) - { - mln_psite_(wst_ima_t) pp(pw); - vertex_label[pp.first_id().to_equiv()] = wshed(pw); - vertex_label[pp.second_id().to_equiv()] = wshed(pw); - } - - /*---------. - | Output. | - `---------*/ - - // Choose random colors for each basin number. - std::vector<mln::value::rgb8> basin_color (nbasins + 1); - for (unsigned i = 0; i <= nbasins; ++i) - basin_color[i] = mln::value::rgb8(random() % 256, - random() % 256, - random() % 256); - - // Assign colors to graph vertices (mesh faces). - std::vector<mln::value::rgb8> face_color (vertex_label.size()); - for (unsigned i = 0; i < vertex_label.size() ; ++i) - face_color[i] = basin_color[vertex_label[i]]; - - // Taken and adapted from TriMesh_io.cc - FILE* f_out = fopen(output_filename.c_str(), "wb"); - if (!f_out) - { - std::cerr << "Error opening " << output_filename.c_str() - << " for writing." << std::endl; - std::exit(2); - } - write_off_colored(mesh_ptr, face_color, f_out); - fclose(f_out); - - delete mesh_ptr; -} diff --git a/milena/apps/mesh-segm-skel/mesh-skel.cc b/milena/apps/mesh-segm-skel/mesh-skel.cc deleted file mode 100644 index e68620d..0000000 --- a/milena/apps/mesh-segm-skel/mesh-skel.cc +++ /dev/null @@ -1,207 +0,0 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// 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 apps/mesh-segm-skel/mesh-skel.cc -/// \brief A program computing a skeleton of the surface of the -/// (triangle) mesh of a statue. - -// FIXME: Factor commons parts between mesh-segm and mesh-skel. - -#include <cstdlib> -#include <cmath> - -#include <utility> -#include <iostream> - -#include <TriMesh.h> - -#include <mln/core/alias/point3d.hh> -#include <mln/core/alias/point3d.hh> - -#include <mln/util/graph.hh> -#include <mln/core/image/graph_image.hh> -#include <mln/core/image/graph_elt_neighborhood.hh> - -#include <mln/morpho/closing/area.hh> -#include <mln/labeling/regional_minima.hh> - -#include "io.hh" - - -// Doesn't C++ have a better way to express Pi ? -const float pi = 4 * atanf(1); - - -int main(int argc, char* argv[]) -{ - if (argc != 4) - { - std::cerr << "usage: " << argv[0] << " input.off lambda output.off" - << std::endl; - std::exit(1); - } - - std::string input_filename = argv[1]; - unsigned lambda = atoi(argv[2]); - std::string output_filename = argv[3]; - - - /*-------. - | Mesh. | - `-------*/ - - // TriMesh is a pain: it systematically allocates on the heap. - // Introduce another name to manipulate the mesh as a (non-pointer) - // object. - TriMesh* mesh_ptr = TriMesh::read(input_filename.c_str()); - if (!mesh_ptr) - std::exit(2); - TriMesh& mesh = *mesh_ptr; - - // Computes faces (triangles). - mesh.need_faces(); - // Computation of the mean curvature on each vertex of the mesh. - mesh.need_curvatures(); - std::vector<float> vertex_h_inv(mesh.faces.size(), 0.f); - for (unsigned v = 0; v < mesh.vertices.size(); ++v) - { - float h = (mesh.curv1[v] + mesh.curv2[v]) / 2; - float h_inv = 1 / pi * atan(-h) + pi / 2; - vertex_h_inv[v] = h_inv; - } - // Computation of the mean curvature on each face of the mesh. - /* FIXME: Our implementation of the computation of the regional - minima doesn't work well with floats (yet). Convert floating - point values to a proportional integer value for the moment. */ - typedef int curv_t; - std::vector<curv_t> face_h_inv(mesh.faces.size(), 0.f); - for (unsigned f = 0; f < mesh.faces.size(); ++f) - { - float h_inv = - (vertex_h_inv[mesh.faces[f][0]] + - vertex_h_inv[mesh.faces[f][1]] + - vertex_h_inv[mesh.faces[f][2]]) - / 3; - /* FIXME: This coefficient is used to distinguish small - curvature values. We should get rid of it as soon as - labeling::regional_minima works correctly on images of float - values. */ - face_h_inv[f] = 1000 * h_inv; - } - - /*--------. - | Graph. | - `--------*/ - - /* Build a graph whose vertices correspond to the faces of the mesh, - whose edges (between two vertices) correspond to edges (between - two faces) of the mesh. */ - - /* FIXME: We don't have the required site type yet. Simulate with a - dummy type (point3d). */ - mln::util::graph<mln::point3d> g; - // Populate the graph with vertices. - for (unsigned i = 0; i < mesh.faces.size(); ++i) - g.add_vertex (mln::point3d(i, i, i)); - - // Populate the graph with edges. - mesh.need_across_edge(); - for (unsigned f = 0; f < mesh.faces.size(); ++f) - for (unsigned e = 0; e < 3; ++e) - { - int f_adj = mesh.across_edge[f][e]; - if (f_adj != -1) - // Add an edge into the graph. - g.add_edge(f, f_adj); - } - - /*--------------. - | Graph image. | - `--------------*/ - - mln::p_graph<mln::point3d> pg(g); - - typedef mln::graph_image<mln::point3d, curv_t> ima_t; - ima_t g_ima(pg, face_h_inv); - - /*-----------------. - | Simplification. | - `-----------------*/ - - typedef mln::graph_elt_neighborhood<mln::point3d> nbh_t; - nbh_t nbh; - - ima_t closed_g_ima = mln::morpho::closing::area(g_ima, nbh, lambda); - - /*------------------. - | Regional minima. | - `------------------*/ - - typedef unsigned label_t; - label_t nlabels; - typedef mln::graph_image<mln::point3d, label_t> label_ima_t; - label_ima_t minima = - mln::labeling::regional_minima(closed_g_ima, nbh, nlabels); - std::cout << "nlabels = " << nlabels << std::endl; - - /*-----------. - | Skeleton. | - `-----------*/ - - // FIXME: To do. - - /*---------. - | Output. | - `---------*/ - - /* FIXME We should created a boolean graph_image instead. But as - we cannot directly save a graph_image as an OFF file now, just - store the values of this would-be image into an array. */ - // Assign a boolean value to graph vertices (mesh faces). - std::vector<bool> face_value (minima.domain().nvertices(), true); - mln_piter_(label_ima_t) pm(minima.domain()); - for_all(pm) - // FIXME: Use literal::zero. - if (minima(pm) != 0) - { - // The face belongs to a regional minima: ``remove'' it from - // the mesh by tagging it as false. - mln_psite_(label_ima_t) pp(pm); - face_value[pp.id().to_equiv()] = false; - } - - // Taken and adapted from TriMesh_io.cc - FILE* f_out = fopen(output_filename.c_str(), "wb"); - if (!f_out) - { - std::cerr << "Error opening " << output_filename.c_str() - << " for writing." << std::endl; - std::exit(2); - } - write_off_binary(mesh_ptr, face_value, f_out); - fclose(f_out); - - delete mesh_ptr; -} diff --git a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in deleted file mode 100644 index e5eaf96..0000000 --- a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# 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 Olena. If not, see <http://www.gnu.org/licenses/>. - -set -ex - -mesh_dir=@top_srcdir@/milena/mesh - -time ./mesh-max-curv $mesh_dir/teapot.off teapot-max-curv.off diff --git a/milena/apps/mesh-segm-skel/test-mesh-segm.in b/milena/apps/mesh-segm-skel/test-mesh-segm.in deleted file mode 100755 index e70e63a..0000000 --- a/milena/apps/mesh-segm-skel/test-mesh-segm.in +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# 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 Olena. If not, see <http://www.gnu.org/licenses/>. - -set -ex - -mesh_dir=@top_srcdir@/milena/mesh - -time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off -time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off -# FIXME: Too long. Should be run with (future) target `check-full'. -#time ./mesh-segm $mesh_dir/bunny-holefilled.off 500 bunny-holefilled-segm.off -- 1.7.2.5

1 0

branch exp/khalimsky updated: olena-2.0-43-gcbf3fe2
by git＠lrde.epita.fr 05 Oct '12

05 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/khalimsky has been updated via cbf3fe229ced061e0a6b9aa590593c91fced0d10 (commit) via be35e3941a0a8bb5ec44a7be4e55a0142c734430 (commit) from 1cde74522f42b4cfdd260df9e3d2f46c50510eb1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- cbf3fe2 Improve accu::median_interval. be35e39 mln/value/intsub.hh: Add more constructors. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 12 ++ milena/mln/accu/stat/median_interval.hh | 162 ++++++++++++++++------- milena/mln/value/intsub.hh | 32 +++++- milena/tests/accu/stat/median_interval.cc | 210 +++++++++++++++++++++++++++- 4 files changed, 361 insertions(+), 55 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0