- Olena-patches

olena: olena-2.0-787-gfad39ca Stop generating milena/mln/version.hh in the build tree with configure.
by Roland Levillain 06 Sep '13

06 Sep '13

* configure.ac: No longer configure milena/mln/version.hh, as milena/Makefile now generates it the source tree instead. --- ChangeLog | 7 +++++++ configure.ac | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2314fc0..2369b28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + + Stop generating milena/mln/version.hh in the build tree with configure. + + * configure.ac: No longer configure milena/mln/version.hh, as + milena/Makefile now generates it the source tree instead. + 2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Untabify. diff --git a/configure.ac b/configure.ac index b1e8b2e..aa1f1fd 100644 --- a/configure.ac +++ b/configure.ac @@ -46,11 +46,6 @@ AM_INIT_AUTOMAKE([1.11 subdir-objects check-news tar-pax dist-bzip2 # "GEN ..." message, unless V=1 is passed to "make". AM_SILENT_RULES([yes]) -# Package metadata. -# Contrary to config.h, milena/mln/version.hh is meant to be installed. -## FIXME: Consider generating milena/mln/version.hh with `make' instead -## of `configure'. -AC_CONFIG_FILES([milena/mln/version.hh]) ## --------------------- ## -- 1.7.10.4

1 0

olena: olena-2.0-786-g5158238 Generate Milena's mln/version.hh in the source tree.
by Roland Levillain 06 Sep '13

06 Sep '13

* Makefile.am ($(srcdir)/mln/version.hh): New target, generating mln/version.hh in the source tree using make instead of configure. (edit): New. (EXTRA_DIST): Add mln/version.hh.in (nobase_nodist_include_HEADERS): Remove mln/version.hh. * mln/version.hh: New (generated). * headers.mk: Regen. --- milena/ChangeLog | 12 ++++++++++++ milena/Makefile.am | 28 ++++++++++++++++++++++++---- milena/headers.mk | 1 + milena/mln/{version.hh.in => version.hh} | 10 +++++----- 4 files changed, 42 insertions(+), 9 deletions(-) copy milena/mln/{version.hh.in => version.hh} (83%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0e0442b..700a6f4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + + Generate Milena's mln/version.hh in the source tree. + + * Makefile.am ($(srcdir)/mln/version.hh): New target, generating + mln/version.hh in the source tree using make instead of configure. + (edit): New. + (EXTRA_DIST): Add mln/version.hh.in + (nobase_nodist_include_HEADERS): Remove mln/version.hh. + * mln/version.hh: New (generated). + * headers.mk: Regen. + 2013-09-05 Roland Levillain <roland(a)lrde.epita.fr> Remove an unnecessary #include from an example of the tutorial. diff --git a/milena/Makefile.am b/milena/Makefile.am index f65a8cf..058cadd 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -76,8 +76,28 @@ $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh include $(srcdir)/headers.mk -# Generated by configure from mln/version.hh.in. -nobase_nodist_include_HEADERS = mln/version.hh + +# Package metadata (mln/version.hh). +# +# Note that contrary to $(top_srcdir)/config.h, mln/version.hh is +# meant to be installed and is part of the library. + +edit = sed -e 's,@PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \ + -e 's,@PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,@PACKAGE_STRING[@],$(PACKAGE_STRING),g' \ + -e 's,@PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,@PACKAGE_URL[@],$(PACKAGE_URL),g' \ + -e 's,@PACKAGE_AUTHORS[@],$(PACKAGE_AUTHORS),g' + +EXTRA_DIST = mln/version.hh.in +$(srcdir)/mln/version.hh: mln/version.hh.in $(top_srcdir)/configure.ac Makefile.am + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$@.in >$@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + imgdir = $(pkgdatadir)/images dist_img_DATA = \ @@ -107,7 +127,7 @@ dist_img_DATA = \ img/tiny.ppm \ img/toto.pbm -EXTRA_DIST = \ +EXTRA_DIST += \ tests/img/test_rgb8.tif \ tests/img/test_bw.tif \ tests/img/test_gl.tif diff --git a/milena/headers.mk b/milena/headers.mk index f313fab..5321e76 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1298,6 +1298,7 @@ mln/value/sign.hh \ mln/value/super_value.hh \ mln/value/value_array.hh \ mln/value/viter.hh \ +mln/version.hh \ mln/win/all.hh \ mln/win/backdiag2d.hh \ mln/win/ball.hh \ diff --git a/milena/mln/version.hh.in b/milena/mln/version.hh similarity index 83% copy from milena/mln/version.hh.in copy to milena/mln/version.hh index 6612aa2..a043ae2 100644 --- a/milena/mln/version.hh.in +++ b/milena/mln/version.hh @@ -21,19 +21,19 @@ # define MLN_VERSION_HH /// The address where bug reports should be sent. -#define OLN_PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" +#define OLN_PACKAGE_BUGREPORT "olena(a)lrde.epita.fr" /// The full name of this package. -#define OLN_PACKAGE_NAME "@PACKAGE_NAME@" +#define OLN_PACKAGE_NAME "Olena" // The full name and version of this package. -#define OLN_PACKAGE_STRING "@PACKAGE_STRING@" +#define OLN_PACKAGE_STRING "Olena 2.0a" /// The version of this package. -#define OLN_PACKAGE_VERSION "@PACKAGE_VERSION@" +#define OLN_PACKAGE_VERSION "2.0a" /// Home page for this package. -#define OLN_PACKAGE_URL "@PACKAGE_URL@" +#define OLN_PACKAGE_URL "http://olena.lrde.epita.fr" /// Authors of the package. #define OLN_PACKAGE_AUTHORS "EPITA Research and Development Laboratory (LRDE)" -- 1.7.10.4

1 0

[Olena] #262: Merge next-to-apply in next
by Olena Trac 06 Sep '13

06 Sep '13

#262: Merge next-to-apply in next --------------------------+------------------------------------------------- Reporter: lazzara | Owner: levill_r Type: pull-request | Status: new Priority: major | Milestone: Olena 2.1 Component: Milena | Version: 1.0 Keywords: | --------------------------+------------------------------------------------- This branch contains two patches: - Fix ASCII PNM loading. - Fix mln/version.hh generation. -- Ticket URL: <https://trac.lrde.org/olena/ticket/262> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 3

[Olena] #281: Repair the online Document Layout Analysis and Reconstruction demo
by Olena Trac 06 Sep '13

06 Sep '13

#281: Repair the online Document Layout Analysis and Reconstruction demo ---------------------------+---------------------- Reporter: levill_r | Owner: levill_r Type: defect | Status: new Priority: major | Milestone: Component: Web | Version: 2.0 Keywords: demonstration | ---------------------------+---------------------- Guillaume Lazzara reported an issue with the online Document Layout Analysis and Reconstruction demo: http://lists.lrde.epita.fr/pipermail/olena/2013-August/000550.html hosted at http://olena.lrde.epita.fr/demos/document_segmentation.php The processed ended with this error: "PDF output : /tmp/web_app147489430652208889c261d3.66045018.pdf"Ooops! Something went wrong. Please contact us in order to fix that! -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/281> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

olena: branch vtk-format deleted: last-svn-commit-209-g6629f93
by git＠lrde.epita.fr 05 Sep '13

05 Sep '13

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 vtk-format has been deleted was 6629f93070da7d9eea9fa6a7b99e96154d624565 ----------------------------------------------------------------------- 6629f93070da7d9eea9fa6a7b99e96154d624565 Add preliminary VTK input for binary images. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch fixes updated: olena-2.0-785-gffd0699
by git＠lrde.epita.fr 05 Sep '13

05 Sep '13

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 fixes has been updated via ffd06991c036d91cd0e1d7c5694547213ddbc125 (commit) via bb6ddb7e8f323fa072b903b81b87d81f410734b3 (commit) via abdd5eb7842021c807fe66dd46e4d6aca9911d5b (commit) via 010f8aa5fa3a09d58bb4a872f199384e18b51974 (commit) via 6b18b5041243d56e03da45a779f1a50446785276 (commit) via 71717ea0aa2e527ef9cf6b6667b026d101e54fc7 (commit) via e6fe7d359db0a18c8f37dd29f06bfa1d9fead977 (commit) via 450410e982d7c9abbd5d0b4c3d834284a504d138 (commit) via 4998bf92ef1bd4a382768a9b9abcb925fc1bfe7b (commit) via 0774f862907bf1f3b751cbd8e8124daa6ab58cea (commit) via 346ed701130cb8bf46386ce95ac35b15d65fa3d7 (commit) via a40ac76c172a4cedfaa305baa9776408a060d481 (commit) via f8090ed81ed6a495faff8ce918139ce05d8c38a4 (commit) via 32fe23ae1923b358cac3a9e1ab1b82ce7bc49f8c (commit) via 917fa3dc9d19267535b783c4e5fd834542ce175a (commit) via 7c470abe909031667f8fb466958aa3f189ef3086 (commit) via 2cbfa7dcb92861252795028c0c8fc366757dbf72 (commit) via e20e410934110ac86fe6d2590657a25a29c0034c (commit) via c01c17406ae476e0e89407dc6db013110a4121da (commit) via 314a240db85747e9822ed9494a497d312a0bdbde (commit) via bdade6e5643b8c974e1b6c7e99db070600c6259a (commit) via 1cbfcbe8bcaa34925f7a0d24ffaab0ddaedf293d (commit) via d05185f51003f72f0d3d530b97adca245fadc998 (commit) via 8caa6a0fbb8fbcf1acfc55712abf1b0ddfa9a7e3 (commit) via 5028921e3633fa750f78434344b4a7c76d443582 (commit) via 5d8a12598439482ccd53c596bb7e0690bf960ab8 (commit) via e9bf0a68327ee187aad6616038d5661e8bf440a6 (commit) via b77aca0a9a5c5c514ce258c853ee55ad6678d0a9 (commit) via fe72eddb49c039d57bd3c778937e97c867c2530e (commit) via 91582ecbeb5ce3a6885aada08a09f445dea9651d (commit) via fea1bdb0b38b2f265838f332137c9e4f22711801 (commit) via d06e84f05872eb7ba686f43384a68fb014c4af8c (commit) via 66dc444e5b61893ef6ed78dcad9c2178228b4c7d (commit) via 4b84c24f6bf2641a82d6eff062f55eab0cd06443 (commit) via 5d26c00af6003c608a1c04be40851ca34ac38a63 (commit) via d3965a63e8470b121892146ced02946aa1a3c068 (commit) via dadfbf8950ef83c64755eaa15a9b469cb2d70ae3 (commit) via b8c5c642918812a1b8b9b2c09d65fb4bef2d41cb (commit) via a97476569ceb8f6ed597a87fb27bafd412970efa (commit) via 7044058ab5a375b2e582ebad82621228e8030d48 (commit) via c7b2885c2aaefecda885eabd0a3e8491aa373925 (commit) via 8c2373f81c5660b119c96fecbddae0abbbc5d29d (commit) via b815f9e2faf5ce7fe0deda0f4a7b9d07713f9b90 (commit) via c54ade0529937a4d66187dea311a67dd49527597 (commit) via e3d31288ebed111747116932b6056550f7229b72 (commit) via 989f64c914db17c4381adbff449f799b46e981f7 (commit) via caafe2757aa4412f8e61bc6528feb88d35129141 (commit) via fd81df408806ec032d613c91f6aced2eab5e239d (commit) via 2a45daf1baa56780ee68c4d42c4e575e8ad693c2 (commit) via adbe79b77bfb5daef430d2a003891458ab27f5f4 (commit) via 92370252d966b05de95b4f4e1ba8cdefbd589513 (commit) via d31555ad4cc07979b43873987b3cf7ec10d4c1e0 (commit) via a746768a222aa1b3ec885099818b6d6efc824dea (commit) via 1692704a4e5905ac03d7c96f21d2ba10c7bd704c (commit) via 8c6f47af691c0616259a54ca1710c98c6826731c (commit) via 176f3fd8be2f5eb18d832c4cf19d8f3efa8abaa7 (commit) via 5f10622a1e4e2ebd6c611be95802cad42ab6f7aa (commit) via 8a48d8079b603e627237f7ca8524528e9ccdd714 (commit) via 8f6e58708365263bf6198bc567994fea7879a6e7 (commit) via dcb65af6925d22936a721ddd17ce91c834f1dcbb (commit) via 26d28a507403bced81ccbbfb8cfc1d008f33f648 (commit) via b40c467c3953682c550a820510252473cb9bbade (commit) via 0feab07fa0cc4de58a9aa36aa63031416dea49f5 (commit) via e3b70ab14ce95e19449395a38f037c902e3cf9d7 (commit) via 0d75e39af1931bb05c1621a0b51861a73f8c97eb (commit) via cd1d4e984a9b56e21f6b1f67a34487254ba0b40c (commit) via 064910dbb2f8d70b87c1d78836386b32928dff68 (commit) via d56e10be0cef21a014909aedc73f4409ee3c3402 (commit) via ac04251919bfb607b5da55d91b505c387c945e6c (commit) via c8994ac388a94521fb1cd0eb95baf73c6a79bdbf (commit) via ae5b2f2067ba6a8a389acd3bd6c063315905af44 (commit) via aa7f3d1c34dd90c3c1c968fbad9517156a11940a (commit) via 887a3fe17b396633af4611076e69bb5c76c3413f (commit) via 2ab706df5d8edb964d6fcae88148f6f105027aed (commit) via 050eff13f8b5c8bbd8406b6dab922d1b8574c561 (commit) via b97c12aee11a2e516237b02412914e5f4bfc2e17 (commit) via 6cb33ef7ca56427fa323fe11ff40bda0be9b163f (commit) via 2bc617f494e7c5bb8e2a93b6778fca1a085456d0 (commit) via 5f4400b17bbaf4ee0dbfc0ed4e80bf2a376b76d0 (commit) via e52aac02b156fd06b7de45959c8bf55024d98959 (commit) via 8f71dbf3fb8f07798274336ef38ed4ec452e8cfc (commit) via ed99a96992fcb4ebc2f2a416bae04c97b074a8b7 (commit) via e3799361c833404830f88ac40091998bab1340d3 (commit) via de6c91cef4c10e3dbb66f63092d3c1a983d39cc2 (commit) via 8ea78356187b68e314e2e6bf915c2c1e652edcd5 (commit) via d06dc7960770317f00270ea1db8066fbbab14358 (commit) via e56dcf932acc99554acf6a57325c9b5f4de331dd (commit) via d95b8eb4bca61df6982e7b738ee3b5f689334c2e (commit) via c607b2b473ea041164765d74761665f7cd16679f (commit) via 8da07c1ba16fd7e2f3efc0da7c24cf6892cabea4 (commit) via f6c0e86048ab35abf56eec1d8dc16332fc3bdf03 (commit) via b4795e30ef8c1cdfe67c8d7ec3591aec9da5eb16 (commit) via 0abd35d7c909bef44614fea9483b0a7c8e65a76a (commit) via 178d9766cf611cba88150f776cd0487af9af8d06 (commit) via 9b0c072e6285ab9b3a7ad98db3c7bd311d7339dc (commit) via 468f30937f07f5516e36220248bb50f549f3013a (commit) via 26697559f82f078325ddaa979176ffec509726ae (commit) via 095d4d83c7ae469708f1da8e0df191b96c5195e4 (commit) via 306940e5bcac4ab11a2ecf04b35e171b23212367 (commit) via aec0b06e61c989df7ba3a3c89fece4c10d4c035a (commit) via e0308f46eeb95a3d133b81ae21ecfc3e85561e73 (commit) via df7ee00617e417f3e3782f296317180aab397c68 (commit) via 359105b5373ba839805b1198597e3049fae509f5 (commit) via 3f55de7920b3b6ca92e4d6b7f80c7a69f48060f5 (commit) via 94167940366c76ce3d8fa8fc71bcef6366336f5c (commit) via 9a84a00e71be26f15a4cb026563b83b058f191fc (commit) via faeffbfac0157771d8afbb181ddf1aa6ce62bd64 (commit) via 848be92889506f3522e0063d19b942e9e26e1429 (commit) via 65e27d4f181270bdf32ccd70623b02f8c6515d7b (commit) via 75d014789ef295f49c144e41b3388d1965f3b003 (commit) via 5f6cc931ac246ce107794adb0812dfcadab90c65 (commit) via 5da629f7d9ab5cea4acf78daae3f4ec46f710111 (commit) via 641fb1845b4afaf3d7be707b9eab9757ebd9848e (commit) via 10886bb0bd1026a72b13212602008d34a1e6a26c (commit) via 5c51ffe52ba4551362ab8a77be720b5afc856cc6 (commit) via 1af4682ac3441c1e45c1e0c192b0991e2ba8e563 (commit) via 202bac27de2b47341f76e44bef7cb1ddf671a79a (commit) via e9c085e05f15fdd3e30287c26db7cf3d659baff7 (commit) via 959b10e6917b071d17bfa765e715cefa47a94c0e (commit) via 958cb5799166a785a8db956a20f44547c0c8e022 (commit) via 4b83d9c6b4e22789c1069e5f147ac9f674995a8c (commit) via 29bf3b02e00c4d7e65586f935fda3849f2067d27 (commit) via 7c649ab73e632b9399b2824a75529f95b530f168 (commit) via 9faa94823c7a7bae018f944ab17e79f5d0774ac3 (commit) via 279c33718e3dcaba50a6efc29c45ff63a0713cda (commit) via 81f0006071a6fda8295c75c48dd7df0c3f5d8c19 (commit) via afa46ab741c9b611d0817ab18e04c8c658c83ddf (commit) via 955984a153a407f807549bc2b147e9a149861c05 (commit) via a412a54529f79027659b8c3fd723556b77cfd2ed (commit) via 4ebb5d640799b7ce299d4a573a42d0eb48b1c9df (commit) via 7e43020f1b94958d6287965abf4cb4cab901895b (commit) via 0a1c7ac3b44b539d21e4b3f50738291b2f79e093 (commit) via 26d31484856f050052cfed5122507ad24926e81a (commit) via c1215ffb093c6e4b0bfbb8d6d0c522e4591c9979 (commit) via 6e6baf62c3b15ccd846760b5cd5c0ca8401d7afe (commit) via 42bdd44352ec055008afc581b4a61ed892f1ef5f (commit) via b3754d8eda282e0a83afaf8bf5dbe42ffb0193c9 (commit) via 88e9e68e5ee86ef83b4d6ed2fcc926ae4497ecc2 (commit) via 6b9bc50e45224d17f9ac617fc36b9baa8807ffb2 (commit) via a2d5c260202c5cd2d2f536aab7f03370d5c39aaa (commit) via 8c828c81c57a819e5eaf88ffc47fc354948e9d05 (commit) via 3124478b0522c2fda5b4b2d6b903f3c66e8532ea (commit) via 3e32b86e95ee68eaa69bd188a3cfb9a084dd3c64 (commit) via b1efc3e8713ad04f14e4e65645342927b33fbfe1 (commit) via f15b2c0e82fb846615c755590564955e56b163fc (commit) via 8f094c6dbc3e7a53004f25a6b4268c5fa88e0f47 (commit) via 02c4ea9fa1d28f8f6fd8161f5464e713e6c1c540 (commit) via 0a078938b8f3fdc10d234fe663ff74a4b6a44284 (commit) via 8b31df65d090f1ac9965f0feb4d3bb68a17948f1 (commit) via 588a6d4df5b2260df18ea39cd73dfdb2218120f6 (commit) via 089d5ff91de9d30939ecb783a161ff542b0240ca (commit) via 6919bfe815821aadac688e68ad2cc9c044786592 (commit) via 870ac7ad52b84c32ffd4ec4b1dd0ba8d3e03760f (commit) via 1e9b9bdc30b97729412d43c28c213461e52ed5eb (commit) via 3f5d9e560d0d128aafa28be5fea3f1e8f8dad9d6 (commit) via 02720ffe0da87af83572f465b4a5360e1a84ade8 (commit) via bee3fa8b6c21739dafb6e3aabe059940a00f8ed3 (commit) via 31f1d7085fcd358ae06d7bef523df048b38c7132 (commit) via 5f1d602d3115879c4fdddf26e5c4ac68f043b671 (commit) from 95ac14a3201bedb36199d8771972f8a48dddd5be (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 ----------------------------------------------------------------- ffd0699 Remove an unnecessary #include from an example of the tutorial. ----------------------------------------------------------------------- Summary of changes: .dir-locals.el | 5 + ChangeLog | 63 +- configure.ac | 30 +- doc/Doxyfile.in | 4 +- doc/Makefile.am | 39 +- milena/ChangeLog | 1490 +- milena/Makefile.am | 1 + milena/apps/Makefile.am | 5 +- .../constrained-connectivity.cc | 10 +- milena/apps/generic-skel/Makefile.am | 115 + .../generic-skel/image2d-skel-unconstrained.cc | 92 + .../generic-skel/image2d-skel-with-end-points.cc | 94 + .../generic-skel/image3d-skel-unconstrained.cc | 109 + .../generic-skel/image3d-skel-with-1d-isthmuses.cc | 114 + .../generic-skel/image3d-skel-with-end-points.cc | 114 + milena/apps/generic-skel/image3d-skel.hh | 399 + .../test-image2d-skel-unconstrained.in} | 16 +- .../test-image2d-skel-with-end-points.in} | 16 +- .../generic-skel/test-mixed.in} | 17 +- milena/apps/graph-morpho/morpho.hh | 8 +- milena/apps/mesh-segm-skel/Makefile.am | 187 +- .../apps/mesh-segm-skel/mesh-complex-2-collapse.cc | 153 + .../mesh-complex-max-curv-1-collapse.cc | 386 + .../mesh-complex-max-curv-2-collapse.cc | 328 + ...ax-curv.cc => mesh-complex-max-curv-extrema.cc} | 109 +- .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 56 +- .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 328 + .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 17 +- ...curv-segm.cc => mesh-complex-pinv-curv-segm.cc} | 63 +- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 344 + milena/apps/mesh-segm-skel/mesh-complex-segm.cc | 26 +- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 126 +- milena/apps/mesh-segm-skel/misc.hh | 15 +- .../apps/mesh-segm-skel/off-to-vtk-bin.cc | 48 +- milena/apps/mesh-segm-skel/save_bin_alt.hh | 310 +- .../test-mesh-complex-2-collapse.in} | 15 +- .../test-mesh-complex-max-curv-1-collapse.in} | 16 +- .../test-mesh-complex-max-curv-2-collapse.in} | 16 +- .../test-mesh-complex-max-curv-extrema.in} | 18 +- .../test-mesh-complex-max-curv-skel.in} | 18 +- .../test-mesh-complex-pinv-curv-segm.in} | 17 +- .../test-mesh-complex-pinv-curv-skel.in} | 18 +- .../mesh-segm-skel/test-mixed.in} | 17 +- milena/apps/morphers/recorder-bft.cc | 9 +- milena/doc/Doxyfile.in | 2 +- milena/doc/Makefile.am | 53 +- milena/doc/examples/devel/facade.cc.raw | 4 +- milena/doc/examples/devel/impl.cc.raw | 7 +- .../examples/split/tuto3_first_routine-1.cc.raw | 1 - milena/doc/examples/tuto3/first_routine.cc | 1 - milena/doc/figures/extend-1.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/extend-2.ppm | Bin 16546 -> 16547 bytes milena/doc/figures/extend-3.ppm | Bin 16546 -> 16547 bytes milena/doc/figures/extend-4.ppm | 2 +- milena/doc/figures/extend-5.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-1.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-2.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-imageif-cfun-1.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-1.pbm | 2 +- milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-4.ppm | Bin 206 -> 207 bytes milena/doc/figures/ima2d-rot-1.ppm | Bin 235320 -> 235321 bytes milena/doc/figures/ima2d-rot-2.ppm | Bin 235320 -> 235321 bytes milena/doc/figures/ima_save.pbm | 2 +- milena/doc/figures/labeling-compute-1.pbm | 2 +- milena/doc/figures/labeling-compute-2.ppm | Bin 206 -> 207 bytes milena/doc/figures/logical-not-1.pbm | 2 +- milena/doc/figures/logical-not-2.pbm | 2 +- milena/doc/figures/logical-not-3.pbm | 2 +- milena/doc/figures/tuto2_first_image-1.pbm | 2 +- milena/doc/figures/tuto3_colorize-1.pgm | Bin 141 -> 142 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 191 -> 192 bytes milena/doc/figures/tuto3_rw_image-1.ppm | Bin 4918 -> 4919 bytes milena/doc/figures/tuto3_rw_image-2.ppm | 2 +- milena/doc/figures/tuto3_rw_image-3.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-1.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-2.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-3.pbm | 2 +- .../figures/tuto4_genericity_and_algorithms-4.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-6.ppm | Bin 12406 -> 12407 bytes milena/doc/generate_dist_files.sh | 47 - milena/doc/tools/clearbanner.sh | 22 - milena/headers.mk | 19 +- milena/img/README | 6 + milena/img/bunny.pgm | Bin 0 -> 27000043 bytes milena/mesh/Makefile.am | 26 +- milena/mesh/bunny-holefilled.vtk |458714 ++++++++++++++++++++ milena/mesh/pseudo-manifold.vtk | 188 + milena/mesh/teapot.vtk |25008 ++ milena/mesh/tetrahedron.vtk | 48 + milena/mln/accu/stat/median_alt.hh | 14 +- milena/mln/algebra/quat.hh | 9 +- .../canvas/browsing/dir_struct_elt_incr_update.hh | 31 +- milena/mln/core/alias/complex_image.hh | 18 +- .../mln/core/image/dmorph/mutable_extension_ima.hh | 272 + milena/mln/core/image/image2d.hh | 5 - milena/mln/core/internal/classical_window_base.hh | 1 - milena/mln/core/internal/image_morpher.hh | 1 - .../{math/pi.hh => core/routine/mutable_extend.hh} | 47 +- milena/mln/core/site_set/p_set.hh | 14 +- milena/mln/fun/p2b/antilogy.hh | 1 - milena/mln/fun/p2b/tautology.hh | 1 - milena/mln/geom/complex_geometry.hh | 16 +- milena/mln/io/fld/write_header.hh | 9 +- milena/mln/io/off/load.hh | 27 +- milena/mln/io/off/save.hh | 6 +- milena/mln/io/pdf/load.hh | 8 +- milena/mln/io/pnm/save_header.hh | 10 +- milena/mln/io/raw/load.hh | 3 +- milena/mln/io/tiff/load.hh | 10 +- .../core/alias/dpoint2d.cc => mln/io/vtk/all.hh} | 32 +- milena/mln/io/vtk/load.hh | 615 + milena/mln/io/vtk/save.hh | 649 + milena/mln/make/attachment.hh | 53 +- milena/mln/make/cell.hh | 11 +- milena/mln/make/detachment.hh | 56 +- milena/mln/math/pi.hh | 10 +- milena/mln/morpho/tree/data.hh | 10 +- milena/mln/morpho/tree/impl/dual_hqueue.hh | 5 +- milena/mln/morpho/tree/impl/dual_union_find.hh | 13 +- milena/mln/morpho/watershed/topological.hh | 198 +- milena/mln/topo/connectivity_number_2d.hh | 130 + milena/mln/topo/connectivity_number_3d.hh | 309 + milena/mln/topo/detach.hh | 83 - milena/mln/topo/detach_cell.hh | 154 + milena/mln/topo/detach_pair.hh | 191 + milena/mln/topo/detach_point.hh | 114 + milena/mln/topo/is_facet.hh | 52 +- milena/mln/topo/is_n_face.hh | 16 +- milena/mln/topo/is_not_1d_isthmus.hh | 208 + milena/mln/topo/is_not_end_point.hh | 121 + milena/mln/topo/is_simple_2d.hh | 135 +- milena/mln/topo/is_simple_cell.hh | 114 +- milena/mln/topo/is_simple_pair.hh | 225 + milena/mln/topo/is_simple_point2d.hh | 142 + milena/mln/topo/is_simple_point3d.hh | 191 + milena/mln/topo/{is_n_face.hh => no_constraint.hh} | 46 +- milena/mln/topo/skeleton/breadth_first_thinning.hh | 171 +- .../mln/topo/skeleton/priority_driven_thinning.hh | 215 + milena/mln/transform/fft.hh | 705 + milena/mln/util/edge.hh | 3 +- milena/mln/util/timer.hh | 9 - milena/mln/version.hh.in | 19 +- milena/new-header | 4 +- milena/tests/core/alias/Makefile.am | 3 +- milena/tests/core/alias/dpoint2d.cc | 4 +- .../tests/core/alias/{dpoint2d.cc => neighb2d.cc} | 33 +- milena/tests/core/image/complex_image.hh | 20 +- milena/tests/io/Makefile.am | 5 +- milena/tests/io/dump/Makefile.am | 4 +- milena/tests/io/dump/dump.cc | 32 + milena/tests/io/{dump => vtk}/Makefile.am | 18 +- .../deskew.cc => milena/tests/io/vtk/load_bin.cc | 44 +- .../alias/dpoint2d.cc => io/vtk/load_save_bin.cc} | 33 +- milena/tests/io/vtk/save.cc | 106 + milena/tests/make/Makefile.am | 4 +- milena/tests/make/attachment.cc | 77 + milena/tests/make/detachment.cc | 98 + milena/tests/topo/Makefile.am | 13 +- milena/tests/topo/connectivity_numbers_2d.cc | 87 + milena/tests/topo/detach_pair.cc | 73 + milena/tests/topo/is_facet.cc | 80 + milena/tests/topo/is_simple_pair.cc | 73 + milena/tests/topo/skeleton/Makefile.am | 12 +- .../tests/topo/skeleton/breadth_first_thinning.cc | 52 +- .../skeleton/breadth_first_thinning_constrained.cc | 78 + .../topo/skeleton/priority_driven_thinning.cc | 92 + .../priority_driven_thinning_constrained.cc | 96 + milena/tests/transform/Makefile.am | 22 +- milena/tests/transform/fft.cc | 105 + milena/tests/unit_test/Makefile.am | 3 +- milena/tests/unit_test/cond_tests_fftw3 | 1 + milena/tests/unit_test/unit-tests.mk | 27 +- milena/tests/value/Makefile.am | 7 +- .../{core/alias/dpoint2d.cc => value/int_u32.cc} | 28 +- milena/tools/Makefile.am | 66 +- milena/tools/compute_local_configurations.cc | 109 + .../pi.hh => tools/connectivity_numbers_3d.cc} | 48 +- milena/tools/connectivity_numbers_3d.hh | 407 + .../tools/connectivity_numbers_3d_tbb.cc | 50 +- milena/tools/connectivity_numbers_3d_tbb.hh | 163 + milena/tools/gen_cxx_lut | 103 + .../tools/simple_point3d_lut.cc | 51 +- milena/tools/simple_point3d_lut.hh | 190 + .../simple_point3d_lut_26_6.cc} | 29 +- .../tools/simple_point3d_lut_tbb.cc | 41 +- milena/tools/simple_point3d_lut_tbb.hh | 185 + milena/tools/test_simple_point3d_lut_26_6.cc | 136 + milena/tools/tools.mk | 7 +- milena/trash/display_color_pretty.hh | 15 +- milena/trash/display_remove.hh | 13 +- milena/trash/display_save.hh | 14 +- milena/trash/display_save_and_show.hh | 10 +- milena/trash/display_show.hh | 10 +- milena/trash/neighb_get.hh | 6 +- scribo/ChangeLog | 90 +- scribo/demo/viewer/Makefile.am | 3 +- scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 50 +- scribo/scribo/afp/components.hh | 12 - scribo/scribo/core/line_set.hh | 2 - scribo/scribo/core/object_groups.hh | 5 +- scribo/scribo/core/paragraph_set.hh | 3 +- scribo/scribo/estim/components_features.hh | 24 +- scribo/scribo/filter/objects_with_holes.hh | 33 +- scribo/scribo/filter/separators_in_borders.hh | 14 - scribo/scribo/io/xml/load.hh | 15 +- scribo/scribo/postprocessing/fill_object_holes.hh | 9 - scribo/scribo/preprocessing/deskew.hh | 7 +- scribo/scribo/preprocessing/deskew_crop.hh | 3 +- .../primitive/extract/lines_h_thick_and_thin.hh | 3 +- scribo/scribo/primitive/extract/non_text.hh | 4 - scribo/scribo/primitive/extract/non_text_kmean.hh | 5 +- .../primitive/extract/separators_nonvisible.hh | 65 +- scribo/scribo/text/clean_inplace.hh | 15 +- scribo/scribo/text/extract_paragraphs_hdoc.hh | 44 - scribo/scribo/text/merging.hh | 55 +- scribo/scribo/text/recognition.hh | 4 +- scribo/src/Makefile.am | 1 - scribo/src/binarization/Makefile.am | 5 - scribo/tests/preprocessing/crop.cc | 6 +- .../preprocessing/crop_without_localization.cc | 6 +- scribo/tests/preprocessing/deskew.cc | 6 +- scribo/tests/preprocessing/rotate_90.cc | 6 +- swilena/ChangeLog | 10 +- swilena/python/Makefile.am | 2 +- 228 files changed, 496835 insertions(+), 1716 deletions(-) create mode 100644 .dir-locals.el create mode 100644 milena/apps/generic-skel/Makefile.am create mode 100644 milena/apps/generic-skel/image2d-skel-unconstrained.cc create mode 100644 milena/apps/generic-skel/image2d-skel-with-end-points.cc create mode 100644 milena/apps/generic-skel/image3d-skel-unconstrained.cc create mode 100644 milena/apps/generic-skel/image3d-skel-with-1d-isthmuses.cc create mode 100644 milena/apps/generic-skel/image3d-skel-with-end-points.cc create mode 100644 milena/apps/generic-skel/image3d-skel.hh copy milena/{tests/topo/Makefile.am => apps/generic-skel/test-image2d-skel-unconstrained.in} (68%) copy milena/{tests/topo/Makefile.am => apps/generic-skel/test-image2d-skel-with-end-points.in} (67%) copy milena/{tests/topo/Makefile.am => apps/generic-skel/test-mixed.in} (63%) create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-2-collapse.cc create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv.cc => mesh-complex-max-curv-extrema.cc} (63%) create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv-segm.cc => mesh-complex-pinv-curv-segm.cc} (72%) create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc copy scribo/tests/preprocessing/deskew.cc => milena/apps/mesh-segm-skel/off-to-vtk-bin.cc (59%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-2-collapse.in} (73%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in} (64%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in} (64%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in} (54%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-skel.in} (55%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-pinv-curv-segm.in} (60%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-pinv-curv-skel.in} (55%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mixed.in} (54%) delete mode 100755 milena/doc/generate_dist_files.sh delete mode 100755 milena/doc/tools/clearbanner.sh create mode 100755 milena/img/bunny.pgm create mode 100644 milena/mesh/bunny-holefilled.vtk create mode 100644 milena/mesh/pseudo-manifold.vtk create mode 100644 milena/mesh/teapot.vtk create mode 100644 milena/mesh/tetrahedron.vtk create mode 100644 milena/mln/core/image/dmorph/mutable_extension_ima.hh copy milena/mln/{math/pi.hh => core/routine/mutable_extend.hh} (59%) copy milena/{tests/core/alias/dpoint2d.cc => mln/io/vtk/all.hh} (73%) create mode 100644 milena/mln/io/vtk/load.hh create mode 100644 milena/mln/io/vtk/save.hh create mode 100644 milena/mln/topo/connectivity_number_2d.hh create mode 100644 milena/mln/topo/connectivity_number_3d.hh delete mode 100644 milena/mln/topo/detach.hh create mode 100644 milena/mln/topo/detach_cell.hh create mode 100644 milena/mln/topo/detach_pair.hh create mode 100644 milena/mln/topo/detach_point.hh create mode 100644 milena/mln/topo/is_not_1d_isthmus.hh create mode 100644 milena/mln/topo/is_not_end_point.hh create mode 100644 milena/mln/topo/is_simple_pair.hh create mode 100644 milena/mln/topo/is_simple_point2d.hh create mode 100644 milena/mln/topo/is_simple_point3d.hh copy milena/mln/topo/{is_n_face.hh => no_constraint.hh} (64%) create mode 100644 milena/mln/topo/skeleton/priority_driven_thinning.hh create mode 100644 milena/mln/transform/fft.hh copy milena/tests/core/alias/{dpoint2d.cc => neighb2d.cc} (68%) copy milena/tests/io/{dump => vtk}/Makefile.am (70%) copy scribo/tests/preprocessing/deskew.cc => milena/tests/io/vtk/load_bin.cc (62%) copy milena/tests/{core/alias/dpoint2d.cc => io/vtk/load_save_bin.cc} (72%) create mode 100644 milena/tests/io/vtk/save.cc create mode 100644 milena/tests/make/attachment.cc create mode 100644 milena/tests/make/detachment.cc create mode 100644 milena/tests/topo/connectivity_numbers_2d.cc create mode 100644 milena/tests/topo/detach_pair.cc create mode 100644 milena/tests/topo/is_facet.cc create mode 100644 milena/tests/topo/is_simple_pair.cc copy scribo/tests/preprocessing/deskew.cc => milena/tests/topo/skeleton/breadth_first_thinning.cc (50%) create mode 100644 milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning.cc create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc create mode 100644 milena/tests/transform/fft.cc create mode 100644 milena/tests/unit_test/cond_tests_fftw3 copy milena/tests/{core/alias/dpoint2d.cc => value/int_u32.cc} (74%) create mode 100644 milena/tools/compute_local_configurations.cc copy milena/{mln/math/pi.hh => tools/connectivity_numbers_3d.cc} (64%) create mode 100644 milena/tools/connectivity_numbers_3d.hh copy scribo/tests/preprocessing/rotate_90.cc => milena/tools/connectivity_numbers_3d_tbb.cc (61%) create mode 100644 milena/tools/connectivity_numbers_3d_tbb.hh create mode 100755 milena/tools/gen_cxx_lut copy scribo/tests/preprocessing/rotate_90.cc => milena/tools/simple_point3d_lut.cc (60%) create mode 100644 milena/tools/simple_point3d_lut.hh copy milena/{tests/core/alias/dpoint2d.cc => tools/simple_point3d_lut_26_6.cc} (73%) copy scribo/tests/preprocessing/crop.cc => milena/tools/simple_point3d_lut_tbb.cc (58%) create mode 100644 milena/tools/simple_point3d_lut_tbb.hh create mode 100644 milena/tools/test_simple_point3d_lut_26_6.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-804-g28316a4 Exercise the multi-scale Sauvola binarization with a TIFF image.
by Roland Levillain 05 Sep '13

05 Sep '13

* tests/img/lena.tiff: New. Generated from Milena's lena.pgm using ImageMagick's convert. * tests/Makefile.am (EXTRA_DIST): Add img/lena.tiff. * tests/binarization/sauvola_ms_tiff.cc: New test. * tests/binarization/sauvola_ms_tiff.ref.pbm: New reference output image. * tests/binarization/Makefile.am (check_PROGRAMS) [HAVE_TIFF]: Add sauvola_ms_tiff. (sauvola_ms_tiff_CPPFLAGS, sauvola_ms_tiff_LDFLAGS) [HAVE_TIFF]: New. (EXTRA_DIST): Add sauvola_ms_tiff.ref.pbm. --- scribo/ChangeLog | 16 +++++++++++++ scribo/tests/Makefile.am | 1 + scribo/tests/binarization/Makefile.am | 6 +++++ .../binarization/{otsu.cc => sauvola_ms_tiff.cc} | 24 ++++++++++---------- ...{sauvola_ms.ref.pbm => sauvola_ms_tiff.ref.pbm} | Bin 32884 -> 32885 bytes scribo/tests/img/lena.tiff | Bin 0 -> 262674 bytes 6 files changed, 35 insertions(+), 12 deletions(-) copy scribo/tests/binarization/{otsu.cc => sauvola_ms_tiff.cc} (75%) copy scribo/tests/binarization/{sauvola_ms.ref.pbm => sauvola_ms_tiff.ref.pbm} (99%) create mode 100644 scribo/tests/img/lena.tiff diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4f33ead..0a54632 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,19 @@ +2013-09-05 Roland Levillain <roland(a)lrde.epita.fr> + + Exercise the multi-scale Sauvola binarization with a TIFF image. + + * tests/img/lena.tiff: New. + Generated from Milena's lena.pgm using ImageMagick's convert. + * tests/Makefile.am (EXTRA_DIST): Add img/lena.tiff. + * tests/binarization/sauvola_ms_tiff.cc: New test. + * tests/binarization/sauvola_ms_tiff.ref.pbm: New reference output + image. + * tests/binarization/Makefile.am (check_PROGRAMS) [HAVE_TIFF]: + Add sauvola_ms_tiff. + (sauvola_ms_tiff_CPPFLAGS, sauvola_ms_tiff_LDFLAGS) [HAVE_TIFF]: + New. + (EXTRA_DIST): Add sauvola_ms_tiff.ref.pbm. + 2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> Scribo: Fix the use of QT_LIBS. diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index 819046b..ca6f297 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = \ img/alignment_3.pbm \ img/alignment_4.pbm \ img/comp_on_borders.pbm \ + img/lena.tiff \ img/lena_weven_hodd.pgm \ img/lena_wodd_heven.pgm \ img/lena_wodd_hodd.pgm \ diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index 7458b1c..79b3e76 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -31,6 +31,7 @@ EXTRA_DIST = \ niblack_fast_weven_hodd.ref.pbm \ niblack_fast_wodd_hodd.ref.pbm \ sauvola_ms.ref.pbm \ + sauvola_ms_tiff.ref.pbm \ sauvola_ms_wodd_heven.ref.pbm \ sauvola_ms_weven_hodd.ref.pbm \ sauvola_ms_wodd_hodd.ref.pbm \ @@ -60,6 +61,11 @@ check_PROGRAMS = \ wolf \ wolf_fast +if HAVE_TIFF +check_PROGRAMS += sauvola_ms_tiff +sauvola_ms_tiff_CPPFLAGS = $(AM_CPPFLAGS) $(TIFF_CPPFLAGS) +sauvola_ms_tiff_LDFLAGS = $(LDFLAGS) $(TIFF_LDFLAGS) +endif HAVE_TIFF TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/binarization/otsu.cc b/scribo/tests/binarization/sauvola_ms_tiff.cc similarity index 75% copy from scribo/tests/binarization/otsu.cc copy to scribo/tests/binarization/sauvola_ms_tiff.cc index fd4c7f2..c9a26b6 100644 --- a/scribo/tests/binarization/otsu.cc +++ b/scribo/tests/binarization/sauvola_ms_tiff.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,29 +24,29 @@ // executable file might be covered by the GNU General Public License. /// \file +/// \brief Exercise the multi-scale Sauvola binarization with a TIFF image. #include <mln/core/image/image2d.hh> -#include <mln/data/compare.hh> #include <mln/value/int_u8.hh> -#include <mln/io/pgm/load.hh> + #include <mln/io/pbm/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/tiff/load.hh> + +#include <mln/data/compare.hh> -#include <scribo/binarization/otsu.hh> +#include <scribo/binarization/sauvola_ms.hh> #include "tests/data.hh" int main() { using namespace mln; + using mln::value::int_u8; - image2d<value::int_u8> input; - io::pgm::load(input, MILENA_IMG_DIR "/lena.pgm"); - - image2d<bool> bin = scribo::binarization::otsu(input); - + image2d<int_u8> input; + io::tiff::load(input, SCRIBO_IMG_DIR "/lena.tiff"); + image2d<bool> bin = scribo::binarization::sauvola_ms(input, 21, 2); image2d<bool> ref; - io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/otsu.ref.pbm"); - + io::pbm::load(ref, SCRIBO_TESTS_DIR "/binarization/sauvola_ms_tiff.ref.pbm"); mln_assertion(bin == ref); } diff --git a/scribo/tests/binarization/sauvola_ms.ref.pbm b/scribo/tests/binarization/sauvola_ms_tiff.ref.pbm similarity index 99% copy from scribo/tests/binarization/sauvola_ms.ref.pbm copy to scribo/tests/binarization/sauvola_ms_tiff.ref.pbm index 7f0e0c9..c9845fe 100644 Binary files a/scribo/tests/binarization/sauvola_ms.ref.pbm and b/scribo/tests/binarization/sauvola_ms_tiff.ref.pbm differ diff --git a/scribo/tests/img/lena.tiff b/scribo/tests/img/lena.tiff new file mode 100644 index 0000000..7661a3a Binary files /dev/null and b/scribo/tests/img/lena.tiff differ -- 1.7.10.4

1 0

olena: olena-2.0-785-gffd0699 Remove an unnecessary #include from an example of the tutorial.
by Roland Levillain 05 Sep '13

05 Sep '13

* doc/examples/tuto3/first_routine.cc: Here. * doc/examples/split/tuto3_first_routine-1.cc.raw: Regen. --- milena/ChangeLog | 7 +++++++ milena/doc/examples/split/tuto3_first_routine-1.cc.raw | 1 - milena/doc/examples/tuto3/first_routine.cc | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3a3a087..0e0442b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-09-05 Roland Levillain <roland(a)lrde.epita.fr> + + Remove an unnecessary #include from an example of the tutorial. + + * doc/examples/tuto3/first_routine.cc: Here. + * doc/examples/split/tuto3_first_routine-1.cc.raw: Regen. + 2013-09-02 Roland Levillain <roland(a)lrde.epita.fr> Add parentheses around complex operands of operator `|'. diff --git a/milena/doc/examples/split/tuto3_first_routine-1.cc.raw b/milena/doc/examples/split/tuto3_first_routine-1.cc.raw index 420f141..5f388ab 100644 --- a/milena/doc/examples/split/tuto3_first_routine-1.cc.raw +++ b/milena/doc/examples/split/tuto3_first_routine-1.cc.raw @@ -18,7 +18,6 @@ #include <mln/pw/all.hh> -#include <tests/data.hh> #include <doc/tools/sample_utils.hh> namespace mln diff --git a/milena/doc/examples/tuto3/first_routine.cc b/milena/doc/examples/tuto3/first_routine.cc index 9784e35..6c90124 100644 --- a/milena/doc/examples/tuto3/first_routine.cc +++ b/milena/doc/examples/tuto3/first_routine.cc @@ -22,7 +22,6 @@ #include <mln/pw/all.hh> -#include <tests/data.hh> #include <doc/tools/sample_utils.hh> namespace mln -- 1.7.10.4

1 0

olena: branch maxtree-integration created: olena-2.0-791-g3193cca
by git＠lrde.epita.fr 05 Sep '13

05 Sep '13

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 maxtree-integration has been created at 3193cca84ee8ff98f1f406fd255313aabdfb23fb (commit) - Log ----------------------------------------------------------------- 3193cca Fix some shortcomings in binary subsampling. This function used to memory leak and makes an unnecessary heap memory allocation. Moreover, it makes some unnecessary assumptions about the domain of the image (only worked for 2D images with a domain starting at (0,0)). e3bd054 Fix issues with loading ascii ppm. 5b8491a Minor updates to make things compile. a7536eb Add MLN_WO_GLOBAL_VARS directive that prevents globals vars to be included. 366258c Tree debug tools. 9d7b9fa Tree build algorithms and tree management routines ab86054 Unified structure for simple/dual input min/max tree. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-791-g3193cca Fix some shortcomings in binary subsampling. This function used to memoryleak and makes an unnecessary heap memory allocation. Moreover, it makes someunnecessary assumptions about the domain of the image (only worked for 2D images with a domainstarting at (0,0)).
by Edwin Carlinet 05 Sep '13

05 Sep '13

* milena/mln/world/binary_2d/subsample.hh: Many fixes. Conflicts: milena/ChangeLog milena/mln/world/binary_2d/subsample.hh --- milena/ChangeLog | 12 +++++++- milena/mln/world/binary_2d/subsample.hh | 51 ++++++++++++++++++++++--------- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9572039..22bee5f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< HEAD 2013-09-02 Roland Levillain <roland(a)lrde.epita.fr> Add parentheses around complex operands of operator `|'. @@ -4770,6 +4769,17 @@ * mln/geom/crop.hh, * mln/geom/crop_without_localization.hh: New. +2013-09-05 Edwin Carlinet <carlinet(a)lrde.epita.fr> + + Fix some shortcomings in binary subsampling. This function used to + memory leak and makes an unnecessary heap memory + allocation. Moreover, it makes some unnecessary assumptions about + the domain of the image (only worked for 2D images with a domain + starting at (0,0)). + + * milena/mln/world/binary_2d/subsample.hh: Many fixes. + + 2012-06-05 Edwin Carlinet <carlinet(a)lrde.epita.fr> Fix issues with loading ascii ppm. diff --git a/milena/mln/world/binary_2d/subsample.hh b/milena/mln/world/binary_2d/subsample.hh index 3ea041a..f6baf6c 100644 --- a/milena/mln/world/binary_2d/subsample.hh +++ b/milena/mln/world/binary_2d/subsample.hh @@ -50,7 +50,18 @@ namespace mln namespace binary_2d { - /// Subsample a Boolean image. + /// \brief Subsample a Boolean image. + /// + /// Subsample a binary image by a factor \p n and return a gray + /// level image by averaging. + /// + /// \[ + /// out(p) = \frac{1}{n^2} \sum_{\epsilon=1}^n input(n.(p+pmin) + + /// \langle \epsilon, 1\rangle ) + /// \] + /// + /// Note that even if the input image does not have its origin + /// at (0,0), the output image does so. /// /// \param[in] input A binary image. /// \param[in] n Linear subsampling coefficient. @@ -75,31 +86,41 @@ namespace mln if (n == 0) return data::convert(int_u8(), input); - const bool** ptr = new const bool*[n]; + const unsigned nrows = input.nrows() / n; const unsigned ncols = input.ncols() / n; - image2d<int_u8> output(nrows, ncols); - - const unsigned delta_row = input.delta_offset(down); - for (unsigned row = 0; row < nrows; ++row) + algebra::vec<2, unsigned int> vmin; + algebra::vec<2, unsigned int> vmax; + vmin[0] = 0; + vmin[1] = 0; + vmax[0] = nrows - 1; + vmax[1] = ncols - 1; + point2d pmin(vmin); + point2d pmax(vmax); + + image2d<int_u8> output(box<point2d>(pmin, pmax)); + dpoint2d dp_row(1, 0); + const unsigned delta_row = input.delta_index(dp_row); + + const bool* origin = &input(input.domain().pmin()); + const bool* line_ptr = origin; + for (unsigned row = 0; row < nrows; ++row, line_ptr += delta_row * n) { - ptr[0] = & input(point2d(n * row, 0)); - for (unsigned i = 1; i < n; ++i) - ptr[i] = ptr[i - 1] + delta_row; - for (unsigned col = 0; col < ncols; ++col) + const bool* ptr = line_ptr; + for (unsigned col = 0; col < ncols; ++col, ptr += n) { unsigned count = 0; for (unsigned i = 0; i < n; ++i) - for (unsigned j = 0; j < n; ++j, ++(ptr[i])) - if (*(ptr[i])) + for (unsigned j = 0; j < n; ++j) + { + if (ptr[delta_row * i + j]) ++count; - output(point2d(row, col)) = count * mln_max(int_u8) / n / n; + } + output.at_(row, col) = count * 255 / n / n; } } - delete[] ptr; - return output; } -- 1.7.10.4

1 0