[Olena-patches] olena: branch exp/tmms updated: olena-2.0-559-g25e43ce

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/tmms has been updated discards 548172e159ba61c45caf2d8a00c310bb61f6506d (commit) discards 3596ac75b533b25f489f3a6acc104c0bdd8a7ac3 (commit) discards 65cb509e02b9da20679880798b8446cf23db1a0d (commit) discards f5d258f22dd5d0436e0998c8815a606da2a67cb5 (commit) discards 1dea6e352452c4f18c470a7ee2a56d79612b0dd1 (commit) discards 78a0c1a0cc0ff6b1c28d4c00e71a3524d8ff066a (commit) discards 51c1049d2f8f5b6e4651dc25a4326cc3d999a131 (commit) discards 291cf06c6b610e81631a32bb4e3ce9984a479eda (commit) discards 2294b8c493ae2dd3a0b2490a54f67a32cb57a9ae (commit) discards e6fde5b0e13c0a1d737d8ff5e08ba73de777e896 (commit) via 25e43ce368c741c9acdcad419df48f68745d5f8f (commit) via 77d1b6cc11ddb2a746a88546b521d4757bae1841 (commit) via 81841d97f0bcbac17a67ec49b10b6b3a8fc1c21f (commit) via 3f8a07da7dc8c436af13ebe6a2f7aa364ce241b8 (commit) via db8fbc59af853c10a3ba57562fb78b3e33a934cd (commit) via 161b47d0011f76fd0a19d7ef6e4c179722169b91 (commit) via c85146bd36a6f94026ba7c794226a5d127e6d02f (commit) via 1935bc36690804e3ee07a7c2344538c9d80287c8 (commit) via 51571df5ecf647d4f8d258bba3714ac78d9cf19d (commit) via 806244e44b676343c967c44ca3563492e0d817ad (commit) via 1cd17e32b4fc61239195c688394cd92c3fc44167 (commit) via efabb3bcb01ae366f463abf4fa14303efce4cda7 (commit) via 276ad3db3217651981534e7a5908c0b8954d2502 (commit) via bd478ecf1a53fd1c42b3c267f220aab3f146c4ca (commit) via 81824c6b2a74d526744302b38a5479989c961f76 (commit) via 92344248afe3b83428d1db46b156e745451e5ce5 (commit) via ce97be8f1743324174f965410d1249994eba3e8d (commit) via 289bcac105fb22c53d37d73a32c1f1402bc5c358 (commit) via 83d9bff14f8b49b346c6342855d612a37c58cfd0 (commit) via aa8db8d1be7bdf624312762a1630355d3fec543a (commit) via e2f4e925bc23a4698abe15108d0ec754bbf67c29 (commit) via 07333d2c000f65cfabcc4702b704b5abf4126278 (commit) via 1a302adfd37c3aebe33a477d64cb0304150e37c9 (commit) via b0051dcaccff406bf3176e17f4abfb95a71822dd (commit) via 13b61491d6933f69e26cb421e1448f094351cae9 (commit) via 77d7b3a938fe16dc7216117a80158007706e1236 (commit) via 9cf87e52f51dbc3344e7aca36a884b8ae0892bed (commit) via ce8691742261a97e214f5e99024e319cc9e761e2 (commit) via 9df9980fe8d9d1b2e7cd68ef41aa6bad00f261c0 (commit) via 002e0e957be01c8a22605d884b9b1dd591e1ee5b (commit) via 592a16814171acc776241e80db25673125619bda (commit) via 979d54b458e41fc3bac8f347742d6a42a03df2a1 (commit) via 22f1827a91aba6dd05a98e784d53d4e76a1498cd (commit) via 733ef50fa2606d41c09badbe0f2204d16a806d61 (commit) via 02fa89bb503205bdda6c35b477db63d637e36d31 (commit) via 1b8c3754d59e04b11e38b19232b138e8cc42f8eb (commit) via 11438e15a022b02513161e8191679c4409d6b4be (commit) via 07973346bd57c8bef7e0346c28b6469da5db91e2 (commit) via b3c468886a96090e094f3c7d79e48e489954997f (commit) via 81e04f2a8a3166a165634524c0a73d7e9dc4f952 (commit) via 0987e7f285f366e8129e1c1d439367e269932279 (commit) via 17105bad97c497797a9f5ac257aca1b25c9a3678 (commit) via 1c93a61f5b62f6ca9d96b8349d5140874adc0bce (commit) via dde0e23d75e77e157992b656322044fad5c1f9e1 (commit) via bc91dfb5dd05ce8b4f6b68f7f4eec1926b3aef0f (commit) via 73774f40bae141b0b7cf507d6df8893279a46ea7 (commit) via c173d75dba1a8d8a03c8fee43947145d2570ab64 (commit) via 52ab07c654f83ee4968524f7e372599b762df21d (commit) via 6a7f9e5a35954f24d74bd276193ddd257b230cac (commit) via 8b40c86f5258ba437638b5e5d5d538ff3dcbe1c1 (commit) via 3e5f8ace4ca6039eb22a587f463ec41014c66eec (commit) via e048c0b0d60d75ca4458f7235179dfa283580fb2 (commit) via 7c236c79dc621193afcf23c2ad0689a280b9e868 (commit) via 42ff098b62214a8e3ff9984c6c554b051a93ad2e (commit) via 04402f0a54a522e695cb3e492edc9cc9d280daf4 (commit) via 0b442682e8f59c4e411ff0590b203bb1dcf04668 (commit) via 5528729cfe130744aa8aa7d317af9d3a58146a2b (commit) via cf3ad8f314f476fcac9768d2663d9afcd7661ef4 (commit) via c57275b2a386c1fc291b4e1e800023eed552942d (commit) via 409c1433fbb3845715a9f5b817f65d70ad161d90 (commit) via 09c6148c1a2c9eda201e638b1ab6f5ebc7082745 (commit) via c72cffc104bdffa902ebbdedc993ad5ddae8af5d (commit) via cdcfe668b182ed328bae6dbd0d14528f72c50d4d (commit) via c0f8681d2958afb11d3b4f5585de4804bc6524d4 (commit) via 2f40e47c6660deb2d8f12c2ad403fffff6b44eb1 (commit) via e3089252d712c2b0839f9798a98a99f690f959e2 (commit) via b5d61ebe4059d8e89e1a40d7fd26545219172813 (commit) via 5e4d3053fa3f8c92e02cbef811673b7c2a79040a (commit) via 272ccdacb752b2352c26decdd648cbcf85b42b53 (commit) via 73c3a74aea4d833e899baf0d69cd88e2c597908f (commit) via dc7c3b9944d4b691b2099f10fba965714f82014f (commit) via 5cd01f612dd0d318156ed7f7d369153f52a084d9 (commit) via 5f3a088f08e99c16191c8e9461ae7052e9db8562 (commit) via ea9c608068f019514e068fa629b18e53085ae5a3 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (548172e159ba61c45caf2d8a00c310bb61f6506d) \ N -- N -- N (25e43ce368c741c9acdcad419df48f68745d5f8f) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 25e43ce NEWS: Notify that binarization::tmms and binarization::tmms_histeresis have been added. 77d1b6c Update autogenerated .mk files. 81841d9 Add binarization::tmms and binarization::tmms_hysteresis. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 134 +++++- GScribo/BUGS | 1 - GScribo/GScribo.pro | 83 ---- GScribo/GScribo.pro.user | 405 --------------- GScribo/GScribo.pro.user.1.3 | 283 ----------- GScribo/PagesWidget/pagesdelegate.cpp | 20 - GScribo/PagesWidget/pagesdelegate.h | 18 - GScribo/PagesWidget/pagesmodel.cpp | 55 -- GScribo/PagesWidget/pagesmodel.h | 43 -- GScribo/PagesWidget/pageswidget.cpp | 49 -- GScribo/PagesWidget/pageswidget.h | 55 -- GScribo/Preferences/generaloptions.cpp | 44 -- GScribo/Preferences/generaloptions.h | 34 -- GScribo/Preferences/generaloptions.ui | 100 ---- GScribo/Preferences/ocroptions.cpp | 53 -- GScribo/Preferences/ocroptions.h | 33 -- GScribo/Preferences/ocroptions.ui | 62 --- GScribo/Preferences/optionwidget.h | 15 - GScribo/Preferences/preferencesdialog.cpp | 98 ---- GScribo/Preferences/preferencesdialog.h | 42 -- GScribo/Preferences/preferencesdialog.ui | 121 ----- GScribo/Preferences/preprocessingoptions.cpp | 45 -- GScribo/Preferences/preprocessingoptions.h | 32 -- GScribo/Preferences/preprocessingoptions.ui | 76 --- GScribo/Preferences/segmentationoptions.cpp | 33 -- GScribo/Preferences/segmentationoptions.h | 31 -- GScribo/Preferences/segmentationoptions.ui | 52 -- GScribo/Processing/preprocess.cpp | 11 - GScribo/Processing/preprocess.h | 26 - GScribo/Processing/process.cpp | 21 - GScribo/Processing/process.h | 29 -- GScribo/Processing/progressdialog.cpp | 16 - GScribo/Processing/progressdialog.h | 22 - GScribo/Processing/runner.cpp | 183 ------- GScribo/Processing/runner.h | 58 --- GScribo/Rendering/abstractregionitem.h | 13 - GScribo/Rendering/backgroundtexture.h | 12 - GScribo/Rendering/graphicsview.cpp | 150 ------ GScribo/Rendering/graphicsview.h | 43 -- GScribo/Rendering/regionitem.cpp | 59 --- GScribo/Rendering/regionitem.h | 80 --- GScribo/Rendering/rootgraphicsitem.h | 30 -- GScribo/Rendering/scene.cpp | 273 ---------- GScribo/Rendering/scene.h | 118 ----- GScribo/Rendering/selection.cpp | 36 -- GScribo/Rendering/selection.h | 20 - GScribo/TODO | 100 ---- GScribo/XmlWidget/attributesmodel.cpp | 69 --- GScribo/XmlWidget/attributesmodel.h | 48 -- GScribo/XmlWidget/selectionproxy.h | 47 -- GScribo/XmlWidget/xmlattributes.cpp | 23 - GScribo/XmlWidget/xmlattributes.h | 33 -- GScribo/XmlWidget/xmldelegate.h | 30 -- GScribo/XmlWidget/xmlitem.cpp | 43 -- GScribo/XmlWidget/xmlitem.h | 90 ---- GScribo/XmlWidget/xmlmodel.cpp | 87 ---- GScribo/XmlWidget/xmlmodel.h | 44 -- GScribo/XmlWidget/xmlview.cpp | 88 ---- GScribo/XmlWidget/xmlview.h | 79 --- GScribo/XmlWidget/xmlwidget.cpp | 34 -- GScribo/XmlWidget/xmlwidget.h | 54 -- GScribo/aboutdialog.h | 25 - GScribo/aboutdialog.ui | 136 ----- GScribo/configs.h | 134 ----- GScribo/dir.h | 7 - GScribo/dockwidget.h | 22 - GScribo/main.cpp | 23 - GScribo/mainwindow.cpp | 415 ---------------- GScribo/mainwindow.h | 120 ----- GScribo/mainwindow.ui | 35 -- GScribo/region.h | 56 --- GScribo/regionwidget.cpp | 70 --- GScribo/regionwidget.h | 40 -- GScribo/variantpointer.h | 19 - GScribo/xml.cpp | 206 -------- GScribo/xml.h | 93 ---- Makefile.am | 28 +- NEWS | 4 + configure.ac | 14 +- distrib/macports/Portfile.in | 4 +- doc/Makefile.am | 4 +- milena/ChangeLog | 158 ++++++ milena/apps/mesh-segm-skel/Makefile.am | 2 +- milena/doc/Doxyfile.in | 31 +- milena/doc/Makefile.am | 9 +- milena/doc/examples/multi_files_f1.cc.raw | 6 + milena/doc/examples/multi_files_f2.cc.raw | 6 + milena/doc/examples/multi_files_main.cc.raw | 16 + milena/doc/examples/multiple_def.cc.raw | 9 + milena/doc/examples/typenametemplate.cc.raw | 1 + milena/doc/examples/undef_global_vars.cc.raw | 1 + milena/doc/examples/wrongvaluetype.cc.raw | 2 + milena/doc/mln/convert.dox | 4 +- milena/doc/mln/labeling/labeling.dox | 6 + milena/doc/ref-guide.tex | 69 +++- milena/headers.mk | 2 + milena/mln/binarization/tmms.hh | 120 +++-- milena/mln/binarization/tmms_hysteresis.hh | 518 +++++++++++--------- milena/mln/canvas/labeling/blobs.hh | 140 +++++- milena/mln/core/internal/pixel_impl.hh | 6 + milena/mln/labeling/background.hh | 4 +- milena/mln/labeling/blobs.hh | 95 +++- milena/mln/labeling/blobs_and_compute.hh | 97 ++++- milena/mln/labeling/colorize.hh | 42 +- milena/mln/labeling/compute.hh | 100 ++-- milena/mln/labeling/compute_image.hh | 74 ++-- milena/mln/labeling/flat_zones.hh | 18 +- milena/mln/labeling/foreground.hh | 8 +- milena/mln/labeling/mean_values.hh | 11 +- milena/mln/labeling/n_max.hh | 77 ++-- milena/mln/labeling/pack.hh | 34 +- milena/mln/labeling/regional_maxima.hh | 19 +- milena/mln/labeling/regional_minima.hh | 19 +- milena/mln/labeling/relabel.hh | 71 ++-- milena/mln/labeling/superpose.hh | 5 +- milena/mln/labeling/value.hh | 24 +- milena/mln/labeling/value_and_compute.hh | 22 +- milena/mln/labeling/wrap.hh | 35 +- milena/mln/topo/complex.hh | 44 +- milena/mln/trait/ch_value.hh | 66 +++- milena/mln/trait/concrete.hh | 65 +++- milena/mln/win/rectangle2d.hh | 13 +- milena/tests/binarization/Makefile.am | 13 +- milena/tests/binarization/tmms-hysteresis-out.pgm | Bin 0 -> 262264 bytes milena/tests/binarization/tmms-out.pgm | Bin 0 -> 262264 bytes milena/tests/binarization/tmms.cc | 54 ++ milena/tests/binarization/tmms_hysteresis.cc | 53 ++ milena/tests/labeling/blobs.cc | 26 +- milena/tests/labeling/blobs_and_compute.cc | 55 ++- milena/tests/labeling/n_max.cc | 5 +- milena/tests/unit_test/unit-tests.mk | 4 + scribo/ChangeLog | 81 +++ scribo/doc/Doxyfile.in | 16 +- scribo/doc/Makefile.am | 2 +- scribo/doc/scribo/core/component_set.dox | 90 ---- scribo/scribo/binarization/sauvola_ms_split.hh | 4 + scribo/scribo/core/component_set.hh | 102 ++++- scribo/scribo/core/line_set.hh | 4 +- scribo/scribo/core/object_links.hh | 53 ++- scribo/scribo/debug/logger.hh | 2 +- .../toolchain/internal/text_in_picture_functor.hh | 22 +- scribo/scribo/util/component_precise_outline.hh | 9 +- scribo/src/primitive/extract/lines_pattern.cc | 2 +- scribo/src/text_in_picture.cc | 22 +- swilena/ChangeLog | 280 +++++++++++ swilena/Makefile.am | 11 +- swilena/box.ixx | 2 +- swilena/box2d.i | 7 +- swilena/box_piter.ixx | 3 +- swilena/complex.ixx | 330 +++++++++++++ swilena/complex2.i | 111 +++++ swilena/concat.ixx | 4 +- swilena/image2d.ixx | 30 +- swilena/image2d_int.i | 5 +- swilena/image2d_int_u8.i | 4 +- swilena/image2d_point2d.i | 53 ++ swilena/image2d_rgb8.i | 63 +++ swilena/int_u.ixx | 24 +- swilena/morpho.ixx | 23 +- swilena/ppm.ixx | 57 +++ swilena/python-utils.ixx | 3 +- swilena/python/Makefile.am | 192 +++++++- swilena/python/complex2-misc.py | 99 ++++ swilena/python/data.py | 26 - swilena/python/data.py.in | 26 + swilena/python/installcheck.mk | 116 +++++ swilena/python/ltihooks.py | 60 --- swilena/python/max-tree.py | 57 +++ swilena/python/morpho-segm.py | 2 +- swilena/python/sps-gdb-local.in | 6 + swilena/python/sps-local.in | 2 +- swilena/python/swilena.py | 10 +- swilena/rgb.ixx | 159 ++++++ swilena/rgb8.i | 40 ++ swilena/run.in | 50 +- 175 files changed, 3712 insertions(+), 6352 deletions(-) delete mode 100644 GScribo/BUGS delete mode 100644 GScribo/GScribo.pro delete mode 100644 GScribo/GScribo.pro.user delete mode 100644 GScribo/GScribo.pro.user.1.3 delete mode 100644 GScribo/PagesWidget/pagesdelegate.cpp delete mode 100644 GScribo/PagesWidget/pagesdelegate.h delete mode 100644 GScribo/PagesWidget/pagesmodel.cpp delete mode 100644 GScribo/PagesWidget/pagesmodel.h delete mode 100644 GScribo/PagesWidget/pageswidget.cpp delete mode 100644 GScribo/PagesWidget/pageswidget.h delete mode 100644 GScribo/Preferences/generaloptions.cpp delete mode 100644 GScribo/Preferences/generaloptions.h delete mode 100644 GScribo/Preferences/generaloptions.ui delete mode 100644 GScribo/Preferences/ocroptions.cpp delete mode 100644 GScribo/Preferences/ocroptions.h delete mode 100644 GScribo/Preferences/ocroptions.ui delete mode 100644 GScribo/Preferences/optionwidget.h delete mode 100644 GScribo/Preferences/preferencesdialog.cpp delete mode 100644 GScribo/Preferences/preferencesdialog.h delete mode 100644 GScribo/Preferences/preferencesdialog.ui delete mode 100644 GScribo/Preferences/preprocessingoptions.cpp delete mode 100644 GScribo/Preferences/preprocessingoptions.h delete mode 100644 GScribo/Preferences/preprocessingoptions.ui delete mode 100644 GScribo/Preferences/segmentationoptions.cpp delete mode 100644 GScribo/Preferences/segmentationoptions.h delete mode 100644 GScribo/Preferences/segmentationoptions.ui delete mode 100644 GScribo/Processing/preprocess.cpp delete mode 100644 GScribo/Processing/preprocess.h delete mode 100644 GScribo/Processing/process.cpp delete mode 100644 GScribo/Processing/process.h delete mode 100644 GScribo/Processing/progressdialog.cpp delete mode 100644 GScribo/Processing/progressdialog.h delete mode 100644 GScribo/Processing/runner.cpp delete mode 100644 GScribo/Processing/runner.h delete mode 100644 GScribo/Rendering/abstractregionitem.h delete mode 100644 GScribo/Rendering/backgroundtexture.h delete mode 100644 GScribo/Rendering/graphicsview.cpp delete mode 100644 GScribo/Rendering/graphicsview.h delete mode 100644 GScribo/Rendering/regionitem.cpp delete mode 100644 GScribo/Rendering/regionitem.h delete mode 100644 GScribo/Rendering/rootgraphicsitem.h delete mode 100644 GScribo/Rendering/scene.cpp delete mode 100644 GScribo/Rendering/scene.h delete mode 100644 GScribo/Rendering/selection.cpp delete mode 100644 GScribo/Rendering/selection.h delete mode 100644 GScribo/TODO delete mode 100644 GScribo/XmlWidget/attributesmodel.cpp delete mode 100644 GScribo/XmlWidget/attributesmodel.h delete mode 100644 GScribo/XmlWidget/selectionproxy.h delete mode 100644 GScribo/XmlWidget/xmlattributes.cpp delete mode 100644 GScribo/XmlWidget/xmlattributes.h delete mode 100644 GScribo/XmlWidget/xmldelegate.h delete mode 100644 GScribo/XmlWidget/xmlitem.cpp delete mode 100644 GScribo/XmlWidget/xmlitem.h delete mode 100644 GScribo/XmlWidget/xmlmodel.cpp delete mode 100644 GScribo/XmlWidget/xmlmodel.h delete mode 100644 GScribo/XmlWidget/xmlview.cpp delete mode 100644 GScribo/XmlWidget/xmlview.h delete mode 100644 GScribo/XmlWidget/xmlwidget.cpp delete mode 100644 GScribo/XmlWidget/xmlwidget.h delete mode 100644 GScribo/aboutdialog.h delete mode 100644 GScribo/aboutdialog.ui delete mode 100644 GScribo/configs.h delete mode 100644 GScribo/dir.h delete mode 100644 GScribo/dockwidget.h delete mode 100644 GScribo/main.cpp delete mode 100644 GScribo/mainwindow.cpp delete mode 100644 GScribo/mainwindow.h delete mode 100644 GScribo/mainwindow.ui delete mode 100644 GScribo/region.h delete mode 100644 GScribo/regionwidget.cpp delete mode 100644 GScribo/regionwidget.h delete mode 100644 GScribo/variantpointer.h delete mode 100644 GScribo/xml.cpp delete mode 100644 GScribo/xml.h create mode 100644 milena/doc/examples/multi_files_f1.cc.raw create mode 100644 milena/doc/examples/multi_files_f2.cc.raw create mode 100644 milena/doc/examples/multi_files_main.cc.raw create mode 100644 milena/doc/examples/multiple_def.cc.raw create mode 100644 milena/doc/examples/typenametemplate.cc.raw create mode 100644 milena/doc/examples/undef_global_vars.cc.raw create mode 100644 milena/doc/examples/wrongvaluetype.cc.raw create mode 100644 milena/doc/mln/labeling/labeling.dox create mode 100644 milena/tests/binarization/tmms-hysteresis-out.pgm create mode 100644 milena/tests/binarization/tmms-out.pgm create mode 100644 milena/tests/binarization/tmms.cc create mode 100644 milena/tests/binarization/tmms_hysteresis.cc delete mode 100644 scribo/doc/scribo/core/component_set.dox create mode 100644 swilena/complex.ixx create mode 100644 swilena/complex2.i create mode 100644 swilena/image2d_point2d.i create mode 100644 swilena/image2d_rgb8.i create mode 100644 swilena/ppm.ixx create mode 100644 swilena/python/complex2-misc.py delete mode 100644 swilena/python/data.py create mode 100644 swilena/python/data.py.in create mode 100644 swilena/python/installcheck.mk delete mode 100644 swilena/python/ltihooks.py create mode 100644 swilena/python/max-tree.py create mode 100644 swilena/python/sps-gdb-local.in create mode 100644 swilena/rgb.ixx create mode 100644 swilena/rgb8.i hooks/post-receive -- Olena, a generic and efficient image processing platform