Olena-patches September 2012

olena-patches@lrde.epita.fr

3 participants
87 discussions

olena-2.0-52-g32a8927 Ask configure to try to find OpenCV.

by Roland Levillain

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4852d9..9ec33c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-09-25 Roland Levillain <roland(a)lrde.epita.fr> + Ask configure to try to find OpenCV. + + * configure.ac: Here. + +2012-09-25 Roland Levillain <roland(a)lrde.epita.fr> + Have configure find an archiver. * configure.ac: Invoke AM_PROG_AR. diff --git a/configure.ac b/configure.ac index fa7e091..2b3cfc4 100644 --- a/configure.ac +++ b/configure.ac @@ -268,6 +268,13 @@ OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8], [ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib])) +# ---------------- # +# OpenCV library. # +# ---------------- # + +OLN_WITH_LIB([OPENCV], [opencv/cv.h], [opencv_core], [opencv], + [OPENCV], [-lopencv_highgui]) + # ---------------------------- # # (Bundled) trimesh2 library. # # ---------------------------- # -- 1.7.2.5

12 years, 3 months

olena-2.0-51-gf0064c0 Have configure find an archiver.

by Roland Levillain

* configure.ac: Invoke AM_PROG_AR. --- ChangeLog | 6 ++++++ build-aux/.gitignore | 1 + configure.ac | 2 ++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3e00ef..c4852d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-09-25 Roland Levillain <roland(a)lrde.epita.fr> + + Have configure find an archiver. + + * configure.ac: Invoke AM_PROG_AR. + 2011-11-14 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/apps/morphers/Makefile. diff --git a/build-aux/.gitignore b/build-aux/.gitignore index fb342f9..e727daf 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -1,3 +1,4 @@ +/ar-lib /config.guess /config.sub /depcomp diff --git a/configure.ac b/configure.ac index d16eca2..fa7e091 100644 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,8 @@ AC_ARG_ENABLE([all], ## Libraries set up. ## ## ------------------ ## +AM_PROG_AR + # Use Libtool. # To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used. AC_PROG_LIBTOOL -- 1.7.2.5

12 years, 3 months

branch next updated: olena-2.0-50-gcffe62e

by git＠lrde.epita.fr

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 next has been updated via cffe62e5cff26c4b5dbdc5d2d598ffbada51d9eb (commit) via 13174eafba2824096b4916382075b98085208e85 (commit) via b4ca8d4c88354e1577271f6103b13e1ab1f285c6 (commit) via 08bc024b524e8e1c89b9baa4070eb562715f0b03 (commit) via 72ee021ea66c1cb31d559c7803596199c11dea02 (commit) via 3864857f85d254caf232b2a9fb4c547d7bf8f11a (commit) via f8e2ffe537bc8dc29cc432ef21462dee8046d0dc (commit) via bc142a16b5a6963f43b63f286e4f201a69ad9211 (commit) via 3363574ac18e8b13b42f21d354a1901a511c513d (commit) via bd2670fbf582fc5c238507bdb3d9543d5bcb0577 (commit) via 849c13701f8eb2e08d838979c7b3539332cf099a (commit) via dcad6adc4a6b9469f79c055f1c2a5138c74e6f29 (commit) via 21c2800d395c87adb3e456adb3a2f1ece83fe0fd (commit) via 558a2abb439427e9f267698ce3f1541bda95b395 (commit) via 6b931cc6d218c25448e7bf3479c98c16acd7daa1 (commit) via 1e58a782ca5f922f685e967dd35a570c7b6dd16e (commit) from b654f0d48265b56eda78f0df27cb1a414f7f7e5a (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 ----------------------------------------------------------------- cffe62e Merge branch 'apps-morphers' into next ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 1 + milena/ChangeLog | 154 +++++++++++++++++ milena/apps/Makefile.am | 5 +- milena/apps/morphers/Makefile.am | 76 +++++++++ milena/apps/morphers/image2d-skel.hh | 137 +++++++++++++++ milena/apps/morphers/iz.cc | 173 +++++++++++++++++++ milena/apps/morphers/iz_input.pbm | Bin 0 -> 21890 bytes milena/apps/morphers/lazy_recorder.cc | 62 +++++++ milena/apps/morphers/lazy_recorder.hh | 206 +++++++++++++++++++++++ milena/apps/morphers/mask+channel.cc | 67 ++++++++ milena/apps/morphers/mask+recorder.cc | 65 +++++++ milena/apps/morphers/recorder-bft.cc | 114 +++++++++++++ milena/apps/morphers/recorder-wst.cc | 106 ++++++++++++ milena/apps/morphers/recorder.cc | 61 +++++++ milena/apps/morphers/recorder.hh | 182 ++++++++++++++++++++ milena/mln/core/image/imorph/decorated_image.hh | 26 +++ milena/mln/tag/init.hh | 3 + 18 files changed, 1440 insertions(+), 2 deletions(-) create mode 100644 milena/apps/morphers/Makefile.am create mode 100644 milena/apps/morphers/image2d-skel.hh create mode 100644 milena/apps/morphers/iz.cc create mode 100644 milena/apps/morphers/iz_input.pbm create mode 100644 milena/apps/morphers/lazy_recorder.cc create mode 100644 milena/apps/morphers/lazy_recorder.hh create mode 100644 milena/apps/morphers/mask+channel.cc create mode 100644 milena/apps/morphers/mask+recorder.cc create mode 100644 milena/apps/morphers/recorder-bft.cc create mode 100644 milena/apps/morphers/recorder-wst.cc create mode 100644 milena/apps/morphers/recorder.cc create mode 100644 milena/apps/morphers/recorder.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 3 months

branch apps-morphers updated: olena-2.0-23-g13174ea

by git＠lrde.epita.fr

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 apps-morphers has been updated via 13174eafba2824096b4916382075b98085208e85 (commit) from b4ca8d4c88354e1577271f6103b13e1ab1f285c6 (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 ++++++++ milena/apps/morphers/Makefile.am | 2 +- milena/apps/morphers/recorder-bft.cc | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 3 months

olena-2.0-50-gcffe62e Merge branch 'apps-morphers' into next

by Roland Levillain

This is a merge commit message of the following branches: Merge: b654f0d 13174ea Conflicts: ChangeLog milena/ChangeLog ChangeLog | 4 + configure.ac | 1 + milena/ChangeLog | 154 +++++++++++++++++ milena/apps/Makefile.am | 5 +- milena/apps/morphers/Makefile.am | 76 +++++++++ milena/apps/morphers/image2d-skel.hh | 137 +++++++++++++++ milena/apps/morphers/iz.cc | 173 +++++++++++++++++++ milena/apps/morphers/iz_input.pbm | Bin 0 -> 21890 bytes milena/apps/morphers/lazy_recorder.cc | 62 +++++++ milena/apps/morphers/lazy_recorder.hh | 206 +++++++++++++++++++++++ milena/apps/morphers/mask+channel.cc | 67 ++++++++ milena/apps/morphers/mask+recorder.cc | 65 +++++++ milena/apps/morphers/recorder-bft.cc | 114 +++++++++++++ milena/apps/morphers/recorder-wst.cc | 106 ++++++++++++ milena/apps/morphers/recorder.cc | 61 +++++++ milena/apps/morphers/recorder.hh | 182 ++++++++++++++++++++ milena/mln/core/image/imorph/decorated_image.hh | 26 +++ milena/mln/tag/init.hh | 3 + 18 files changed, 1440 insertions(+), 2 deletions(-) diff --cc ChangeLog index 6f2cfc5,e56f5cc..b3e00ef --- a/ChangeLog +++ b/ChangeLog @@@ -1,32 -1,7 +1,36 @@@ + 2011-11-14 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Configure milena/apps/morphers/Makefile. + +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * m4/oln-with-lib.m4: Lookup for multiple AND single libraries + while checking Tesseract availability. + +2011-11-25 Roland Levillain <roland(a)lrde.epita.fr> + + Update lrde-scmstats.sh. + + * lrde-scmstats.sh: Look more like lrde-upload.sh. + Ensure generated data is readable from the Web. + Anonymize some names as requested by some contributors. + +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * distrib/macports/Portfile.in: Fix maintainers field. + +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lrde-scmstats.sh: Fix branch name ambiguities. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lrde-scmstats.sh: Compute stats per branches. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lrde-upload.sh: Update list of branches. + 2011-10-06 Roland Levillain <roland(a)lrde.epita.fr> * README (Bibliography): Mention the GRETSI 2011 paper. diff --cc milena/ChangeLog index 745f38b,fcd3962..c1289de --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,195 -1,157 +1,349 @@@ + 2012-09-25 Roland Levillain <roland(a)lrde.epita.fr> + + Fix file names in apps/morphers/recorder-bft. + + * apps/morphers/recorder-bft.cc, + * apps/morphers/Makefile.am (recorder_SOURCES): + s/lena/picasso/. + + 2012-06-21 Roland Levillain <roland(a)lrde.epita.fr> + + Improve the (movie) output of apps/morphers/iz. + + * apps/morphers/iz.cc (save_colorized): Skip consecutive identical + frames. + Swap the frame reconstruction and write operations, so that the + last frame is eventually saved. + * apps/morphers/Makefile.am (tmp_iz.avi): Use a speedup of 50 + instead of 10. + + 2012-06-21 Roland Levillain <roland(a)lrde.epita.fr> + + Use the lazy recorder morpher in apps/morphers/iz. + + * apps/morphers/iz.cc (main): Here. + Save the sequence of recorder images as PNG images using Magick++. + (save_colorized): New function. + * apps/morphers/Makefile.am + (noinst_PROGRAMS, iz_SOURCES) [HAVE_MAGICKXX]: Build `iz' only if + Magick++ is available. + (iz_output.ppm) [HAVE_MAGICKXX]: Likewise. + (iz_CPPFLAGS, iz_LDFLAGS) [HAVE_MAGICKXX]: New. + (tmp_iz.avi) [HAVE_MAGICKXX]: New target. + (MOSTLYCLEANFILES): Add tmp_iz??????.png. + + 2012-06-20 Roland Levillain <roland(a)lrde.epita.fr> + + Add rules to build and run apps/morphers/iz. + + * apps/morphers/Makefile.am (noinst_PROGRAMS): Add iz. + (iz_SOURCES): New. + (EXTRA_DIST): Add iz_input.pbm. + (iz_output.ppm): New target. + (MOSTLYCLEANFILES): Add tmp_clo.pgm, tmp_dmap.pgm, + tmp_ws_superpose.ppm, tmp_ws.ppm, tmp_lab.pgm, tmp_iz.pgm, + tmp_iz.ppm and tmp_iz_input.ppm. + + 2012-06-20 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + New example demonstrating the use of influence zones. + + * apps/morphers/iz.cc: New. + * apps/morphers/iz_input.pbm: New. + + 2012-06-21 Roland Levillain <roland(a)lrde.epita.fr> + + New ``lazy'' recorder morpher in apps/morpher. + + * apps/morphers/lazy_recorder.hh: New. + * apps/morphers/lazy_recorder.cc: New test. + * apps/morphers/Makefile.am (noinst_HEADERS): + Add lazy_recorder.hh. + (noinst_PROGRAMS): Add lazy_recorder. + (lazy_recorder_SOURCES): New. + (MOSTLYCLEANFILES): Add lena-fill-lazy??????.ppm. + + 2012-06-21 Roland Levillain <roland(a)lrde.epita.fr> + + Render the recorder morpher more generic. + + * apps/morphers/recorder.hh (recorder::sequence): Store a + sequence of concrete images. + Add missing inline keywords. + Improve the documentation. + + 2011-11-28 Roland Levillain <roland(a)lrde.epita.fr> + + New morpher example: recording a breadth-first thinning. + + * apps/morphers/recorder-bft.cc: New. + * apps/morphers/image2d-skel.hh: New. + * apps/morphers/Makefile.am (noinst_PROGRAMS): Add recorder-bft. + (recorder_wst_SOURCES): New. + (recorder_SOURCES, recorder_wst_SOURCES, mask_recorder_SOURCES): + Move recorder.hh... + (noinst_HEADERS): ...here (new variable). + (MOSTLYCLEANFILES): Add lena-bft??????.pbm. + + 2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + New morpher example: recording a watershed transform. + + * apps/morphers/recorder-wst.cc: New. + * apps/morphers/Makefile.am (noinst_PROGRAMS): Add recorder-wst. + (recorder_wst_SOURCES): New. + (MOSTLYCLEANFILES): lena-wst??????.ppm. + + 2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + Work around decorated_image's lack of properties, for the recorder. + + * apps/morphers/recorder.hh + (trait::image_< decorated_image<I,D> >): Replace with.. + (trait::image_< decorated_image<I, recorder > >): ...this. + Add a value_storage property. + (ch_value_< decorated_image< image_, data_< recorder > >, V >): + New trait, to handle changes of value types in images decorated + with a recorder. + * apps/morphers/mask+channel.cc, + * apps/morphers/mask+recorder.cc, + * apps/morphers/recorder.cc: + Simplify these programs thanks to the preceding changes. + + 2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the initialization of mln::decorated_image. + + * mln/tag/init.hh (tag::data_t): New tag type. + (tag::data): New tag. + * mln/core/image/imorph/decorated_image.hh + (init_(tag::data_t, D&, const decorated_image<I,D>&)) + (init_(tag::data_t, D&, const decorated_image<I,D2>&)) + (init_(tag::image_t, decorated_image<I,D>&, const J&)): + New functions. + + 2011-11-18 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify some apps/morpher programs using mln::make::box2d. + + * apps/morphers/mask+recorder.cc, + * apps/morphers/mask+channel.cc: + Here. + + 2011-11-18 Roland Levillain <roland(a)lrde.epita.fr> + + Refactor apps/morphers. + + * apps/morphers/recorder.cc, + * apps/morphers/mask+recorder.cc: + Factor common parts... + * apps/morphers/recorder.hh: ...here (new file). + * apps/morphers/Makefile.am + (recorder_SOURCES, mask_recorder_SOURCES): Add recorder.hh. + + 2011-11-14 Roland Levillain <roland(a)lrde.epita.fr> + + Add examples of morphers. + + * apps/morphers/mask+channel.cc, + * apps/morphers/recorder.cc, + * apps/morphers/mask+recorder.cc: + New. + * apps/morphers/Makefile.am: New. + * apps/Makefile.am (SUBDIRS): Add morphers. + +2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + Honor a precondition in classification examples (ISMM 2009). + + * apps/papers/levillain.09.ismm/classif-graph.cc, + * apps/papers/levillain.09.ismm/classif-1complex.cc: + Do not use a value outside the range [0, nbasins] in `canvas_wst' + to prevent a failed precondition in labeling::colorize (when + NDEBUG is not defined). + Reported by David Coeurjolly <david.coeurjolly at liris.cnrs.fr>. + +2011-10-11 Roland Levillain <roland(a)lrde.epita.fr> + + Graph-based version of the classification example. + + * apps/papers/levillain.09.ismm/classif-graph.cc: New. + * apps/papers/levillain.09.ismm/Makefile.am (noinst_PROGRAMS): + Add classif-graph. + (classif_graph_SOURCES): New. + (noinst_DATA): Add classwst-graph.ppm. + (classwst-graph.ppm): New target. + +2011-10-10 Roland Levillain <roland(a)lrde.epita.fr> + + Rename apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc: Rename as... + * apps/papers/levillain.09.ismm/classif-1complex.cc: ...this. + * apps/papers/levillain.09.ismm/Makefile.am + (noinst_PROGRAMS, noinst_DATA): s/classif/classif-1complex/. + (classif_SOURCES, classwst.pnm): Replace by... + (classif_1complex_SOURCES, classwst-1complex.ppm): ...these. + +2011-10-10 Roland Levillain <roland(a)lrde.epita.fr> + + Aesthetic changes in apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc: Here. + Remove useless headers inclusions. + Adjust comments. + +2011-10-05 Roland Levillain <roland(a)lrde.epita.fr> + + Fix and clean up apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc (main): Actually use + the chain() routine from chain.hh instead of ad hoc code. + Move code related to the construction of the 1-complex (graph) + image on which the processing chain is run... + (make_complex_image): ...here. + * apps/papers/levillain.09.ismm/Makefile.am (classwst.pnm): Change + the lambda (area) parameter to 4. + +2011-10-04 Roland Levillain <roland(a)lrde.epita.fr> + + Import the WST-based classification in apps/papers/levillain.09.ismm. + + * apps/papers/levillain.09.ismm/Makefile.am + (noinst_PROGRAMS): Add classif. + (classif_SOURCES): Add classif.cc + (dist_noinst_DATA): Add classseedsi.pbm. + (noinst_DATA): Add classwst.pnm. + (classwst.pnm): New target. + * apps/papers/levillain.09.ismm/classif.cc: New. + Copied and adapted from + sandbox/theo/esiee/laurent/presentation/classif.cc. + * apps/papers/levillain.09.ismm/classseedsi.pbm: New. + +2011-10-04 Roland Levillain <roland(a)lrde.epita.fr> + + Split apps/papers/levillain.09.ismm/graph.cc. + + * apps/papers/levillain.09.ismm/graph.cc: Misc. changes. + (mln::influence_zones) + (mln::io::neato::save): + Move functions... + * apps/papers/levillain.09.ismm/influence_zones.hh, + * apps/papers/levillain.09.ismm/io.hh: + ...here (new files). + * apps/papers/levillain.09.ismm/Makefile.am (noinst_HEADERS): + Add io.hh and influence_zones.hh + +2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix the initialization of all global constants (ticket #43) + + * mln/debug/slices_2d.hh, + * mln/io/dump/get_header.hh, + * mln/io/fld/header.hh, + * mln/io/fld/load.hh, + * mln/io/fld/load_header.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/math/jacobi.hh, + * mln/morpho/hit_or_miss.hh, + * mln/world/binary_2d/subsample.hh: Add missing 'inline'. + + * tests/Makefile.am (CXXFLAGS): Add -DMLN_WO_GLOBAL_VARS. + + * tests/global_vars1.cc, + * tests/global_vars2.cc: Make take MLN_WO_GLOBAL_VARS into + consideration. + +2011-11-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid minimum value for builtin floating types. (ticket #247) + + * mln/value/builtin/floatings.hh: Here. + + * tests/value/builtin/floatings.cc: write test. + +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix compilation with multiple files. + + * mln/canvas/browsing/backdiagonal2d.hh, + * mln/canvas/browsing/breadth_first_search.hh, + * mln/canvas/browsing/depth_first_search.hh, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/canvas/browsing/directional.hh, + * mln/canvas/browsing/fwd.hh, + * mln/canvas/browsing/hyper_directional.hh, + * mln/canvas/browsing/snake_fwd.hh, + * mln/canvas/browsing/snake_generic.hh, + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/grays.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/white.hh: Add missing inline keyword and + MLN_WO_GLOBAL_VARS guards. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix more compilation issues with g++ 4.6.1 and clang++. + + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/grays.hh, + * mln/literal/identity.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/zero.hh: Add default constructors. + +2011-11-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix compilation issues with g++ 4.6.1 and clang++. + + * mln/topo/center_only_iter.hh, + * mln/topo/face.hh, + * mln/trait/images.hh, + * mln/convert/from_to.hxx, + * mln/core/image/dmorph/sub_image.hh, + * mln/core/routine/init.hxx, + * mln/algebra/vec.hh: Make declaration and forward declarations + consistent. + + * mln/canvas/browsing/backdiagonal2d.hh, + * mln/canvas/browsing/breadth_first_search.hh, + * mln/canvas/browsing/depth_first_search.hh, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/canvas/browsing/directional.hh, + * mln/canvas/browsing/fwd.hh, + * mln/canvas/browsing/hyper_directional.hh, + * mln/canvas/browsing/snake_fwd.hh, + * mln/canvas/browsing/snake_generic.hh, + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/white.hh: Add a default constructor for global + variable types. + + * mln/canvas/browsing/internal/graph_first_search.hh: Avoid a + warning for an unused variable. + + * mln/data/was.median.hh: Fix type of the reference. + 2011-10-04 Roland Levillain <roland(a)lrde.epita.fr> Handle the case of filling an empty border. hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 3 months

last-svn-commit-562-ge75f830 Aesthetic changes in Swilena.

by Roland Levillain

* swilena/box.ixx, * swilena/box2d.i, * swilena/image2d.ixx, * swilena/image2d_point2d.i, * swilena/morpho.ixx: Here. --- swilena/ChangeLog | 11 +++++++++++ swilena/box.ixx | 2 +- swilena/box2d.i | 4 ++-- swilena/image2d.ixx | 5 +++-- swilena/image2d_point2d.i | 2 +- swilena/morpho.ixx | 5 ++++- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 5712e11..6bf2e1b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,16 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes in Swilena. + + * swilena/box.ixx, + * swilena/box2d.i, + * swilena/image2d.ixx, + * swilena/image2d_point2d.i, + * swilena/morpho.ixx: + Here. + +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Add sps-gdb-local, a script to run the Swilena Python Shell in GDB. * python/sps-gdb-local.in: New. diff --git a/swilena/box.ixx b/swilena/box.ixx index 88cdec7..12f6dd4 100644 --- a/swilena/box.ixx +++ b/swilena/box.ixx @@ -41,7 +41,7 @@ /** Instantiate an mln::box type. The variadic argument ``P...'' is used to allow template type - names having commas (e.g. mln::point<grid::square, def::coord) as + names having commas (e.g. mln::point<grid::square, def::coord >) as argument. */ %define instantiate_box(Name, P...) /* Swig tries to wrap everything by default; prevent it from wrapping diff --git a/swilena/box2d.i b/swilena/box2d.i index fcfd766..f13790e 100644 --- a/swilena/box2d.i +++ b/swilena/box2d.i @@ -42,8 +42,8 @@ %extend mln::box< mln::point<mln::grid::square, mln::def::coord> > { // Provide a ctor creating an `mln::box2d' from two `int's. - mln::box< mln::point< mln::grid::square, mln::def::coord> > (int nrows, - int ncols) + mln::box< mln::point<mln::grid::square, mln::def::coord> > (int nrows, + int ncols) { return new mln::box<mln::point2d>(nrows, ncols); } diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx index a08864b..963fcfc 100644 --- a/swilena/image2d.ixx +++ b/swilena/image2d.ixx @@ -84,9 +84,10 @@ // Instantiate base classes of mln::image2d<T> so that Swig knows it // derives from mln::Image. - %template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; - %template() mln::internal::image_base< T, mln::box2d, mln::image2d< T > >; + %template() mln::Image< mln::image2d< int > >; %template() mln::internal::image_checked_< mln::image2d< T > >; + %template() mln::internal::image_base< T, mln::box2d, mln::image2d< T > >; + %template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; // Instantiate mln::image2d<T> %template(I) mln::image2d< T >; %enddef // !instantiate_image2d diff --git a/swilena/image2d_point2d.i b/swilena/image2d_point2d.i index 0ef3bd9..851d0e2 100644 --- a/swilena/image2d_point2d.i +++ b/swilena/image2d_point2d.i @@ -36,7 +36,7 @@ #include "mln/core/alias/point2d.hh" %} -%include concat.ixx +%include "concat.ixx" %include "image2d.ixx" instantiate_image2d(image2d_point2d, diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index bf84d2d..54f51c7 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -48,7 +48,7 @@ %include "mln/morpho/dilation.hh" %include "mln/morpho/erosion.hh" - would require a lot of efforts. Use an explicit prototypes + would require a lot of efforts. Use explicit prototypes instead. */ namespace mln { @@ -65,6 +65,9 @@ namespace mln } +/* FIXME: We should try to factor the multiple instantiations of + `mln::trait::concrete'. */ + %define instantiate_dilation(Name, I, W) // Explicit instantiation of this trait for the return type. %template() mln::trait::concrete; -- 1.7.2.5

12 years, 3 months

last-svn-commit-561-g7c4b370 Add sps-gdb-local, a script to run the Swilena Python Shell in GDB.

by Roland Levillain

* python/sps-gdb-local.in: New. * python/Makefile.am (edit): Also substitute @LIBTOOL@. (noinst_SCRIPTS): Add sps-gdb-local. (EXTRA_DIST): Add sps-gdb-local.in. (sps-gdb-local): Adda a dependency on $(srcdir)/sps-gdb-local.in. --- swilena/ChangeLog | 10 ++++++++++ swilena/python/Makefile.am | 12 +++++++----- swilena/python/{sps-local.in => sps-gdb-local.in} | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) copy swilena/python/{sps-local.in => sps-gdb-local.in} (73%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index ea9ecab..5712e11 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,15 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Add sps-gdb-local, a script to run the Swilena Python Shell in GDB. + + * python/sps-gdb-local.in: New. + * python/Makefile.am (edit): Also substitute @LIBTOOL@. + (noinst_SCRIPTS): Add sps-gdb-local. + (EXTRA_DIST): Add sps-gdb-local.in. + (sps-gdb-local): Adda a dependency on $(srcdir)/sps-gdb-local.in. + +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Fix build dependencies in Swilena. * python/Makefile.am (image2d_point2d-wrap.cc): Depend on diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index ff29d3c..b988cd8 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -40,7 +40,7 @@ AM_LDFLAGS = -avoid-version -module -shared @AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $@ $< -# Use Make to generate `data.py' and shell scripts (`sps' and +# Use Make to generate `data.py' and shell scripts (such as `sps' and # `sps-local') instead of `configure', as advised by Autoconf's manual # (see section ``Installation Directory Variables''). edit = sed \ @@ -50,7 +50,8 @@ edit = sed \ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \ -e 's|@pythondir[@]|$(pythondir)|g' \ - -e 's|@PYTHON[@]|$(PYTHON)|g' + -e 's|@PYTHON[@]|$(PYTHON)|g' \ + -e 's|@LIBTOOL[@]|$(LIBTOOL)|g' # swilena.py: The whole Swilena suite. @@ -321,11 +322,11 @@ python_PYTHON += sps.py # The script to be used in installed distributions. bin_SCRIPTS = sps # The script to be used in non-installed build trees. -noinst_SCRIPTS = sps-local +noinst_SCRIPTS = sps-local sps-gdb-local -EXTRA_DIST += sps-common.in sps.in sps-local.in +EXTRA_DIST += sps-common.in sps.in sps-local.in sps-gdb-local.in -sps sps-local: Makefile $(srcdir)/sps-common.in +$(bin_SCRIPTS) $(noinst_SCRIPTS): Makefile $(srcdir)/sps-common.in rm -f $@ $@.tmp srcdir=''; \ test -f ./$@.in || srcdir=$(srcdir)/; \ @@ -338,6 +339,7 @@ sps sps-local: Makefile $(srcdir)/sps-common.in sps: $(srcdir)/sps.in sps-local: $(srcdir)/sps-local.in +sps-gdb-local: $(srcdir)/sps-gdb-local.in CLEANFILES += $(bin_SCRIPTS) $(noinst_SCRIPTS) diff --git a/swilena/python/sps-local.in b/swilena/python/sps-gdb-local.in similarity index 73% copy from swilena/python/sps-local.in copy to swilena/python/sps-gdb-local.in index 88ac50d..f30b3d8 100644 --- a/swilena/python/sps-local.in +++ b/swilena/python/sps-gdb-local.in @@ -3,4 +3,4 @@ # sps local version, for use from non installed distributions. PYTHONPATH='@abs_builddir@:@abs_builddir@/.libs:@abs_srcdir@':"$PYTHONPATH" \ DYLD_LIBRARY_PATH='.libs:@abs_top_builddir@/src/.libs' \ -exec @PYTHON@ -i @abs_srcdir@/sps.py "$@" +exec @LIBTOOL@ --mode=execute gdb --args @PYTHON@ -i @abs_srcdir@/sps.py "$@" -- 1.7.2.5

12 years, 3 months

last-svn-commit-560-g074a32c Fix build dependencies in Swilena.

by Roland Levillain

* python/Makefile.am (image2d_point2d-wrap.cc): Depend on $(top_srcdir)/swilena/concat.ixx. --- swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 38e7be9..ea9ecab 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Fix build dependencies in Swilena. + + * python/Makefile.am (image2d_point2d-wrap.cc): Depend on + $(top_srcdir)/swilena/concat.ixx. + +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Comment on an issue of Swilena highlighted by max-tree.py. * python/max-tree.py: Here. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 4865755..ff29d3c 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -306,6 +306,7 @@ image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/ppm.ixx image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/fill.ixx image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/concat.ixx image2d_point2d-wrap.cc: $(top_srcdir)/swilena/image2d.ixx image2d_point2d-wrap.cc: $(top_srcdir)/swilena/fill.ixx image2d_point2d-wrap.cc: $(top_srcdir)/swilena/println.ixx -- 1.7.2.5

12 years, 3 months

last-svn-commit-559-ge445824 Comment on an issue of Swilena highlighted by max-tree.py.

by Roland Levillain

* python/max-tree.py: Here. --- swilena/ChangeLog | 6 ++++++ swilena/python/max-tree.py | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 868a17e..38e7be9 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,11 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Comment on an issue of Swilena highlighted by max-tree.py. + + * python/max-tree.py: Here. + +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Update the local (build-time) Swilena Python Shell. * python/sps-local.in (PYTHONPATH): Add `@abs_builddir@/.libs'. diff --git a/swilena/python/max-tree.py b/swilena/python/max-tree.py index 05dd32a..236c75d 100644 --- a/swilena/python/max-tree.py +++ b/swilena/python/max-tree.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2010, 2012 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -37,8 +37,18 @@ for p, v in itertools.izip(ima.domain(), values): ima.set(p, int_u8(v)) image.println("ima =", ima) +# FIXME: The type of the (Python) object returned by this call, +# <type 'SwigPyObject'>, is wrong. The right type should be +# <class 'image2d_point2d.image2d_point2d'>, but the fact that the +# routine and the result object are located in two different +# (generated) Swilena submodules seems to confuse SWIG. A consequence +# of this issue is that `max_tree_parent' is not usable at all, hence +# the failure of the last line of this test. We should perhaps review +# Swilena's design and minimize or even completely get rid of the +# modular approach... max_tree_parent = image.max_tree(ima, c4()); -# FIXME: Why can't we use + +# FIXME: Overloading issue: Why can't we use # # image2d_point2d.println("max_tree_parent =", max_tree_parent) # -- 1.7.2.5

12 years, 3 months

last-svn-commit-558-g43b5af6 Update the local (build-time) Swilena Python Shell.

by Roland Levillain

* python/sps-local.in (PYTHONPATH): Add `@abs_builddir@/.libs'. --- swilena/ChangeLog | 6 ++++++ swilena/python/sps-local.in | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index b4be5ef..868a17e 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + + Update the local (build-time) Swilena Python Shell. + + * python/sps-local.in (PYTHONPATH): Add `@abs_builddir@/.libs'. + 2012-07-27 Roland Levillain <roland(a)lrde.epita.fr> Get rid of `ltihooks' in Swilena. diff --git a/swilena/python/sps-local.in b/swilena/python/sps-local.in index 91b7d77..88ac50d 100644 --- a/swilena/python/sps-local.in +++ b/swilena/python/sps-local.in @@ -1,6 +1,6 @@ # -*- sh -*- # sps local version, for use from non installed distributions. -PYTHONPATH='@abs_builddir@:@abs_srcdir@':"$PYTHONPATH" \ +PYTHONPATH='@abs_builddir@:@abs_builddir@/.libs:@abs_srcdir@':"$PYTHONPATH" \ DYLD_LIBRARY_PATH='.libs:@abs_top_builddir@/src/.libs' \ exec @PYTHON@ -i @abs_srcdir@/sps.py "$@" -- 1.7.2.5

12 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2012