- Olena-patches

last-svn-commit-137-gdb55e63 Add the binarization tool submitted to H-DIBCO 2010.
by Guillaume Lazzara 04 Nov '10

04 Nov '10

* src/Makefile.am, * src/contest/Makefile.am, * src/contest/hdibco-2010/Makefile.am: New. * src/contest/hdibco-2010/sauvola_ms_hdibco.cc: New. Source code of the submitted program for H-DIBCO 2010. --- scribo/ChangeLog | 11 ++ scribo/src/Makefile.am | 1 + .../{tests/toolchain => src/contest}/Makefile.am | 2 +- .../contest/hdibco-2010}/Makefile.am | 8 +- .../hdibco-2010/sauvola_ms_hdibco.cc} | 100 +++++++------------ 5 files changed, 56 insertions(+), 66 deletions(-) copy scribo/{tests/toolchain => src/contest}/Makefile.am (98%) copy scribo/{tests/toolchain => src/contest/hdibco-2010}/Makefile.am (87%) copy scribo/src/{binarization/pgm_sauvola_ms.cc => contest/hdibco-2010/sauvola_ms_hdibco.cc} (53%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f2eb3c3..3888981 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Add the binarization tool submitted to H-DIBCO 2010. + + * src/Makefile.am, + * src/contest/Makefile.am, + * src/contest/hdibco-2010/Makefile.am: New. + + * src/contest/hdibco-2010/sauvola_ms_hdibco.cc: New. Source code + of the submitted program for H-DIBCO 2010. + +2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Update tools in scribo/src. * src/Makefile.am: Add postprocessing subdir. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index b3a7859..774740a 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -22,6 +22,7 @@ include $(top_srcdir)/scribo/scribo.mk SUBDIRS = \ binarization \ + contest \ debug \ primitive \ filter \ diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/src/contest/Makefile.am similarity index 98% copy from scribo/tests/toolchain/Makefile.am copy to scribo/src/contest/Makefile.am index 826fb86..81f314b 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/src/contest/Makefile.am @@ -20,4 +20,4 @@ include $(top_srcdir)/scribo/tests/tests.mk SUBDIRS = \ - nepomuk \ No newline at end of file + hdibco-2010 \ No newline at end of file diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am similarity index 87% copy from scribo/tests/toolchain/Makefile.am copy to scribo/src/contest/hdibco-2010/Makefile.am index 826fb86..44add64 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/src/contest/hdibco-2010/Makefile.am @@ -19,5 +19,9 @@ include $(top_srcdir)/scribo/tests/tests.mk -SUBDIRS = \ - nepomuk \ No newline at end of file +check_PROGRAMS = sauvola_ms_hdibco + +sauvola_ms_hdibco_SOURCES = sauvola_ms_hdibco.cc + + +TESTS = $(check_PROGRAMS) diff --git a/scribo/src/binarization/pgm_sauvola_ms.cc b/scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc similarity index 53% copy from scribo/src/binarization/pgm_sauvola_ms.cc copy to scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc index 38ff2e6..68fdaac 100644 --- a/scribo/src/binarization/pgm_sauvola_ms.cc +++ b/scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,86 +23,61 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <cctype> #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> +#include <mln/io/ppm/load.hh> #include <mln/io/pbm/save.hh> #include <scribo/binarization/sauvola_ms.hh> -#include <scribo/debug/usage.hh> - -bool check_args(int argc, char * argv[]) -{ - if (argc < 3 || argc > 6) - return false; - - if (argc >= 5) - { - int s = atoi(argv[4]); - - if (s < 1 || s > 3) - { - std::cout << "s must be set to 2 or 3." - << std::endl; - return false; - } - } - - return true; -} - - -const char *args_desc[][2] = -{ - { "input.pgm", "A graylevel image." }, - { "out.pbm", "A binary image." }, - { "w", "Window size at scale 1. (default: 101)" }, - { "s", "First subsampling ratio (default: 3)." }, - { "k", "Sauvola's formuale parameter (default: 0.34)" }, - {0, 0} -}; - - - +#include <scribo/postprocessing/fill_object_holes.hh> +#include <scribo/preprocessing/denoise.hh> int main(int argc, char *argv[]) { using namespace mln; using namespace scribo; - if (!check_args(argc, argv)) - return scribo::debug::usage(argv, - "Multi-Scale Binarization of a color image based on Sauvola's algorithm.", - "input.pgm output.pbm <w> <s> <k>", - args_desc); - trace::entering("main"); + if (argc != 3) + { + std::cout << "Usage: " << argv[0] << " <input.{pgm,ppm}> <output.pbm>" << std::endl; + std::cout << "--------------" << std::endl; + std::cout << "EPITA/LRDE - 2010" << std::endl; + return 1; + } - // Window size - unsigned w_1; - if (argc >= 4) - w_1 = atoi(argv[3]); // Scale 1 - else - w_1 = 101u; + std::string ext = argv[1]; + ext = ext.substr(ext.length() - 3, 3); + for (unsigned i = 0; i < ext.length(); ++i) + ext[i] = tolower(ext[i]); - // First subsampling scale. - unsigned s; - if (argc >= 5) - s = atoi(argv[4]); - else - s = 3u; + // Load + image2d<value::int_u8> input; - double k; - if (argc >= 6) - k = atof(argv[5]); - else - k = 0.34f; + if (ext == "pgm") + io::pgm::load(input, argv[1]); + else if (ext == "ppm") + { + image2d<value::rgb8> input_color; + io::ppm::load(input_color, argv[1]); - image2d<value::int_u8> input_1; - io::pgm::load(input_1, argv[1]); + // Convert to Gray level image. + input = data::transform(input_color, mln::fun::v2v::rgb_to_int_u<8>()); + } + else + { + std::cout << "Invalid input file format! Expecting PGM or PPM images." << std::endl; + return 1; + } + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms(input_1, w_1, s, k); + output = scribo::binarization::sauvola_ms(input, 101, 3, 0.4); + + output = scribo::preprocessing::denoise_bg(output, c8(), 4); + output = scribo::postprocessing::fill_object_holes(output, 0.01f); io::pbm::save(output, argv[2]); } -- 1.5.6.5

2 1

branch next updated: last-svn-commit-528-g0d8813e
by git＠lrde.epita.fr 04 Nov '10

04 Nov '10

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 0d8813e68ce7b27f4e0af6ee0a6004d0564b5945 (commit) via 7c25953a8c1e0d82f2c31696ae94c1bc616281e1 (commit) via bc407e203f38df5a984d5ba5463907394b335f7e (commit) via 83d0183b7c6e7850ff42b1143978de4a8498171b (commit) via 7924629f9a5ed75553a8fa6cee857bf59b634c0f (commit) via b9df1795cd61827f66a60ce6cd7edde8115b5b7f (commit) via 3a2500e1a3628de9314d46459c47555f56a3a711 (commit) via 767a8e2076101a7448265dfd3085a4aeaa625eda (commit) via 4b467cf5cbddf2f24b931d1aa19c1e8b99804e3c (commit) via ba4ead142db4b22e2823596f5860b85d6cba5ecf (commit) via 2dafa4753683b1d68d6ec7e3293f2fd4e1290d15 (commit) via a42fcb6d12877b504714982175b2e1a6b7c30223 (commit) via 8a8fddca95f9a4f8778e7867797d4798d1aea735 (commit) via 3086fc9ecfbdca81f66d436856d48d0656ea3b1c (commit) via bddf6ea31d206404da2b996a4d4cd1744030f295 (commit) via 89cb68ce41151437ee1b5e9ef79779162f0fe8b7 (commit) via b369b21a34fdec2d4eecf7ca541eab134b4b4f69 (commit) via 1085d061a2ded99cea81264971abfeafe22aa66f (commit) via 891e7283fd5bf923bfb5731e3a9c294801278955 (commit) via 829030ba9da901dac83587ab19865afb0c783962 (commit) via 6fbd302e5cfd421f741415ddb576067a5bfb17a2 (commit) via 52908636a521d9d5d33399ef01f9ff91eba8972f (commit) via 637d70cf4ba56454a0b4861b22f58df3218a742d (commit) via 944186e4a1317365fe2625b6980f93916eeee893 (commit) via 6e8b5fee00e3fbeb0170c12cf827056df3ff2d45 (commit) via 283a487eabbdb01f80a1d08c90588ccc5e0fb2b5 (commit) via f8e324b5f132b91296bc42048053fd40bbdd6dd2 (commit) via 46eae02df17b253473adcb3fbee915def6faf21a (commit) via 6b37fbf4eb648ee104e6f7e15f18e86971725cae (commit) via ffdbc84b364c6fba34cc75ae59cce0af3957840a (commit) via 949f1cba189a1f184e3e7f175a3c6a37ca68b595 (commit) via e102484ec1067be75dd6589397b5582a103f38e4 (commit) via 9c95965d51707c380726c4e04e7f5d583298a412 (commit) via 87288fed8c7c58240b9da5a6b6838b97fbc40f8e (commit) via b44674d0134c582ab347d94f0cdf0489eca2c00b (commit) via b63755a60df439aecf78e36d4a8d702ef620abc3 (commit) via a913e1f860971df1a7b804daca3d190bfcefc729 (commit) via 396cb06881fb4ce584e9c9fdfe3bd49ea2e565be (commit) via 6713b18ae5ff02fd54f2496881ccb1118c02f45c (commit) via 4515a1dc6803595b389196a908ed01c18c63a804 (commit) via db5fcd6bc95f6202aed69fd811d18584e719cdf5 (commit) via 18262984b19ffbd72f33e37e5e208b03521513e1 (commit) via 6e783da9ec7535fe373a5a9f90fce24495a84d93 (commit) via 206ddb6ba62ad2cdee862db36c025761d52898af (commit) via d2e8cf68fc8af6d5de279bb70535516f53e56df8 (commit) via 2520689648f68e6cbd3eb47c375102053af53019 (commit) via 53a57b1d3275c5b9fb41db4b706342d6a7df992d (commit) via cd5ea6ecd0a75ad2dbabd704490682aeceac68bd (commit) via 2925b324b1b9c0427600a0160cdc214a03d5e8ae (commit) via 04569a2bb109e39ae8d09530aaa526ad9ae2df49 (commit) via ebad60a1e78715afe0359a2837c5de517fa7a42b (commit) via 5bd441f8f01071c7c228837ceb8d9e401bc8f974 (commit) via d6e4a923e32eb749a66490fba62885a69b2fb4dd (commit) via a4a49108929edc4cd8c2d108da7ca821f6684b45 (commit) via ed4e74a2f51a69d580a46b155c9d319d7e7f603c (commit) via 63c77cdaa94cdbfd1ee3591675f729b74cc0371e (commit) via 621ebe718756448951c4362aa8dc5be8b84025da (commit) via c3d187edce3a706763c8e2bed355517e22037cf0 (commit) via a903e8dadd0bc8f76a36c846a6167903aac6c963 (commit) via 696503dfbe53631c3d16db408d7137a0d5b9c536 (commit) via b265090ab82ff960a5cd770b863eebb8eeee71be (commit) via c0c3a98d00d261f0b32c16083030be5dc05e79ff (commit) via bd5519ba780434acb1a52552f55c5c91806d5931 (commit) via 4d1677cf6f3b63d78da59159550988f17e61b93a (commit) via 951bfdd9cb60516e53abc0c961c046851174d37d (commit) via ca408292a71afa85aa76b568642f91729ebaae05 (commit) via 00d8fa3b631df334782cc755a0a1bbc3af1e8d35 (commit) via 6ca68abdb08224a001fbdd838a6bbffb58b902ba (commit) via a9958fa777ee5686c5a923311aab1caa793ab89a (commit) via be773a94ff966b4008cb3ce086bdaa3a679cf8a5 (commit) via 013ef3d7c8f41542dc327c3f86d3741476c61aa5 (commit) via 6793cca44120828368141b44d52d589d47c72f72 (commit) via f7bc7e130d7cd61342e2a1bd50433caf8dc251e2 (commit) via 3c2ce9bb05ba3502ded2bab10d64d19d10607874 (commit) via d34c8dd49b1cafb412ed6acbc9a7df856e744ada (commit) via d5c383adedab294cc3158789aae82a358ed9f8b3 (commit) via 59987833613195d29de390caf60ea67a6d05c63c (commit) via 6bf37e8533f6fe5e1ccb3db532ac2c75624a3973 (commit) via 0545aad9399df4de95f731d4ea7ff019e996efb0 (commit) via 324908fe7cfefc7e54ebab5419c195ba111adecc (commit) via 5ee999b4a272ce703a8441e19d21914ee24a325c (commit) via af62462e491439835ff02d83dd051209402b9e15 (commit) via 8fed6fb92cee676f1b08171261d1c3c3998affca (commit) via cb1501f56a94071aa6087845f47acbbb4e359487 (commit) via 4aec8b7df9701854f4a66a5759cba50d417e2477 (commit) via 6626ff4c9b970161a3afb4771f6b5d5d17cbc054 (commit) via 5a13b71e549e3e14f56c654c2cf8060668ee651d (commit) via 8bd912698276dec80d783a2a0d1c45934b7197d6 (commit) via c05d4df52ff6ff73eab3e75343e39a4bd59c25b6 (commit) via a0961e1c87e3d8b33fc3f956f4e5eabf1301e3f4 (commit) via 087715863927fde36a5c856fa87ba071c978a824 (commit) via 8283ce59a3fbee4679d7d5e6909ac69da6dc9565 (commit) via 8559cd77490d273ee43ab417b4b666aeb12a3f4b (commit) via 6b43c06339028b02542e0214c12a976d10f8b8d7 (commit) via 52112930338d0852964eba2a09f7984c04d3b29e (commit) via c3c62f2274a751f3cc0846f81d8f54c8c50192fb (commit) via 26c8584dbd90fb2668efe2cfe260eefc65201055 (commit) via 332c9acf642b9ab88ed466b1ad0e0500fc2c885c (commit) via 5ba287436f0ad7ae908f61e666e01ea6fbb546a0 (commit) via 6270c8c945def50f6fb12b95511567e27b04db24 (commit) via 290ccbee439ac1cfc9dbd0185b60260d10dbd206 (commit) via 9fffc8073f5ea86ae99a3b5ddd23d53d10cdb429 (commit) via aa19b0aaad96157c6cbc41fd92ceb07b8f370063 (commit) via 984412efeef78be23eb0f83ce6eb50bb36031a6e (commit) via d4ca44ab91728099a70f29b73f5eb3f83a487736 (commit) via 2ae99ffe384a9bdf63e59305fe1a77063a7a1c22 (commit) via e31b70169c431b1196afb6ae2b9eda6b94ec4e26 (commit) via 9e66b0bc8e1df4154fc7a4c6834a8db7b6c3af46 (commit) via ee180d60723b0718fa53cd7d936b8260acb93af2 (commit) via 4d14a475db1082c1096ed71973e2daa2793e2cf1 (commit) via fd16f7ee48f964437406d385b54ebb912e92ea25 (commit) via 092bb0461eb91af6bca23e29bda4bdbac316d3ec (commit) via 460f059870e591b8da8363f9905a8331352c81ff (commit) via 1a16089f970043d54c716705e22f87cde43ce263 (commit) via 7b2111843120f318b696b1b79bd2e900a7eeac4b (commit) via 58e82cd9f7d25b6aafb2085c4ace86d1819b5e1f (commit) via 218a6951a1b0d51f35faf440a0938ffc57e6fc69 (commit) via 2290b5c217d1aff34973686b4ca20ac907b088b1 (commit) via 3586ef11c3c314352893a9239f16679657d12d5f (commit) via 681f2578cf36e5d15de8744b5a7dd92bfdc4fc4c (commit) via 1307e9db8d14cfc6dff52604e561b71388e44f58 (commit) via 71f26fd56cb0b4ce501d5b268110a7cba2580c26 (commit) via ad5614ea5041d342b336310eb72fc632e85d92fe (commit) via 125df33ea1757903b9ae2078ff37cda45ab1fc0c (commit) via b9a5b97f58655d268aea57a5b3d625f8fedae6ee (commit) via d169338813844bac2932789235e76482922b0d5e (commit) via 241c2467d08dc42b87d25a93f2606c1d46d835d2 (commit) via f5c0ae5a9385033e13a8f7d639f26f7c3114854e (commit) via 7e1a2f88f9f363580adf64244448a04b2fed8588 (commit) via 31925d2882a55285b496a5efb040875eeceee85e (commit) via b15c1b6b4c6eb9cb7dda58a28bb93695feb7c463 (commit) via 288d44d51e20f1d602c0b6b2f2d3cadb5cc4ba1d (commit) via 4d87541b98ba8e496d125c80c83ad20fbfbb8fb3 (commit) via b57d26e949bf2f7993b86a1df34d12c0e27f581d (commit) via 17304c0d1e2e0f089a7fba4a319c85c401b78a71 (commit) via 5179913a9ef7ad087e49b617e185ea77bef3bd4e (commit) via 7c558b5f8ddad2675f221439e6cc05c131c41306 (commit) via fe92959d0b991dc4af32354a5aaecebe4a2496e7 (commit) via 5fa09b417ceab47852ce77832d504474b37911c0 (commit) via b4195d21051065f1793d03ac2fc8473979eb3d85 (commit) via f3987ed3d3aa9063ae36e632d59f56c0fed6ef71 (commit) via 7570d066d5b6867ec467c65577b856552eb7959f (commit) via b98887a266675d0408c9a5e206e01e8c05141350 (commit) via 07b0d845a4695de07897a0550f3cf88e90bf71ba (commit) via e9bf3efcc6957e3e0d0b37228e0060cee5315c66 (commit) via 26fd960b08963a21dcc2b55b6618bc0fb03f1721 (commit) via f8c67ca6812d33f6e758d02b52306be5337357ec (commit) via 34bcc24494086059cddc9563bfc74d7d41c92062 (commit) via 00152b7b89d4690e7e1fe0ac252096d834360917 (commit) via 53630924d3586513a4979ad9ba76ec975a7d4d6f (commit) via 65586d1b604614ab2072306198b2418b222901e6 (commit) via 8adc20194128cd40b88e9d531541067d9c07f90a (commit) via e6a836cee6c68ad1fb50e38754ac5c0a0a7c6236 (commit) via 993461bf6f0e721d96fd483df3c461a7f37c7ea5 (commit) via 60fefaa2e97f9a9dac00d2404fa4ce730cd171b0 (commit) via 4b0e1fb92f24d116e8df227786eae369f1b8f615 (commit) via 2f0e11309514214cd1be0c8c565183bd001cc1b6 (commit) via 224e84a64d1844494f71173a154fbec87927da4b (commit) via 81d685024b4321859625cf173903e176cbf6ecbe (commit) via 543d805e7b099357ba92802493be73e39a71687c (commit) via 2f5f4a438accd7aa52c3ac8d3550b70cef778c0e (commit) via 6b6d1440369b9cb9fc31c4453723e179d91ba842 (commit) via 98eedea5d6dcf8b4bfc9dfa309b57ce5dcbfd192 (commit) via 55a5c879876aa4d7e2b2326f426a3e048b386044 (commit) via 15c7c9c6fc5f10005d6965cd819f9d13dac7a8f7 (commit) via 79001a91319044fdabf9504d8a4b745824e3e91b (commit) via ff4fcc5ac88a15114fa027286af119fb49ae5a08 (commit) via 033b24976414aed9461ea4cb7e60e29fe95ff5b3 (commit) via ef48505d020f4fd2ba1e89482bf3a2e3a69d2b7c (commit) via be8a9483d08855d6475aafbcf6d7b99b4c2e7546 (commit) via 76ed491e0693668ef068eef740ea697eb17e9017 (commit) via 5d3b9dacc3b50f37a4fb09dd53d45c53dcdd59c4 (commit) via 5824c18c8dc04d028fac6a873aeaed17ae00ed07 (commit) via d7850dbc2fb6879dceacc355cf5f37f460e09313 (commit) via f8b5117d9ebdbb13855bdb4d4dcc1581e7bc82b1 (commit) via 9f19274a760e12dc9b2cbe7bdf5bfc9c466af5b8 (commit) via 5ca84d197b8742460dfda8b9435a02a79603ab0a (commit) via d12e77e06b9cfdb409a36b3f4fb65b09327acfdb (commit) via b3416b2f45e4e3ab0e853c2e73f1c670891e5d8d (commit) via 3591f2a690fbd20c6caaf51283ba96505e87c0c0 (commit) via 76dd7c37346ba9280d586e31b0ff558af2a44d90 (commit) via 91b205927506a09d3c921c4980da3b114617775d (commit) via 966f8d64839b0d13bdc608ef7f4c4247e984391a (commit) via f89278cf5b12300abe45d7bf8eb464c7bdb7fba7 (commit) via 3ca05868e71d080d12c18329019b2addbf83bec9 (commit) via f819edfc8980df439b1920cadc3893a2f8b4eee6 (commit) via ef51cf7f9dc8e6c3f1c064f881cc3b6b429e1c76 (commit) via a2d98b12b61ffbd0a4e7addb440888d86d5be8d5 (commit) via f5d28e908b41e8003fd401989b74b8c995a93192 (commit) via ab515db441e4825dcfb9601c6ac024c614ce1e45 (commit) via 6fb53567c35855b2ba1b61b1f9da6aba108a0471 (commit) via c7c49e9d4611785b6c4086e7098d684fefd690b8 (commit) via 0c7c2800580a76a371845addb361bd20498c396d (commit) via 0832aee891ff1c8f78abf0b6f3ce22cda88a258a (commit) via 6d82d878bff6d80604a7554a348ef8c1d06464ad (commit) via 999e60c6f834a03d4ad636052aca1a785501f673 (commit) via d3888a39df55beccc974bf4f556eb50e3b7057cb (commit) via 06903f8517a4560f544ccb343f011548011fa95f (commit) via ed6a220ec78c88954f73cee7258595b1a697a242 (commit) via 7fd561dd32cd4d3a32aa974642da054078513355 (commit) via 5c627b019540ecc6dbf4cb21630354289adf6f6b (commit) via 85cda080414cc6e05d8ee49246a2171eb7f4fbae (commit) via e8373a069ad3b882f9a927c8d318643645069c1e (commit) via 4bf89fb72cfe41e98d7df23be2cc79bb37173c39 (commit) via a6a8d2a44d746824876f24c53af69f83036ddaf3 (commit) via 810f0413346986f6e7fc86f513ee1df28f142418 (commit) via 33ffff60e3846bf4499c3eafaa2dfd37791fb4e2 (commit) via 31216d34c0c51609cbe6921cd0d285701d583e3b (commit) via db55e631a5d4be26186cf58f23d63c9ae8a1a88e (commit) via 080134d6115e902c66ee0eb866008d7ad8e161f8 (commit) via 40d518005c478e2b5640a04019fdbf84c6858d27 (commit) via cbbdf4e015a418723730e0173ae88377ab365f1e (commit) via ff15d075512aadb2cfa4e99d36d3fa080809822f (commit) via 12ddb9702902e9c12be67d23fad1053e320f151e (commit) via b8aaebae9a034fa3b39de284bd2677801bc15471 (commit) via cbbbffd5c0c474d94fdab9e79c90e0ea92ec185c (commit) via 99e2b8fc744f5ab029cee5c4fa8eb465750101af (commit) via 41c82626a63b343f4d54e620c3055c1db6bf91de (commit) via 8c069f07986676a26ea14a1daa4e623d75302cbc (commit) via ca67a57fcb8149672ea524e5d20cab138c9147d6 (commit) via 21af64ad3a6645b7c1e7afa3347ba545911affa1 (commit) via 24e4f689ffc6598a646431b8344fe3c7b6c73da5 (commit) via 04aef4bf80daa8b02650ad3b2479dfea0bfa666c (commit) via 3b8335a122ff4d071759346847666d62c702f2b4 (commit) via ff1e5aae555fb905fa33369c85c94b0b0108feaf (commit) via c7cb9f3cfb759b353cb92e62c9154c0607b9faa8 (commit) via 28453cfc46940eb2fa4e6bf993d0378a97b396a3 (commit) via f256a61a4a6aaabab1806c9f644bfd0005c3e857 (commit) via 464d58f97a427e842a704e17a6c50ca6a88e11f5 (commit) via 9c5c48319714b54f41adc49d4b5417294e8b6079 (commit) via 9d7a1cca8578a712714a94258d081b1a4e3d5d95 (commit) via a184c8106407ea7b3ce30dc14b1d548ac93813f2 (commit) via b826d4152097bfcb1138f05f647862c69f739769 (commit) via 32401e08eb7edab00e58069690e7371af8346fdd (commit) via 622c2395fcf4ecd00991ba4dfda4eddc49604ba1 (commit) via 752d8cae10e26fae6500a073893aa6aad2c85403 (commit) via d02047f7f328aa892cb80f57374f3c6ba6a3fdc1 (commit) via 8d47be1577e975889b17016f2fda968d79780b57 (commit) via 548b72e33fc2b5352a5ca511693a5ae43fd94cba (commit) via 11701a0cb30bfb85d57a07a94e88485ebd7c0c4a (commit) via 53a98117e4a7985a38bf6b708d99069ba17353aa (commit) via b54300a5ba958e308a8ff9edb32f685247999e2a (commit) via 6143a5ecb90ebfec07d7f7e4605e086f7bc61f83 (commit) via 2c6947d729838521895b4ef091210d1f82ad66fa (commit) via 4dad6c9aa0df1dddd07a4fa53cecc05b7287ff4a (commit) via d10f1a65daf8af9a90af3c937226f5c4d5b4750a (commit) via b1a4d275224ac708a9b05dae7915a27109886cc9 (commit) via 9f724b07283be1b79455a1b1a80c87205db7415d (commit) via 6adbc43e3b823f9eeb385911e3a47e5ec8c963e9 (commit) via 4a19598794bc2ebec9d40f2bdd02afe17e9c4f85 (commit) via c5e55142e34779d78be4944489e03949fa03551f (commit) via 1c596f64a2ca06f073d0a6d3e37fb334bc5f64c9 (commit) via 70ca845540984efeee0654cf989389d19dc9166b (commit) via 1f9aa31e2c16defebcda3f4a5689caf779756c2a (commit) via 8e0ab28cbc07882bc55a6e633928a7c46be9d018 (commit) via 643c15954419858896b0cd759737e7620c541fe8 (commit) via 899f6280731edf03ae30f23dcdd4745ecbe9a1f2 (commit) via 98cab34716892c5b65385589ab6c3edbd46f9710 (commit) via 482527bb90e7b716941dc1a9061a217c7ae8891d (commit) via 902b12ce4df4c7292fa491510241c46ca99e9e2b (commit) via 79ee98c0d746a92d576c1939f22c43e567807cd4 (commit) via 669c38a57b112f921a08ba1a3f0f1054902068f9 (commit) via eba3666e5fe1bff4705fe9c98532f51f8173f81f (commit) via 0193764da7088997d86ce051decfa76a98389c0f (commit) via 0e13f8102f13a50b59aade263e9fe5686f2dc70c (commit) via aa0bdee5768b8d6c4da2bfb0829eb083a2cc1d3c (commit) via a921ddd44ba3c5f2d17dcfb91d895fbef7604c6c (commit) via 6ed67df01362829d95ef961cfc4240851088c71d (commit) via 89cccc3f9d23c012b6d68223369da5b7b2166fd0 (commit) via bbe58a4163e25ffd7677bdddac47196f4681958a (commit) via de162c799ceaff805639868514eaf8889c9f8e49 (commit) via 0214776e7a453b8e10ddde889f39b09efa1c2e3a (commit) via c59d0eb348d67f1accf519ad9887d3a809d0b5ac (commit) via 041d0dc64632eb9aa876f73997fcf9c6ab830736 (commit) via 961ba2240c9a2e7fbcf06d7681790e2cecef6d32 (commit) via 9799d16b510acb6f010157cf36953d87b483497d (commit) via dfd1f9600a8484aabcfdc8bfd09b60bcf8d7194d (commit) via e1a1cc378e801f88e043bc1f5434c472359037d1 (commit) via 70d61a2d6eb3602df210041397a5bc2b5226aa66 (commit) via ef1027240a5c435f8f80d5aebb4cb78667522cd9 (commit) via b05629704f959c2e4d122e22b7636f08c1ae018a (commit) via 4046dfe6f7bfe217aac73a60bd98481632f28a90 (commit) via cae5c85609c8b8d650c8ec13e5fc193b6cb0cc2a (commit) via de558e1fd81f8a8677545c7052fdc88d8a3d056a (commit) via ec5a4728ec5fb5bc3c7c5bc572d4a2103de6bc7b (commit) via 2d5c9e765d41ad16003b43e2b03f716a128f43ca (commit) via b8b448283cb2db5e1f10d7d9cc635919f0803ed6 (commit) via 1e6a267bc08570326ac13fe4fb4b09dd04090f04 (commit) via 3a3cd53c0bc6b67b4a2f2ab91bf53f2d16f04850 (commit) via 94a1f48d731bb997e4408e88033d4b1cfceceee9 (commit) via cb3ec8ce138e75790da1bee29bf2da1723bf907e (commit) via 2f9f294e56199ded1006c540e14eb9565bd4158d (commit) via ced2be000f12493790fa6ec3118c13dfd53c3480 (commit) via 7db5a17a002477d3dd6075298158c909918b0fce (commit) via c803910e9b8fed818e2f6848ceded6b918260bc5 (commit) via 7dc506b48a5d9739c8483ada6b7c725c840b5ec8 (commit) via a0c8b8d5105ab098893a67e743c1a3f7c64783b0 (commit) via 6dc7e4398c3cf9cc466ff9ccebc413f442c91408 (commit) via 470ab8590c7a718eca3dc848a381440131b6701e (commit) via 8b7c177b17b3e889b03a98c9e7f4812bbf5347d6 (commit) via 2082dbe0ad1a8abb2bacba99a718f2d212b56fd1 (commit) via a26809dfe97b70d65bb5706a57e57d04c9a26242 (commit) via 978d82a0dbae555e2c757cc7202926307d21eb48 (commit) via 9455de217fb6aec957c2fd03e8ad8d98e7502a41 (commit) via 03f61d76ea140544a2bd47489ca7ea55d2a07047 (commit) via 92a937fa891f6391836688d3bccc386ee705a862 (commit) via 10172dec0f518f646796bf1cbea1dfc0d84a58ac (commit) via 3894a51d36339003e51481be924b4e9d237afac7 (commit) via 4e5a8aeaf2226eced55b1b09731f05db646c601a (commit) via b955ecf309a0402264c6c4c3187f39772805a492 (commit) via b31f2f590205e34352b5726bd39bb5811a9aea83 (commit) via 9fca659592f8c07e9ea252124542a32b19d508a7 (commit) via 619f727a664642367fcc13d5923cd67565146d75 (commit) via ca034dd5be1eb52e5ba698fdaf48441ef9232253 (commit) via 7c60810a254871cd3f4b5e64b8ed9d32fbc22039 (commit) via 07c83125fbb603e47560f2564c56a4e61f178733 (commit) via 7d3cbec0a50867eda87180a8b3e36104570fab70 (commit) via 3151875da98c528bd88a47d2baeeef749641e078 (commit) via 74ae8cb3d0f20fa8e556637bbfb2ef65f94a2ff7 (commit) via 7d4f627f694d972e1b03b9ca961980efaeed964d (commit) via 906f2366e804d8c3e216b32d9d95e21962d64bdd (commit) via f7773bdb0a5f4a2633db7c417320525307208ce1 (commit) via 97aadbd7550bbc30b3233763a199879697ecea42 (commit) via f70c8e0acc71d11e3e46e38e23b898da542ad2d9 (commit) via 542fcf95dfe69de360defa3c5a50981519ca5473 (commit) via 32e461a6b9798f95bc659262aa237af8bd468e22 (commit) via 4bfd663cfb87ee5f7d905de4bb426dbbe83a8ec1 (commit) via ce6a4248b4d98c34ba5ec5022ae68cc240553dd4 (commit) via 706148bd7bd2a1138c2aee91f0e1463540deaa52 (commit) via 78149d2acd630f6988e0cbca5682f91213540416 (commit) via 2510005ce77741c054e7fc089e075fe280a773ed (commit) via 304dee05f683045536596f3f79a8039e0ab385d0 (commit) via 9d8c5490e9c010e6ce1694f9190b9b8f32d49580 (commit) via 757792dbea67e77dfb75c7b3d703127ef4307669 (commit) via 852fd7f7ea50c2ca524b190d8db1e19c24b00cb5 (commit) via 749308a78ac92ce127e96a1ec8a61b073ea28dab (commit) via 49762301f533222098453e17f547a468e2413b5e (commit) via 7395d15706f398f6c44f4579f278ead57bd762bd (commit) via 187511199544e904e81f91f7d3924760f4014c87 (commit) via f08ca6b0e8ad20a5958fc357933ff3daece9f14c (commit) via 68181d1dcd88a9662b326ed6c618f90371c38bb6 (commit) via 89cf4eeee292defc65b665d1daa8e20629a3db36 (commit) via a7dd8e818e7cfcc8125ef4afcd88de2ba9d1989c (commit) via 0a2727d0e2de4059c2610c1fa55293c19e82dde6 (commit) via 5c414c5db3cd4ff8d563e20d715faad6fce15dd8 (commit) from eecd7d1ced5f4dfc8d46bccc2edc1dacddbe635e (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 ----------------------------------------------------------------- 0d8813e Handle properly non 8-bit Magick::Quantum's. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 237 ++ HACKING | 16 +- Makefile.am | 4 +- README | 63 +- bootstrap | 11 +- build-aux/autotroll.mk | 108 + build-aux/build_unit_test.sh | 201 ++- configure.ac | 265 ++- m4/autotroll.m4 | 568 +++++ m4/boost.m4 | 1038 +++++++++ m4/oln-with-lib.m4 | 124 +- m4/pkg.m4 | 155 ++ milena/ChangeLog | 933 ++++++++- milena/Makefile.am | 1 + milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 206 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 206 -> 206 bytes milena/doc/figures/labeling-compute-2.ppm | Bin 206 -> 206 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 191 -> 191 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12406 -> 12406 bytes milena/doc/tutorial.tex | 4 + milena/headers.mk | 28 +- milena/img/BUG_lean_ascii.pgm.gz | Bin 75726 -> 0 bytes milena/img/picasso.ppm | Bin 0 -> 244671 bytes milena/mln/accu/center.hh | 14 +- milena/mln/accu/count_value.hh | 30 +- milena/mln/accu/internal/base.hh | 4 +- milena/mln/accu/label_used.hh | 6 +- milena/mln/accu/math/sum.hh | 3 +- milena/mln/accu/pair.hh | 26 + milena/mln/accu/stat/variance.hh | 4 +- milena/mln/accu/tuple.hh | 13 +- milena/mln/algebra/vec.hh | 4 +- milena/mln/border/thickness.hh | 4 + milena/mln/canvas/labeling/blobs.hh | 22 +- milena/mln/canvas/labeling/video.hh | 8 +- milena/mln/convert/from_to.hxx | 45 + milena/mln/convert/impl/from_float_to_value.hh | 10 + milena/mln/convert/impl/from_unsigned_to_value.hh | 10 + milena/mln/convert/to_qimage.hh | 300 +++ milena/mln/convert/to_qimage_nocopy.hh | 180 ++ milena/mln/core/alias/dpoint1d.hh | 4 + milena/mln/core/alias/dpoint2d.hh | 4 + milena/mln/core/alias/dpoint3d.hh | 4 + milena/mln/core/alias/neighb3d.hh | 42 + milena/mln/core/alias/window2d.hh | 3 +- milena/mln/core/concept/function.hh | 43 + milena/mln/core/concept/gpoint.hh | 2 +- milena/mln/core/image/image1d.hh | 6 +- milena/mln/core/image/image3d.hh | 9 +- milena/mln/core/image/imorph/interpolated.hh | 13 +- milena/mln/core/image/imorph/labeled_image.hh | 2 + milena/mln/core/internal/box_impl.hh | 61 +- milena/mln/core/internal/labeled_image_base.hh | 37 +- milena/mln/core/point.hh | 164 ++- milena/mln/core/routine/extend.hh | 57 +- milena/mln/core/site_set/box.hh | 37 +- milena/mln/data/fill_with_value.hh | 3 +- milena/mln/data/paste_without_localization.hh | 311 +++- milena/mln/data/split.hh | 99 + milena/mln/debug/mosaic.hh | 141 ++ milena/mln/debug/slices_2d.hh | 15 +- milena/mln/debug/z_order.hh | 159 ++ milena/mln/draw/all.hh | 1 + milena/mln/draw/box.hh | 5 +- milena/mln/draw/box_plain.hh | 92 + milena/mln/draw/dashed_line.hh | 113 + milena/mln/draw/line.hh | 1 + milena/mln/fun/all.hh | 2 + milena/mln/fun/internal/x2x_linear_impl.hh | 20 +- milena/mln/fun/n2v/all.hh | 51 + milena/mln/fun/n2v/white_gaussian.hh | 104 + milena/mln/fun/v2v/all.hh | 1 + milena/mln/fun/v2v/hsl_to_rgb.hh | 3 + milena/mln/fun/v2v/qt_rgb_to_int_u.hh | 71 + milena/mln/fun/v2v/rgb_to_int_u.hh | 69 + milena/mln/fun/v2v/saturate.hh | 9 +- milena/mln/fun/x2x/composed.hh | 18 +- milena/mln/fun/x2x/rotation.hh | 225 +- milena/mln/fun/x2x/translation.hh | 6 +- milena/mln/geom/all.hh | 4 +- milena/mln/geom/horizontal_symmetry.hh | 194 ++ milena/mln/geom/max_col.hh | 8 +- milena/mln/geom/max_row.hh | 8 +- milena/mln/geom/min_col.hh | 8 +- milena/mln/geom/min_row.hh | 8 +- milena/mln/geom/nslices.hh | 68 + milena/mln/geom/nslis.hh | 68 - milena/mln/geom/rotate.hh | 107 +- milena/mln/geom/size3d.hh | 5 +- milena/mln/geom/vertical_symmetry.hh | 196 ++ milena/mln/histo/compute.hh | 15 +- milena/mln/histo/equalize.hh | 97 + milena/mln/io/dicom/all.hh | 4 +- milena/mln/io/dicom/get_header.hh | 114 + milena/mln/io/dicom/load.hh | 17 +- milena/mln/io/dump/all.hh | 1 + milena/mln/io/dump/get_header.hh | 128 ++ milena/mln/io/dump/save.hh | 3 + milena/mln/io/fld/load.hh | 13 +- milena/mln/io/fld/max_components.hh | 32 +- milena/mln/io/magick/load.hh | 19 +- milena/mln/io/magick/save.hh | 35 +- milena/mln/io/plot/save.hh | 28 +- milena/mln/io/pnm/load.hh | 3 +- milena/mln/io/raw/all.hh | 49 + milena/mln/io/raw/get_header.hh | 136 ++ milena/mln/io/raw/load.hh | 226 ++ milena/mln/io/raw/save.hh | 177 ++ milena/mln/labeling/blobs.hh | 4 +- milena/mln/labeling/blobs_and_compute.hh | 60 +- milena/mln/labeling/colorize.hh | 82 +- milena/mln/labeling/compute.hh | 422 ++++- milena/mln/labeling/flat_zones.hh | 34 +- milena/mln/labeling/pack.hh | 2 +- milena/mln/labeling/relabel.hh | 29 +- milena/mln/labeling/superpose.hh | 14 +- milena/mln/labeling/value.hh | 16 +- milena/mln/labeling/value_and_compute.hh | 241 ++ milena/mln/linear/ch_convolve.hh | 9 +- milena/mln/linear/gaussian.hh | 8 +- milena/mln/linear/gaussian/impl.hh | 13 +- milena/mln/literal/black.hh | 4 + milena/mln/literal/colors.hh | 7 +- milena/mln/literal/identity.hh | 4 + milena/mln/literal/one.hh | 3 + milena/mln/literal/origin.hh | 6 +- milena/mln/literal/white.hh | 4 + milena/mln/literal/zero.hh | 4 + milena/mln/make/box3d.hh | 15 +- milena/mln/make/image.hh | 7 +- milena/mln/make/relabelfun.hh | 9 +- milena/mln/math/diff_abs.hh | 5 +- milena/mln/registration/icp.hh | 5 +- milena/mln/set/compute_with_weights.hh | 6 +- milena/mln/subsampling/antialiased.hh | 458 ++++ milena/mln/tag/init.hh | 4 + milena/mln/topo/skeleton/crest.hh | 51 +- milena/mln/trace/entering.hh | 3 + milena/mln/trace/quiet.hh | 5 +- milena/mln/transform/influence_zone_geodesic.hh | 13 +- milena/mln/value/int_s.hh | 11 +- milena/mln/value/int_u.hh | 69 +- milena/mln/value/internal/make_generic_name.hh | 67 + milena/mln/value/label.hh | 22 +- milena/mln/value/next.hh | 125 + milena/mln/value/ops.hh | 6 +- milena/mln/value/qt/rgb32.hh | 803 +++++++ milena/mln/value/rgb.hh | 67 +- milena/mln/value/sign.hh | 10 +- milena/mln/win/sline3d.hh | 76 + milena/mln/world/binary_2d/enlarge.hh | 4 +- milena/mln/world/inter_pixel/full2image.hh | 4 +- milena/sandbox/ChangeLog | 601 +++++ milena/sandbox/bench/README_CFLAGS | 8 + milena/sandbox/bench/extract_vertical_lines.cc | 49 + .../bench/fast_components_and_attributes.cc | 402 ++++ milena/sandbox/bench/fast_rows.cc | 247 ++ milena/sandbox/bench/fast_tiles.cc | 140 ++ milena/sandbox/bench/fastest.cc | 351 +++ milena/sandbox/bin/labeling/colorize.cc | 24 + milena/sandbox/bin/pgm_to_pbm.cc | 39 + milena/sandbox/bin/ppm_negate.cc | 43 + .../green/bench/transform/distance/Makefile.am | 150 ++ .../green/bench/transform/distance/distance.cc | 775 +++++++ .../sandbox/green/demo/annotating/bic/Makefile.am | 150 ++ milena/sandbox/green/demo/annotating/bic/bic.cc | 87 + .../sandbox/green/demo/annotating/hsv/Makefile.am | 152 ++ milena/sandbox/green/demo/annotating/hsv/hsv.cc | 607 +++++ .../sandbox/green/demo/annotating/lep/Makefile.am | 150 ++ milena/sandbox/green/demo/annotating/lep/lep.cc | 92 + .../green/demo/annotating/nb_color/Makefile.am | 150 ++ .../green/demo/annotating/nb_color/nb_color.cc | 101 + .../green/demo/annotating/project/Makefile.am | 150 ++ .../green/demo/annotating/project/project.cc | 210 ++ .../green/demo/annotating/rgb_64/Makefile.am | 150 ++ .../sandbox/green/demo/annotating/rgb_64/rgb_64.cc | 47 + .../green/demo/annotating/rgb_64_9/Makefile.am | 150 ++ .../green/demo/annotating/rgb_64_9/rgb_64_9.cc | 97 + .../green/demo/annotating/stddev_color/Makefile.am | 150 ++ .../demo/annotating/stddev_color/stddev_color.cc | 124 + .../demo/annotating/stddev_color_16/Makefile.am | 150 ++ .../annotating/stddev_color_16/stddev_color_16.cc | 178 ++ .../histo2d => clustering/kmean_rgb}/Makefile.am | 0 .../green/demo/clustering/kmean_rgb/kmean_rgb.cc | 91 + .../demo/labeling/regional_maxima/Makefile.am | 2 + .../labeling/regional_maxima/regional_maxima.cc | 906 ++++++-- .../demo/labeling/regional_maxima/thresholds.txt | 42 + milena/sandbox/green/doc/annotating/class.txt | 42 + .../green/doc/annotating/syntheseMillet2008.txt | 283 +++ milena/sandbox/green/doc/annotating/testMillet2008 | 69 + .../doc/regional_maxima/cmp_method/h0_input.pgm.gz | Bin 0 -> 18078 bytes .../doc/regional_maxima/cmp_method/h2_mean.pgm.gz | Bin 0 -> 374 bytes .../doc/regional_maxima/cmp_method/h2_merge.pgm.gz | Bin 0 -> 4491 bytes .../doc/regional_maxima/cmp_method/h3_mean.pgm.gz | Bin 0 -> 391 bytes .../doc/regional_maxima/cmp_method/h3_merge.pgm.gz | Bin 0 -> 10188 bytes .../doc/regional_maxima/cmp_method/h4_mean.pgm.gz | Bin 0 -> 367 bytes .../doc/regional_maxima/cmp_method/h4_merge.pgm.gz | Bin 0 -> 18078 bytes .../doc/regional_maxima/cmp_method/h5_mean.pgm.gz | Bin 0 -> 372 bytes .../doc/regional_maxima/cmp_method/h5_merge.pgm.gz | Bin 0 -> 12777 bytes .../doc/regional_maxima/cmp_method/i2_mean.ppm.gz | Bin 0 -> 566650 bytes .../doc/regional_maxima/cmp_method/i2_merge.ppm.gz | Bin 0 -> 1586150 bytes .../doc/regional_maxima/cmp_method/i3_mean.ppm.gz | Bin 0 -> 573407 bytes .../doc/regional_maxima/cmp_method/i3_merge.ppm.gz | Bin 0 -> 3050979 bytes .../doc/regional_maxima/cmp_method/i4_mean.ppm.gz | Bin 0 -> 663621 bytes .../doc/regional_maxima/cmp_method/i4_merge.ppm.gz | Bin 0 -> 3387044 bytes .../doc/regional_maxima/cmp_method/i5_mean.ppm.gz | Bin 0 -> 653140 bytes .../doc/regional_maxima/cmp_method/i5_merge.ppm.gz | Bin 0 -> 3217839 bytes .../doc/regional_maxima/cmp_method/l2_input.pgm.gz | Bin 0 -> 423612 bytes .../doc/regional_maxima/cmp_method/l3_input.pgm.gz | Bin 0 -> 420801 bytes .../doc/regional_maxima/cmp_method/l4_input.pgm.gz | Bin 0 -> 486206 bytes .../doc/regional_maxima/cmp_method/l5_input.pgm.gz | Bin 0 -> 479055 bytes .../regional_maxima/cmp_method/reponse_theo.eml | 106 + .../doc/regional_maxima/cmp_method/s2_histo.txt | 31 + .../doc/regional_maxima/cmp_method/s3_histo.txt | 31 + .../doc/regional_maxima/cmp_method/s4_histo.txt | 31 + .../doc/regional_maxima/cmp_method/s5_histo.txt | 31 + .../doc/regional_maxima/cmp_method/synthese.txt | 223 ++ .../doc/regional_maxima/cmp_quant/h0_input.pgm.gz | Bin 0 -> 18078 bytes .../regional_maxima/cmp_quant/h5_mean_q2.pgm.gz | Bin 0 -> 247 bytes .../regional_maxima/cmp_quant/h5_mean_q3.pgm.gz | Bin 0 -> 280 bytes .../regional_maxima/cmp_quant/h5_mean_q4.pgm.gz | Bin 0 -> 319 bytes .../regional_maxima/cmp_quant/h5_mean_q5.pgm.gz | Bin 0 -> 375 bytes .../regional_maxima/cmp_quant/h5_mean_q6.pgm.gz | Bin 0 -> 392 bytes .../regional_maxima/cmp_quant/h5_mean_q7.pgm.gz | Bin 0 -> 383 bytes .../regional_maxima/cmp_quant/h5_mean_q8.pgm.gz | Bin 0 -> 470 bytes .../regional_maxima/cmp_quant/h5_merge_q2.pgm.gz | Bin 0 -> 18081 bytes .../regional_maxima/cmp_quant/h5_merge_q3.pgm.gz | Bin 0 -> 18081 bytes .../regional_maxima/cmp_quant/h5_merge_q4.pgm.gz | Bin 0 -> 16358 bytes .../regional_maxima/cmp_quant/h5_merge_q5.pgm.gz | Bin 0 -> 12780 bytes .../regional_maxima/cmp_quant/h5_merge_q6.pgm.gz | Bin 0 -> 9694 bytes .../regional_maxima/cmp_quant/h5_merge_q7.pgm.gz | Bin 0 -> 6211 bytes .../regional_maxima/cmp_quant/h5_merge_q8.pgm.gz | Bin 0 -> 1564 bytes .../regional_maxima/cmp_quant/i5_mean_q2.ppm.gz | Bin 0 -> 112779 bytes .../regional_maxima/cmp_quant/i5_mean_q3.ppm.gz | Bin 0 -> 191264 bytes .../regional_maxima/cmp_quant/i5_mean_q4.ppm.gz | Bin 0 -> 298062 bytes .../regional_maxima/cmp_quant/i5_mean_q5.ppm.gz | Bin 0 -> 653143 bytes .../regional_maxima/cmp_quant/i5_mean_q6.ppm.gz | Bin 0 -> 807617 bytes .../regional_maxima/cmp_quant/i5_mean_q7.ppm.gz | Bin 0 -> 813222 bytes .../regional_maxima/cmp_quant/i5_mean_q8.ppm.gz | Bin 0 -> 861711 bytes .../regional_maxima/cmp_quant/i5_merge_q2.ppm.gz | Bin 0 -> 3387047 bytes .../regional_maxima/cmp_quant/i5_merge_q3.ppm.gz | Bin 0 -> 3387047 bytes .../regional_maxima/cmp_quant/i5_merge_q4.ppm.gz | Bin 0 -> 3355365 bytes .../regional_maxima/cmp_quant/i5_merge_q5.ppm.gz | Bin 0 -> 3217842 bytes .../regional_maxima/cmp_quant/i5_merge_q6.ppm.gz | Bin 0 -> 3033730 bytes .../regional_maxima/cmp_quant/i5_merge_q7.ppm.gz | Bin 0 -> 2295150 bytes .../regional_maxima/cmp_quant/i5_merge_q8.ppm.gz | Bin 0 -> 1319396 bytes .../regional_maxima/cmp_quant/l5_input_q2.pgm.gz | Bin 0 -> 83951 bytes .../regional_maxima/cmp_quant/l5_input_q3.pgm.gz | Bin 0 -> 143817 bytes .../regional_maxima/cmp_quant/l5_input_q4.pgm.gz | Bin 0 -> 220346 bytes .../regional_maxima/cmp_quant/l5_input_q5.pgm.gz | Bin 0 -> 479058 bytes .../regional_maxima/cmp_quant/l5_input_q6.pgm.gz | Bin 0 -> 593359 bytes .../regional_maxima/cmp_quant/l5_input_q7.pgm.gz | Bin 0 -> 600121 bytes .../regional_maxima/cmp_quant/l5_input_q8.pgm.gz | Bin 0 -> 630760 bytes .../doc/regional_maxima/cmp_quant/s5_histo_q2.txt | 3 + .../doc/regional_maxima/cmp_quant/s5_histo_q3.txt | 8 + .../doc/regional_maxima/cmp_quant/s5_histo_q4.txt | 18 + .../doc/regional_maxima/cmp_quant/s5_histo_q5.txt | 33 + .../doc/regional_maxima/cmp_quant/s5_histo_q6.txt | 33 + .../doc/regional_maxima/cmp_quant/s5_histo_q7.txt | 32 + .../doc/regional_maxima/cmp_quant/s5_histo_q8.txt | 75 + .../doc/regional_maxima/cmp_quant/synthese.txt | 205 ++ .../mp00411c/colormap_all_q4.txt.gz | Bin 0 -> 187 bytes .../mp00411c/colormap_all_q5.txt.gz | Bin 0 -> 420 bytes .../mp00411c/colormap_thick_q4.txt.gz | Bin 0 -> 159 bytes .../mp00411c/colormap_thick_q5.txt.gz | Bin 0 -> 352 bytes .../mp00411c/colormap_thin_q4.txt.gz | Bin 0 -> 173 bytes .../mp00411c/colormap_thin_q5.txt.gz | Bin 0 -> 366 bytes .../regional_maxima/mp00411c/histo_all_q4.dump.gz | Bin 0 -> 1233 bytes .../regional_maxima/mp00411c/histo_all_q5.dump.gz | Bin 0 -> 4779 bytes .../mp00411c/histo_thick_q4.dump.gz | Bin 0 -> 781 bytes .../mp00411c/histo_thick_q5.dump.gz | Bin 0 -> 2532 bytes .../regional_maxima/mp00411c/histo_thin_q4.dump.gz | Bin 0 -> 901 bytes .../regional_maxima/mp00411c/histo_thin_q5.dump.gz | Bin 0 -> 2976 bytes .../doc/regional_maxima/mp00411c/iz_all_q4.dump.gz | Bin 0 -> 659040 bytes .../doc/regional_maxima/mp00411c/iz_all_q5.dump.gz | Bin 0 -> 1505619 bytes .../regional_maxima/mp00411c/iz_thick_q4.dump.gz | Bin 0 -> 482831 bytes .../regional_maxima/mp00411c/iz_thick_q5.dump.gz | Bin 0 -> 1414258 bytes .../regional_maxima/mp00411c/iz_thin_q4.dump.gz | Bin 0 -> 647722 bytes .../regional_maxima/mp00411c/iz_thin_q5.dump.gz | Bin 0 -> 1458415 bytes .../mp00411c/labeled_all_q4.dump.gz | Bin 0 -> 149 bytes .../mp00411c/labeled_all_q5.dump.gz | Bin 0 -> 343 bytes .../mp00411c/labeled_thick_q4.dump.gz | Bin 0 -> 149 bytes .../mp00411c/labeled_thick_q5.dump.gz | Bin 0 -> 309 bytes .../mp00411c/labeled_thin_q4.dump.gz | Bin 0 -> 149 bytes .../mp00411c/labeled_thin_q5.dump.gz | Bin 0 -> 308 bytes .../regional_maxima/mp00411c/mean3_all_q4.ppm.gz | Bin 0 -> 985276 bytes .../regional_maxima/mp00411c/mean3_all_q5.ppm.gz | Bin 0 -> 1961577 bytes .../regional_maxima/mp00411c/mean3_thick_q4.ppm.gz | Bin 0 -> 865034 bytes .../regional_maxima/mp00411c/mean3_thick_q5.ppm.gz | Bin 0 -> 1831699 bytes .../regional_maxima/mp00411c/mean3_thin_q4.ppm.gz | Bin 0 -> 958289 bytes .../regional_maxima/mp00411c/mean3_thin_q5.ppm.gz | Bin 0 -> 1872271 bytes .../regional_maxima/mp00411c/mean4_all_q4.ppm.gz | Bin 0 -> 772605 bytes .../regional_maxima/mp00411c/mean4_all_q5.ppm.gz | Bin 0 -> 1852455 bytes .../regional_maxima/mp00411c/mean4_thick_q4.ppm.gz | Bin 0 -> 559850 bytes .../regional_maxima/mp00411c/mean4_thick_q5.ppm.gz | Bin 0 -> 1727247 bytes .../regional_maxima/mp00411c/mean4_thin_q4.ppm.gz | Bin 0 -> 760428 bytes .../regional_maxima/mp00411c/mean4_thin_q5.ppm.gz | Bin 0 -> 1781495 bytes .../doc/regional_maxima/mp00411c/mp00411c.ppm.gz | Bin 0 -> 5316204 bytes .../doc/regional_maxima/mp00411c/mp00411c.sh.gz | Bin 0 -> 636 bytes .../regional_maxima/mp00411c/mp00411c_thick.pbm.gz | Bin 0 -> 190478 bytes .../regional_maxima/mp00411c/mp00411c_thin.pbm.gz | Bin 0 -> 248730 bytes .../regional_maxima/mp00411c/opened_all_q4.dump.gz | Bin 0 -> 1159 bytes .../regional_maxima/mp00411c/opened_all_q5.dump.gz | Bin 0 -> 4531 bytes .../mp00411c/opened_thick_q4.dump.gz | Bin 0 -> 747 bytes .../mp00411c/opened_thick_q5.dump.gz | Bin 0 -> 2351 bytes .../mp00411c/opened_thin_q4.dump.gz | Bin 0 -> 848 bytes .../mp00411c/opened_thin_q5.dump.gz | Bin 0 -> 2772 bytes .../regional_maxima/mp00411c/proj1_all_q4.pgm.gz | Bin 0 -> 343 bytes .../regional_maxima/mp00411c/proj1_all_q5.pgm.gz | Bin 0 -> 779 bytes .../regional_maxima/mp00411c/proj1_thick_q4.pgm.gz | Bin 0 -> 312 bytes .../regional_maxima/mp00411c/proj1_thick_q5.pgm.gz | Bin 0 -> 612 bytes .../regional_maxima/mp00411c/proj1_thin_q4.pgm.gz | Bin 0 -> 339 bytes .../regional_maxima/mp00411c/proj1_thin_q5.pgm.gz | Bin 0 -> 718 bytes .../regional_maxima/mp00411c/proj2_all_q4.pgm.gz | Bin 0 -> 338 bytes .../regional_maxima/mp00411c/proj2_all_q5.pgm.gz | Bin 0 -> 750 bytes .../regional_maxima/mp00411c/proj2_thick_q4.pgm.gz | Bin 0 -> 315 bytes .../regional_maxima/mp00411c/proj2_thick_q5.pgm.gz | Bin 0 -> 606 bytes .../regional_maxima/mp00411c/proj2_thin_q4.pgm.gz | Bin 0 -> 331 bytes .../regional_maxima/mp00411c/proj2_thin_q5.pgm.gz | Bin 0 -> 693 bytes .../regional_maxima/mp00411c/proj3_all_q4.ppm.gz | Bin 0 -> 230 bytes .../regional_maxima/mp00411c/proj3_all_q5.ppm.gz | Bin 0 -> 401 bytes .../regional_maxima/mp00411c/proj3_thick_q4.ppm.gz | Bin 0 -> 224 bytes .../regional_maxima/mp00411c/proj3_thick_q5.ppm.gz | Bin 0 -> 343 bytes .../regional_maxima/mp00411c/proj3_thin_q4.ppm.gz | Bin 0 -> 229 bytes .../regional_maxima/mp00411c/proj3_thin_q5.ppm.gz | Bin 0 -> 359 bytes .../regional_maxima/mp00411c/proj4_all_q4.ppm.gz | Bin 0 -> 252 bytes .../regional_maxima/mp00411c/proj4_all_q5.ppm.gz | Bin 0 -> 447 bytes .../regional_maxima/mp00411c/proj4_thick_q4.ppm.gz | Bin 0 -> 221 bytes .../regional_maxima/mp00411c/proj4_thick_q5.ppm.gz | Bin 0 -> 369 bytes .../regional_maxima/mp00411c/proj4_thin_q4.ppm.gz | Bin 0 -> 234 bytes .../regional_maxima/mp00411c/proj4_thin_q5.ppm.gz | Bin 0 -> 415 bytes .../doc/regional_maxima/mp00411c/quant_q4.ppm.gz | Bin 0 -> 2590062 bytes .../doc/regional_maxima/mp00411c/quant_q5.ppm.gz | Bin 0 -> 3775184 bytes .../regional_maxima/mp00411c/stats3_all_q4.txt.gz | Bin 0 -> 292 bytes .../regional_maxima/mp00411c/stats3_all_q5.txt.gz | Bin 0 -> 701 bytes .../mp00411c/stats3_thick_q4.txt.gz | Bin 0 -> 244 bytes .../mp00411c/stats3_thick_q5.txt.gz | Bin 0 -> 584 bytes .../regional_maxima/mp00411c/stats3_thin_q4.txt.gz | Bin 0 -> 262 bytes .../regional_maxima/mp00411c/stats3_thin_q5.txt.gz | Bin 0 -> 606 bytes .../regional_maxima/mp00411c/stats4_all_q4.txt.gz | Bin 0 -> 284 bytes .../regional_maxima/mp00411c/stats4_all_q5.txt.gz | Bin 0 -> 704 bytes .../mp00411c/stats4_thick_q4.txt.gz | Bin 0 -> 234 bytes .../mp00411c/stats4_thick_q5.txt.gz | Bin 0 -> 580 bytes .../regional_maxima/mp00411c/stats4_thin_q4.txt.gz | Bin 0 -> 255 bytes .../regional_maxima/mp00411c/stats4_thin_q5.txt.gz | Bin 0 -> 591 bytes .../doc/regional_maxima/mp00411c/synthese.txt.gz | Bin 0 -> 4062 bytes .../green/exp/annotating/achromastism/Makefile.am | 153 ++ .../exp/annotating/achromastism/achromastism.cc | 113 + .../exp/annotating/achromastism/text-color.txt | 15 + .../green/exp/annotating/achromastism/text-img.txt | 40 + .../exp/annotating/achromastism/text-only.txt | 8 + .../sandbox/green/exp/annotating/bench/Makefile.am | 153 ++ milena/sandbox/green/exp/annotating/bench/bench.cc | 1213 ++++++++++ .../sandbox/green/exp/annotating/error/Makefile.am | 153 ++ milena/sandbox/green/exp/annotating/error/error.cc | 700 ++++++ .../sandbox/green/exp/annotating/histo/Makefile.am | 153 ++ milena/sandbox/green/exp/annotating/histo/histo.cc | 306 +++ .../sandbox/green/exp/annotating/hsv/Makefile.am | 153 ++ milena/sandbox/green/exp/annotating/hsv/hsv.cc | 652 ++++++ .../sandbox/green/exp/annotating/hue/Makefile.am | 153 ++ milena/sandbox/green/exp/annotating/hue/hue.cc | 291 +++ .../green/exp/annotating/hue/text-color.txt | 15 + .../sandbox/green/exp/annotating/hue/text-img.txt | 40 + .../sandbox/green/exp/annotating/hue/text-only.txt | 8 + .../green/exp/annotating/nb_color/Makefile.am | 151 ++ .../green/exp/annotating/nb_color/nb_color.cc | 131 ++ .../green/exp/annotating/saturation/Makefile.am | 153 ++ .../green/exp/annotating/saturation/saturation.cc | 119 + .../green/exp/annotating/saturation/text-color.txt | 15 + .../green/exp/annotating/saturation/text-img.txt | 40 + .../green/exp/annotating/saturation/text-only.txt | 8 + .../green/exp/annotating/stddev_color/Makefile.am | 151 ++ .../exp/annotating/stddev_color/stddev_color.cc | 153 ++ .../exp/annotating/stddev_color_16/Makefile.am | 151 ++ .../annotating/stddev_color_16/stddev_color_16.cc | 195 ++ .../sandbox/green/exp/annotating/value/Makefile.am | 153 ++ .../green/exp/annotating/value/text-color.txt | 15 + .../green/exp/annotating/value/text-img.txt | 40 + .../green/exp/annotating/value/text-only.txt | 8 + milena/sandbox/green/exp/annotating/value/value.cc | 316 +++ .../green/exp/labeling/regional_maxima/Makefile.am | 151 ++ .../labeling/regional_maxima/regional_maxima.cc | 156 ++ milena/sandbox/green/mln/accu/stat/histo1d.hh | 66 +- milena/sandbox/green/mln/clustering/kmean_rgb.hh | 973 ++++++++ milena/sandbox/green/mln/display/display_histo.hh | 98 +- milena/sandbox/green/mln/display/project_histo.hh | 443 ++++- milena/sandbox/green/mln/fun/p2b/achromatic.hh | 112 + .../sandbox/green/mln/fun/p2b/component_equals.hh | 99 + milena/sandbox/green/mln/fun/v2v/achromatism.hh | 64 + .../sandbox/green/mln/fun/v2v/hue_concentration.hh | 100 + milena/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh | 71 + .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 77 + milena/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 149 ++ milena/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh | 96 + .../green/mln/fun/v2v/rgb_to_saturation_map.hh | 83 + .../sandbox/green/mln/fun/v2v/rgb_to_value_map.hh | 75 + milena/sandbox/green/mln/img_path.hh | 221 ++- milena/sandbox/green/mln/math/ceil.hh | 64 + milena/sandbox/green/mln/math/floor.hh | 64 + milena/sandbox/green/mln/value/hsv.hh | 424 ++++ .../green/tools/annotating/histo/Makefile.am | 150 ++ .../sandbox/green/tools/annotating/histo/histo.cc | 143 ++ .../sandbox/green/tools/annotating/iz/Makefile.am | 150 ++ milena/sandbox/green/tools/annotating/iz/iz.cc | 373 +++ .../green/tools/annotating/opening/Makefile.am | 150 ++ .../green/tools/annotating/opening/opening.cc | 111 + .../green/tools/annotating/regmax/Makefile.am | 150 ++ .../green/tools/annotating/regmax/regmax.cc | 328 +++ .../lazzara/scribo/binarization_naive/main.cc | 54 + .../lazzara/scribo/binarization_naive/toto.cc | 28 + milena/sandbox/lazzara/scribo/fill_holes/main.cc | 118 + .../separateurs_materialises/lines_pattern.cc | 69 + .../sandbox/lazzara/scribo/skeleton_crest/main.cc | 52 + milena/tests/accu/Makefile.am | 12 +- milena/tests/convert/Makefile.am | 25 +- milena/tests/convert/to_qimage.cc | 76 + milena/tests/convert/to_qimage_nocopy.cc | 56 + milena/tests/core/alias/box3d.cc | 5 +- milena/tests/core/image/image3d.cc | 11 +- milena/tests/core/other/box_runstart_piter.cc | 57 +- milena/tests/core/site_set/Makefile.am | 2 + milena/tests/core/site_set/box.cc | 42 + milena/tests/data/Makefile.am | 4 + milena/tests/data/paste_without_localization.cc | 81 + milena/tests/data/split.cc | 54 + milena/tests/fun/v2v/Makefile.am | 9 + milena/tests/fun/v2v/qt_rgb_to_int_u.cc | 44 + milena/tests/fun/x2x/composed.cc | 6 +- milena/tests/geom/Makefile.am | 12 +- milena/tests/geom/horizontal_symmetry.cc | 50 + milena/tests/geom/nslices.cc | 38 + milena/tests/geom/nslis.cc | 37 - milena/tests/geom/rotate.cc | 16 +- milena/tests/geom/translate.cc | 5 +- milena/tests/geom/vertical_symmetry.cc | 49 + milena/tests/io/magick/save.cc | 5 +- milena/tests/io/pbms/load.cc | 3 +- milena/tests/io/pgms/load.cc | 3 +- milena/tests/io/ppms/load.cc | 3 +- milena/tests/labeling/Makefile.am | 11 +- milena/tests/labeling/blobs_and_compute.cc | 17 +- milena/tests/labeling/colorize.cc | 6 +- milena/tests/labeling/flat_zones.cc | 4 +- milena/tests/labeling/foreground.cc | 4 +- milena/tests/labeling/relabel.cc | 6 +- milena/tests/subsampling/Makefile.am | 12 +- milena/tests/subsampling/antialiased.cc | 74 + milena/tests/topo/skeleton/crest.cc | 10 +- .../transform/bench_closest_point_geodesic.cc | 9 +- milena/tests/unit_test/Makefile.am | 23 +- milena/tests/unit_test/cond_tests_boost-tuple | 1 + milena/tests/unit_test/cond_tests_cfitsio | 2 + milena/tests/unit_test/cond_tests_gdcm | 3 + milena/tests/unit_test/cond_tests_magickxx | 3 + milena/tests/unit_test/cond_tests_qt | 2 + milena/tests/unit_test/cond_tests_tiff | 2 + milena/tests/unit_test/disabled_tests | 10 - milena/tests/unit_test/unit-tests.mk | 146 ++- milena/tests/value/builtin/Makefile.am | 6 +- milena/tests/value/builtin/floatings.cc | 38 + scribo/ChangeLog | 2402 +++++++++++++++++++- scribo/Makefile.am | 9 +- scribo/README | 52 + scribo/all.hh | 51 - scribo/binarization/binarize.hh | 180 -- scribo/binarization/sauvola.hh | 192 -- scribo/binarization/sauvola_threshold.hh | 478 ---- scribo/binarization/simple.hh | 166 -- scribo/core/all.hh | 49 - scribo/core/erase_objects.hh | 87 - scribo/core/internal/link_functor_base.hh | 119 - scribo/core/macros.hh | 38 - scribo/core/object_groups.hh | 140 -- scribo/core/object_image.hh | 38 - scribo/core/object_links.hh | 130 -- scribo/debug/alignment_decision_image.hh | 170 -- scribo/debug/decision_image.hh | 176 -- scribo/debug/links_decision_image.hh | 127 - scribo/debug/save_bboxes_image.hh | 87 - scribo/debug/save_linked_bboxes_image.hh | 269 --- scribo/debug/save_object_diff.hh | 98 - scribo/debug/several_links_decision_image.hh | 185 -- scribo/debug/usage.hh | 82 - scribo/demo/Makefile.am | 12 +- scribo/demo/demat/demat.pro | 42 + scribo/demo/demat/demat.qrc | 4 + scribo/demo/demat/src/doc_type.hh | 51 + scribo/demo/demat/src/main.cc | 31 + scribo/demo/demat/src/main_window.cc | 266 +++ scribo/demo/demat/src/main_window.hh | 96 + scribo/demo/demat/src/mln_widgets.cc | 11 + scribo/demo/demat/src/preprocessing_task.hh | 62 + scribo/demo/demat/src/process_args.hh | 47 + scribo/demo/demat/src/runner.cc | 327 +++ scribo/demo/demat/src/runner.hh | 94 + scribo/demo/demat/ui/main_window.ui | 381 ++++ scribo/demo/demo.pro | 16 - .../igr/gui => scribo/demo/review}/Makefile.am | 0 scribo/demo/{ => review}/icons/document-open.png | Bin 1550 -> 1550 bytes scribo/demo/{ => review}/icons/edit-find.png | Bin 1636 -> 1636 bytes .../demo/{ => review}/icons/format-indent-more.png | Bin 766 -> 766 bytes scribo/demo/{ => review}/icons/go-next.png | Bin 1219 -> 1219 bytes scribo/demo/{ => review}/icons/image-x-generic.png | Bin 1163 -> 1163 bytes scribo/demo/{ => review}/icons/list-add.png | Bin 601 -> 601 bytes scribo/demo/{ => review}/icons/ocr.png | Bin 14929 -> 14929 bytes scribo/demo/{ => review}/icons/text-x-generic.png | Bin 744 -> 744 bytes scribo/demo/{ => review}/icons/view-refresh.png | Bin 2024 -> 2024 bytes .../{ => review}/icons/x-office-spreadsheet.png | Bin 1518 -> 1518 bytes scribo/demo/review/review.pro | 16 + scribo/demo/{demo.qrc => review/review.qrc} | 0 scribo/demo/review/src/main.cc | 49 + scribo/demo/review/src/mainwindow.cc | 572 +++++ scribo/demo/review/src/mainwindow.hh | 138 ++ scribo/demo/{ => review}/ui/mainwindow.ui | 0 scribo/demo/shared/icons/Symbols-Delete-icon.png | Bin 0 -> 3704 bytes scribo/demo/shared/icons/accept-icon.png | Bin 0 -> 4858 bytes scribo/demo/shared/icons/close.gif | Bin 0 -> 340 bytes scribo/demo/shared/icons/crop-icon.png | Bin 0 -> 228 bytes scribo/demo/shared/icons/image-add-icon.png | Bin 0 -> 2917 bytes scribo/demo/shared/icons/image-edit-icon.png | Bin 0 -> 2305 bytes scribo/demo/shared/icons/image-multi-icon.png | Bin 0 -> 2033 bytes scribo/demo/shared/icons/image-next-icon.png | Bin 0 -> 3008 bytes scribo/demo/shared/icons/image-remove-icon.png | Bin 0 -> 3127 bytes scribo/demo/shared/icons/next-icon.png | Bin 0 -> 4611 bytes scribo/demo/shared/icons/page-down-icon.png | Bin 0 -> 3450 bytes scribo/demo/shared/icons/page-search-icon.png | Bin 0 -> 3101 bytes scribo/demo/shared/icons/rotate_ccw.png | Bin 0 -> 4200 bytes scribo/demo/shared/icons/rotate_cw.png | Bin 0 -> 4161 bytes scribo/demo/shared/icons/search-add-icon.png | Bin 0 -> 4274 bytes scribo/demo/shared/icons/search-remove-icon.png | Bin 0 -> 4196 bytes scribo/demo/shared/shared.qrc | 20 + scribo/demo/shared/src/bak/crop_item.cc | 332 +++ scribo/demo/shared/src/bak/crop_item.hh | 100 + scribo/demo/shared/src/bak/image_viewer.cc | 242 ++ scribo/demo/shared/src/bak/image_viewer.hh | 116 + scribo/demo/shared/src/bak/types.hh | 50 + scribo/demo/shared/src/browse_widget.cc | 72 + scribo/demo/shared/src/browse_widget.hh | 78 + scribo/demo/shared/src/crop_item.cc | 396 ++++ scribo/demo/shared/src/crop_item.hh | 119 + scribo/demo/shared/src/image_viewer.cc | 410 ++++ scribo/demo/shared/src/image_viewer.hh | 148 ++ scribo/demo/shared/src/image_viewer.hxx | 31 + .../shared/src/internal.bak/interactive_scene.cc | 286 +++ .../shared/src/internal.bak/interactive_scene.hh | 108 + .../shared/src/internal.bak/selection_rectangle.cc | 241 ++ .../shared/src/internal.bak/selection_rectangle.hh | 91 + .../demo/shared/src/internal/interactive_scene.cc | 94 + .../demo/shared/src/internal/interactive_scene.hh | 85 + .../shared/src/internal/selection_rectangle.cc | 241 ++ .../shared/src/internal/selection_rectangle.hh | 91 + scribo/demo/shared/src/to_mln_image.hh | 77 + scribo/demo/shared/src/types.hh | 50 + scribo/demo/shared/ui/browse_widget.ui | 106 + scribo/demo/shared/ui/crop_widget.ui | 34 + scribo/demo/shared/ui/image_viewer.ui | 296 +++ scribo/demo/shared/ui/interactive_scene.cc | 143 ++ scribo/demo/shared/ui/interactive_scene.hh | 87 + scribo/demo/shared/ui/rotate_widget.ui | 34 + scribo/demo/src/main.cc | 42 - scribo/demo/src/mainwindow.cc | 570 ----- scribo/demo/src/mainwindow.hh | 138 -- scribo/demo/tip/gui.pro | 19 + scribo/demo/tip/gui.qrc | 9 + scribo/demo/tip/icons/next.png | Bin 0 -> 3337 bytes scribo/demo/tip/icons/ok.png | Bin 0 -> 3953 bytes scribo/demo/tip/icons/photos.png | Bin 0 -> 3750 bytes scribo/demo/tip/icons/prev.png | Bin 0 -> 3334 bytes scribo/demo/tip/icons/remove.png | Bin 0 -> 3704 bytes scribo/demo/tip/src/custom_delegate.cc | 105 + scribo/demo/tip/src/custom_delegate.hh | 81 + scribo/demo/tip/src/launch_dialog.cc | 94 + scribo/demo/tip/src/launch_dialog.hh | 63 + scribo/demo/tip/src/main.cc | 46 + scribo/demo/tip/src/main_window.cc | 526 +++++ scribo/demo/tip/src/main_window.hh | 119 + scribo/demo/tip/ui/launch_dialog.ui | 117 + scribo/demo/tip/ui/main_window.ui | 656 ++++++ scribo/demo/viewer/Makefile.am | 70 + scribo/demo/viewer/README | 33 + scribo/demo/viewer/browser_widget.cc | 78 + scribo/demo/viewer/browser_widget.hh | 42 + scribo/demo/viewer/common.hh | 38 + scribo/demo/viewer/domitem.cc | 98 + scribo/demo/viewer/domitem.hh | 75 + scribo/demo/viewer/dommodel.cc | 198 ++ scribo/demo/viewer/dommodel.hh | 85 + scribo/demo/viewer/help_dialog.cc | 55 + scribo/demo/viewer/help_dialog.hh | 32 + scribo/demo/viewer/image_region.cc | 139 ++ scribo/demo/viewer/image_region.hh | 76 + scribo/demo/viewer/image_region.hxx | 100 + scribo/demo/viewer/image_scene.cc | 90 + scribo/demo/viewer/image_scene.hh | 44 + scribo/demo/viewer/image_view.cc | 78 + scribo/demo/viewer/image_view.hh | 40 + scribo/demo/viewer/image_widget.cc | 48 + scribo/demo/viewer/image_widget.hh | 41 + scribo/demo/viewer/key_widget.cc | 90 + scribo/demo/viewer/key_widget.hh | 45 + scribo/demo/viewer/main.cc | 37 + scribo/demo/viewer/property_widget.cc | 73 + scribo/demo/viewer/property_widget.hh | 41 + scribo/demo/viewer/step_widget.cc | 122 + scribo/demo/viewer/step_widget.hh | 57 + scribo/demo/viewer/viewer.cc | 504 ++++ scribo/demo/viewer/viewer.hh | 88 + scribo/demo/viewer/viewer.hxx | 31 + scribo/demo/viewer/xml_widget.cc | 53 + scribo/demo/viewer/xml_widget.hh | 41 + scribo/demo/wizard/images/dematerialization.png | Bin 0 -> 76309 bytes scribo/demo/wizard/src/crop_page.cc | 48 + scribo/demo/wizard/src/crop_page.hh | 60 + scribo/demo/wizard/src/crop_widget.cc | 37 + scribo/demo/wizard/src/crop_widget.hh | 62 + scribo/demo/wizard/src/doc_type.hh | 51 + scribo/demo/wizard/src/doc_type_page.cc | 48 + scribo/demo/wizard/src/doc_type_page.hh | 61 + scribo/demo/wizard/src/doc_type_widget.cc | 38 + scribo/demo/wizard/src/doc_type_widget.hh | 64 + scribo/demo/wizard/src/load_page.cc | 71 + scribo/demo/wizard/src/load_page.hh | 67 + scribo/demo/wizard/src/load_widget.cc | 56 + scribo/demo/wizard/src/load_widget.hh | 64 + scribo/demo/wizard/src/main.cc | 28 + scribo/demo/wizard/src/main_window.cc | 144 ++ scribo/demo/wizard/src/main_window.hh | 72 + scribo/demo/wizard/src/mln_widgets.cc | 7 + scribo/demo/wizard/src/preprocessing_page.cc | 61 + scribo/demo/wizard/src/preprocessing_page.hh | 66 + scribo/demo/wizard/src/preprocessing_task.hh | 61 + scribo/demo/wizard/src/preprocessing_widget.cc | 93 + scribo/demo/wizard/src/preprocessing_widget.hh | 65 + scribo/demo/wizard/src/process_page.cc | 68 + scribo/demo/wizard/src/process_page.hh | 64 + scribo/demo/wizard/src/process_widget.cc | 80 + scribo/demo/wizard/src/process_widget.hh | 71 + scribo/demo/wizard/src/result_page.cc | 43 + scribo/demo/wizard/src/result_page.hh | 60 + scribo/demo/wizard/src/result_widget.cc | 43 + scribo/demo/wizard/src/result_widget.hh | 58 + scribo/demo/wizard/src/rotate_page.cc | 45 + scribo/demo/wizard/src/rotate_page.hh | 60 + scribo/demo/wizard/src/rotate_widget.cc | 38 + scribo/demo/wizard/src/rotate_widget.hh | 62 + scribo/demo/wizard/src/runner.cc | 296 +++ scribo/demo/wizard/src/runner.hh | 84 + scribo/demo/wizard/src/test.cc | 16 + scribo/demo/wizard/ui/doc_type_widget.ui | 115 + scribo/demo/wizard/ui/load_widget.ui | 110 + scribo/demo/wizard/ui/main_window.ui | 216 ++ scribo/demo/wizard/ui/preprocessing_widget.ui | 223 ++ scribo/demo/wizard/wizard.pro | 71 + scribo/demo/wizard/wizard.qrc | 5 + scribo/draw/bounding_box_links.hh | 417 ---- scribo/draw/bounding_boxes.hh | 109 - scribo/estim/object_groups_v_thickness.hh | 102 - scribo/filter/all.hh | 53 - scribo/filter/common/objects_photo.hh | 98 - scribo/filter/internal/compute.hh | 147 -- scribo/filter/object_groups_size_ratio.hh | 104 - scribo/filter/object_groups_small.hh | 98 - scribo/filter/object_groups_v_thickness.hh | 97 - scribo/filter/object_links_bbox_h_ratio.hh | 99 - scribo/filter/object_links_bbox_overlap.hh | 133 -- scribo/filter/object_links_bbox_ratio.hh | 112 - scribo/filter/object_links_bbox_w_ratio.hh | 97 - scribo/filter/object_links_bottom_aligned.hh | 120 - scribo/filter/object_links_center_aligned.hh | 113 - scribo/filter/object_links_non_aligned.hh | 138 -- scribo/filter/object_links_non_aligned_simple.hh | 186 -- scribo/filter/object_links_non_h_aligned.hh | 109 - scribo/filter/object_links_non_v_aligned.hh | 122 - scribo/filter/object_links_top_aligned.hh | 121 - scribo/filter/objects_h_thick.hh | 196 -- scribo/filter/objects_h_thin.hh | 192 -- scribo/filter/objects_large.hh | 198 -- scribo/filter/objects_size_ratio.hh | 120 - scribo/filter/objects_small.hh | 160 -- scribo/filter/objects_thick.hh | 191 -- scribo/filter/objects_thin.hh | 193 -- scribo/filter/objects_v_thick.hh | 196 -- scribo/filter/objects_v_thin.hh | 193 -- scribo/fun/v2b/objects_small_filter.hh | 129 -- scribo/headers.mk | 340 ++-- scribo/make/all.hh | 49 - scribo/make/text.hh | 180 -- scribo/preprocessing/all.hh | 46 - scribo/preprocessing/split_bg_fg.hh | 340 --- scribo/preprocessing/unskew.hh | 115 - scribo/primitive/extract/all.hh | 67 - scribo/primitive/extract/lines_discontinued.hh | 152 -- scribo/primitive/extract/lines_h_discontinued.hh | 133 -- scribo/primitive/extract/lines_h_pattern.hh | 113 - scribo/primitive/extract/lines_h_single.hh | 203 -- scribo/primitive/extract/lines_h_thick.hh | 129 -- .../primitive/extract/lines_h_thick_and_single.hh | 152 -- scribo/primitive/extract/lines_pattern.hh | 137 -- scribo/primitive/extract/lines_thick.hh | 138 -- scribo/primitive/extract/lines_v_discontinued.hh | 131 -- scribo/primitive/extract/lines_v_pattern.hh | 106 - scribo/primitive/extract/lines_v_single.hh | 199 -- scribo/primitive/extract/lines_v_thick.hh | 129 -- .../primitive/extract/lines_v_thick_and_single.hh | 150 -- scribo/primitive/extract/objects.hh | 138 -- scribo/primitive/group/all.hh | 57 - scribo/primitive/group/apply.hh | 126 - scribo/primitive/group/from_double_link.hh | 129 -- scribo/primitive/group/from_graph.hh | 180 -- scribo/primitive/group/from_single_link.hh | 108 - scribo/primitive/internal/all.hh | 60 - scribo/primitive/internal/find_graph_link.hh | 111 - scribo/primitive/internal/find_left_link.hh | 108 - scribo/primitive/internal/find_right_link.hh | 108 - scribo/primitive/internal/find_root.hh | 71 - scribo/primitive/internal/init_link_array.hh | 71 - scribo/primitive/internal/is_invalid_link.hh | 100 - scribo/primitive/internal/is_link_valid.hh | 79 - scribo/primitive/internal/update_link_array.hh | 105 - scribo/primitive/link/all.hh | 60 - scribo/primitive/link/compute.hh | 115 - scribo/primitive/link/compute_several.hh | 117 - scribo/primitive/link/internal/anchors_3.hh | 147 -- scribo/primitive/link/internal/find_link.hh | 116 - .../primitive/link/internal/find_several_links.hh | 124 - .../link/internal/link_center_dmax_base.hh | 179 -- .../link/internal/link_center_dmax_ratio_base.hh | 175 -- .../primitive/link/internal/link_functor_base.hh | 518 ----- .../primitive/link/internal/link_ms_dmax_base.hh | 165 -- .../link/internal/link_ms_dmax_ratio_base.hh | 168 -- scribo/primitive/link/merge_double_link.hh | 123 - scribo/primitive/link/with_graph.hh | 125 - scribo/primitive/link/with_rag.hh | 99 - scribo/primitive/link/with_several_graphes.hh | 128 -- scribo/primitive/link/with_several_left_links.hh | 166 -- .../link/with_several_right_closest_links.hh | 215 -- scribo/primitive/link/with_several_right_links.hh | 169 -- .../link/with_several_right_links_overlap.hh | 152 -- scribo/primitive/link/with_single_left_link.hh | 159 -- .../link/with_single_left_link_dmax_ratio.hh | 167 -- scribo/primitive/link/with_single_right_link.hh | 158 -- .../link/with_single_right_link_bottom.hh | 161 -- .../link/with_single_right_link_dmax_ratio.hh | 167 -- .../primitive/link/with_single_right_link_top.hh | 161 -- scribo/sandbox/ChangeLog | 9 + scribo/sandbox/green/ChangeLog | 264 +++ scribo/sandbox/green/README | 219 ++ scribo/sandbox/green/README.green | 416 ++++ scribo/sandbox/green/README.img | 124 + scribo/sandbox/green/README.result | 143 ++ .../green/bench/clustering/distance/Makefile.am | 153 ++ .../green/bench/clustering/distance/distance.cc | 842 +++++++ .../green/demo/clustering/kmean1d/Makefile.am | 153 ++ .../green/demo/clustering/kmean1d/kmean1d.cc | 258 +++ .../green/demo/clustering/kmean2d/Makefile.am | 153 ++ .../green/demo/clustering/kmean2d/kmean2d.cc | 278 +++ .../green/demo/clustering/kmean3d/Makefile.am | 153 ++ .../green/demo/clustering/kmean3d/kmean3d.cc | 265 +++ .../green/demo/clustering/kmean_rgb/Makefile.am | 153 ++ .../green/demo/clustering/kmean_rgb/kmean_rgb.cc | 239 ++ .../histo1d => scribo/sandbox/green}/gaussian.sh | 0 .../histo2d => scribo/sandbox/green}/gaussian2d.sh | 0 scribo/sandbox/green/mln/accu/stat/histo1d.hh | 337 +++ scribo/sandbox/green/mln/accu/stat/histo2d.hh | 346 +++ scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh | 388 ++++ scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh | 345 +++ scribo/sandbox/green/mln/clustering/k_mean.hh | 785 +++++++ scribo/sandbox/green/mln/clustering/kmean1d.hh | 1082 +++++++++ scribo/sandbox/green/mln/clustering/kmean2d.hh | 1344 +++++++++++ scribo/sandbox/green/mln/clustering/kmean3d.hh | 1345 +++++++++++ scribo/sandbox/green/mln/clustering/kmean_rgb.hh | 1042 +++++++++ scribo/sandbox/green/mln/display/display_histo.hh | 180 ++ scribo/sandbox/green/mln/display/project_histo.hh | 536 +++++ scribo/sandbox/green/mln/fun/p2b/achromatic.hh | 112 + .../sandbox/green/mln/fun/p2b/component_equals.hh | 99 + scribo/sandbox/green/mln/fun/v2v/achromatism.hh | 64 + .../sandbox/green/mln/fun/v2v/hue_concentration.hh | 100 + .../green/mln/fun/v2v/int_u16_to_int_u14.hh | 0 .../sandbox/green/mln/fun/v2v/log.hh | 0 scribo/sandbox/green/mln/fun/v2v/rg_to_rgb.hh | 119 + scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh | 71 + scribo/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh | 119 + .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 77 + scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 149 ++ scribo/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh | 96 + scribo/sandbox/green/mln/fun/v2v/rgb_to_rg.hh | 109 + .../green/mln/fun/v2v/rgb_to_saturation_map.hh | 83 + .../sandbox/green/mln/fun/v2v/rgb_to_value_map.hh | 75 + scribo/sandbox/green/mln/img_path.hh | 239 ++ scribo/sandbox/green/mln/io/plot/save_image_sh.hh | 1090 +++++++++ scribo/sandbox/green/mln/math/ceil.hh | 64 + scribo/sandbox/green/mln/math/floor.hh | 64 + scribo/sandbox/green/mln/value/hsv.hh | 424 ++++ scribo/sandbox/green/mln/value/rg.hh | 175 ++ scribo/sandbox/green/ok/mln/accu/histo/histo1d.hh | 334 +++ .../sandbox/green/ok/mln/accu/histo}/histo2d.hh | 0 .../sandbox/green/ok/mln/accu/histo/histo3d.hh | 0 scribo/sandbox/green/ok/mln/img_path.hh | 239 ++ .../sandbox/green/ok/test/accu/histo}/gaussian.sh | 0 scribo/sandbox/green/ok/test/accu/histo/histo1d | Bin 0 -> 802920 bytes scribo/sandbox/green/ok/test/accu/histo/histo1d.cc | 726 ++++++ scribo/sandbox/green/test_labelling.cc | 336 +++ scribo/sandbox/green/test_labelling_2.cc | 342 +++ scribo/sandbox/green/test_labelling_3.cc | 463 ++++ .../green/tests/accu/stat/histo1d/Makefile.am | 153 ++ .../green/tests/accu/stat/histo1d/histo1d.cc | 507 +++++ .../green/tests/accu/stat/histo3d_hsl/Makefile.am | 153 ++ .../tests/accu/stat/histo3d_hsl/histo3d_hsl.cc | 391 ++++ .../green/tests/accu/stat/histo3d_rgb/Makefile.am | 153 ++ .../tests/accu/stat/histo3d_rgb/histo3d_rgb.cc | 397 ++++ .../green/tests/clustering/k_mean/Makefile.am | 153 ++ .../green/tests/clustering/k_mean/k_mean.cc | 547 +++++ .../green/tests/clustering/kmean1d/Makefile.am | 0 .../green/tests/clustering/kmean1d/kmean1d.cc | 0 .../green/tests/io/plot/save_image_sh/Makefile.am | 153 ++ .../tests/io/plot/save_image_sh/save_image_sh.cc | 774 +++++++ .../green/use/accu/stat/histo1d/Makefile.am | 153 ++ .../sandbox/green/use/accu/stat/histo1d/histo1d.cc | 49 + .../green/use/accu/stat/histo2d/Makefile.am | 153 ++ .../sandbox/green/use/accu/stat/histo2d/histo2d.cc | 58 + .../green/use/accu/stat/histo3d_hsl/Makefile.am | 153 ++ .../green/use/accu/stat/histo3d_hsl/histo3d_hsl.cc | 59 + .../green/use/accu/stat/histo3d_rgb/Makefile.am | 153 ++ .../green/use/accu/stat/histo3d_rgb/histo3d_rgb.cc | 57 + .../green/use/clustering/k_mean/Makefile.am | 153 ++ .../sandbox/green/use/clustering/k_mean/k_mean.cc | 55 + .../green/use/clustering/kmean1d/Makefile.am | 153 ++ .../green/use/clustering/kmean1d/kmean1d.cc | 50 + .../green/use/clustering/kmean2d/Makefile.am | 153 ++ .../green/use/clustering/kmean2d/kmean2d.cc | 61 + .../green/use/clustering/kmean3d/Makefile.am | 153 ++ .../green/use/clustering/kmean3d/kmean3d.cc | 63 + .../green/use/clustering/kmean_rgb/Makefile.am | 153 ++ .../green/use/clustering/kmean_rgb/kmean_rgb.cc | 63 + .../green/use/fun/v2v/rg_to_rgb/Makefile.am | 153 ++ .../green/use/fun/v2v/rg_to_rgb/rg_to_rgb.cc | 68 + .../green/use/fun/v2v/rgb8_to_rgbn/Makefile.am | 153 ++ .../green/use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc | 57 + .../green/use/fun/v2v/rgb_to_rg/Makefile.am | 153 ++ .../green/use/fun/v2v/rgb_to_rg/rgb_to_rg.cc | 58 + .../green/use/io/plot/save_image_sh/Makefile.am | 153 ++ .../use/io/plot/save_image_sh/save_image_sh.cc | 53 + scribo/sandbox/green/use/value/rg/Makefile.am | 153 ++ scribo/sandbox/green/use/value/rg/rg.cc | 58 + scribo/sandbox/z/white_spaces/hom_sep.cc | 133 ++ .../sandbox/z/white_spaces/white_space_closing.cc | 123 + scribo/sandbox/z/white_spaces/white_spaces.cc | 842 +++++++ scribo/scribo.mk | 9 +- scribo/scribo/all.hh | 53 + scribo/scribo/binarization/all.hh | 55 + scribo/scribo/binarization/global_threshold.hh | 90 + .../scribo/binarization/global_threshold_auto.hh | 168 ++ .../binarization/internal/first_pass_functor.hh | 173 ++ scribo/scribo/binarization/local_threshold.hh | 218 ++ scribo/scribo/binarization/sauvola.hh | 234 ++ scribo/scribo/binarization/sauvola_ms.hh | 988 ++++++++ scribo/scribo/binarization/sauvola_ms_split.hh | 168 ++ .../scribo/binarization/sauvola_threshold_image.hh | 616 +++++ .../binarization/sauvola_threshold_image_debug.hh | 421 ++++ scribo/scribo/canvas/integral_browsing.hh | 422 ++++ scribo/scribo/convert/from_qimage.hh | 93 + scribo/scribo/core/all.hh | 49 + scribo/{ => scribo}/core/central_sites.hh | 0 scribo/scribo/core/component_info.hh | 203 ++ scribo/scribo/core/component_set.hh | 610 +++++ scribo/scribo/core/concept/dmax_functor.hh | 50 + scribo/{ => scribo}/core/concept/link_functor.hh | 0 scribo/scribo/core/def/lbl_type.hh | 48 + scribo/scribo/core/erase_objects.hh | 86 + scribo/scribo/core/init_integral_image.hh | 96 + scribo/scribo/core/line_info.hh | 959 ++++++++ scribo/scribo/core/line_set.hh | 421 ++++ scribo/scribo/core/macros.hh | 64 + scribo/scribo/core/object_groups.hh | 262 +++ scribo/scribo/core/object_links.hh | 258 +++ scribo/scribo/core/tag/anchor.hh | 68 + scribo/scribo/core/tag/component.hh | 121 + scribo/scribo/core/tag/line.hh | 216 ++ scribo/scribo/debug/alignment_decision_image.hh | 185 ++ scribo/{ => scribo}/debug/all.hh | 0 scribo/scribo/debug/bboxes_enlarged_image.hh | 136 ++ scribo/scribo/debug/char_space_image.hh | 113 + scribo/scribo/debug/decision_image.hh | 183 ++ scribo/scribo/debug/highlight_text_area.hh | 305 +++ scribo/scribo/debug/line_info_image.hh | 123 + scribo/scribo/debug/links_decision_image.hh | 111 + .../scribo/debug/looks_like_a_text_line_image.hh | 130 ++ scribo/scribo/debug/mean_and_base_lines_image.hh | 149 ++ scribo/scribo/debug/save_bboxes_image.hh | 174 ++ scribo/scribo/debug/save_comp_diff.hh | 105 + scribo/{ => scribo}/debug/save_label_image.hh | 0 scribo/scribo/debug/save_linked_bboxes_image.hh | 277 +++ scribo/{ => scribo}/debug/save_table_image.hh | 0 .../scribo/debug/several_links_decision_image.hh | 179 ++ scribo/scribo/debug/text_areas_image.hh | 133 ++ scribo/scribo/debug/usage.hh | 84 + scribo/{ => scribo}/draw/all.hh | 0 scribo/scribo/draw/bounding_box_links.hh | 340 +++ scribo/scribo/draw/bounding_boxes.hh | 117 + scribo/scribo/draw/groups_bboxes.hh | 93 + scribo/scribo/estim/object_groups_v_thickness.hh | 106 + scribo/scribo/filter/all.hh | 50 + scribo/scribo/filter/common/objects_photo.hh | 98 + scribo/scribo/filter/internal/alignment_angle.hh | 156 ++ scribo/scribo/filter/internal/component_aligned.hh | 114 + scribo/scribo/filter/internal/compute.hh | 147 ++ scribo/scribo/filter/object_groups_size_ratio.hh | 105 + scribo/scribo/filter/object_groups_small.hh | 100 + scribo/scribo/filter/object_groups_v_thickness.hh | 99 + scribo/scribo/filter/object_groups_with_holes.hh | 340 +++ scribo/scribo/filter/object_links_bbox_h_ratio.hh | 95 + scribo/scribo/filter/object_links_bbox_overlap.hh | 128 ++ scribo/scribo/filter/object_links_bbox_ratio.hh | 112 + scribo/scribo/filter/object_links_bbox_w_ratio.hh | 95 + .../scribo/filter/object_links_bottom_aligned.hh | 115 + .../scribo/filter/object_links_center_aligned.hh | 109 + scribo/scribo/filter/object_links_left_aligned.hh | 118 + .../filter/object_links_non_aligned_simple.hh | 132 ++ scribo/scribo/filter/object_links_right_aligned.hh | 118 + scribo/scribo/filter/object_links_top_aligned.hh | 114 + scribo/scribo/filter/objects_h_thick.hh | 192 ++ scribo/scribo/filter/objects_h_thin.hh | 196 ++ scribo/scribo/filter/objects_large.hh | 106 + scribo/scribo/filter/objects_size_ratio.hh | 125 + scribo/scribo/filter/objects_small.hh | 150 ++ scribo/scribo/filter/objects_thick.hh | 191 ++ scribo/scribo/filter/objects_thin.hh | 191 ++ scribo/scribo/filter/objects_v_thick.hh | 192 ++ scribo/scribo/filter/objects_v_thin.hh | 196 ++ scribo/scribo/filter/objects_with_holes.hh | 465 ++++ scribo/scribo/fun/v2b/label_to_bool.hh | 66 + scribo/scribo/fun/v2b/objects_large_filter.hh | 128 ++ scribo/scribo/fun/v2b/objects_small_filter.hh | 128 ++ scribo/scribo/io/text_boxes/save.hh | 102 + scribo/scribo/io/xml/save.hh | 253 ++ scribo/scribo/make/all.hh | 49 + scribo/{ => scribo}/make/debug_filename.hh | 0 scribo/{ => scribo}/make/influence_zone_graph.hh | 0 scribo/scribo/postprocessing/all.hh | 48 + scribo/scribo/postprocessing/fill_object_holes.hh | 408 ++++ scribo/scribo/preprocessing/all.hh | 63 + scribo/scribo/preprocessing/crop.hh | 84 + .../preprocessing/crop_without_localization.hh | 99 + scribo/scribo/preprocessing/denoise.hh | 106 + scribo/scribo/preprocessing/denoise_bg.hh | 159 ++ scribo/scribo/preprocessing/denoise_fg.hh | 118 + scribo/scribo/preprocessing/deskew.hh | 439 ++++ scribo/scribo/preprocessing/deskew_crop.hh | 187 ++ .../scribo/preprocessing/homogeneous_contrast.hh | 119 + scribo/scribo/preprocessing/rotate_90.hh | 163 ++ scribo/scribo/preprocessing/split_bg_fg.hh | 341 +++ scribo/{ => scribo}/primitive/all.hh | 0 scribo/scribo/primitive/extract/all.hh | 68 + scribo/{ => scribo}/primitive/extract/canvas.hh | 0 scribo/{ => scribo}/primitive/extract/cells.hh | 0 scribo/scribo/primitive/extract/components.hh | 147 ++ .../primitive/extract/horizontal_separators.hh | 95 + .../scribo/primitive/extract/lines_discontinued.hh | 152 ++ .../primitive/extract/lines_h_discontinued.hh | 133 ++ scribo/scribo/primitive/extract/lines_h_pattern.hh | 126 + scribo/scribo/primitive/extract/lines_h_single.hh | 202 ++ scribo/scribo/primitive/extract/lines_h_thick.hh | 129 ++ .../primitive/extract/lines_h_thick_and_single.hh | 151 ++ scribo/scribo/primitive/extract/lines_pattern.hh | 298 +++ scribo/scribo/primitive/extract/lines_thick.hh | 137 ++ .../primitive/extract/lines_v_discontinued.hh | 131 ++ scribo/scribo/primitive/extract/lines_v_pattern.hh | 109 + scribo/scribo/primitive/extract/lines_v_single.hh | 198 ++ scribo/scribo/primitive/extract/lines_v_thick.hh | 129 ++ .../primitive/extract/lines_v_thick_and_single.hh | 150 ++ scribo/scribo/primitive/extract/separators.hh | 98 + .../primitive/extract/vertical_separators.hh | 95 + scribo/scribo/primitive/group/all.hh | 58 + scribo/scribo/primitive/group/apply.hh | 138 ++ scribo/scribo/primitive/group/from_double_link.hh | 125 + scribo/scribo/primitive/group/from_graph.hh | 180 ++ scribo/scribo/primitive/group/from_single_link.hh | 111 + scribo/scribo/primitive/internal/all.hh | 57 + .../scribo/primitive/internal/find_graph_link.hh | 115 + scribo/scribo/primitive/internal/find_root.hh | 74 + .../primitive/internal/have_link_valid.hh | 0 scribo/scribo/primitive/internal/is_link_valid.hh | 81 + scribo/scribo/primitive/internal/rd.hh | 192 ++ .../primitive/internal/update_graph_link.hh | 0 scribo/scribo/primitive/link/all.hh | 61 + scribo/scribo/primitive/link/compute.hh | 133 ++ scribo/scribo/primitive/link/compute_several.hh | 117 + .../primitive/link/internal/compute_anchor.hh | 252 ++ .../scribo/primitive/link/internal/dmax_default.hh | 83 + .../primitive/link/internal/dmax_functor_base.hh | 102 + .../link/internal/dmax_width_and_height.hh | 98 + .../primitive/link/internal/dmax_width_only.hh | 95 + scribo/scribo/primitive/link/internal/find_link.hh | 114 + .../primitive/link/internal/find_several_links.hh | 137 ++ .../primitive/link/internal/link_functor_base.hh | 516 +++++ .../link/internal/link_several_dmax_base.hh | 291 +++ .../link/internal/link_single_dmax_base.hh | 153 ++ .../link/internal/link_single_dmax_ratio_base.hh | 189 ++ scribo/scribo/primitive/link/merge_double_link.hh | 126 + scribo/scribo/primitive/link/with_graph.hh | 121 + scribo/scribo/primitive/link/with_rag.hh | 103 + .../scribo/primitive/link/with_several_graphes.hh | 127 + .../primitive/link/with_several_left_links.hh | 141 ++ .../link/with_several_right_closest_links.hh | 207 ++ .../primitive/link/with_several_right_links.hh | 143 ++ .../link/with_several_right_links_overlap.hh | 154 ++ .../scribo/primitive/link/with_single_down_link.hh | 181 ++ .../scribo/primitive/link/with_single_left_link.hh | 160 ++ .../link/with_single_left_link_dmax_ratio.hh | 221 ++ .../primitive/link/with_single_right_link.hh | 159 ++ .../link/with_single_right_link_bottom.hh | 162 ++ .../link/with_single_right_link_dmax_ratio.hh | 215 ++ .../primitive/link/with_single_right_link_top.hh | 163 ++ .../scribo/primitive/link/with_single_up_link.hh | 181 ++ .../primitive/regroup/from_single_left_link.hh | 144 ++ .../regroup/from_single_left_link_wrt_h_ratio.hh | 153 ++ scribo/scribo/primitive/remove/separators.hh | 114 + scribo/scribo/subsampling/bilinear.hh | 119 + scribo/scribo/subsampling/integral.hh | 420 ++++ scribo/scribo/subsampling/integral_single_image.hh | 460 ++++ scribo/scribo/table/align_lines_horizontaly.hh | 106 + scribo/{ => scribo}/table/align_lines_verticaly.hh | 0 scribo/{ => scribo}/table/all.hh | 0 .../{ => scribo}/table/connect_horizontal_lines.hh | 0 .../{ => scribo}/table/connect_vertical_lines.hh | 0 scribo/scribo/table/erase.hh | 99 + scribo/scribo/table/extract.hh | 118 + scribo/scribo/table/internal/align_lines.hh | 199 ++ scribo/{ => scribo}/table/internal/all.hh | 0 scribo/scribo/table/internal/connect_lines.hh | 125 + scribo/scribo/table/internal/repair_lines.hh | 197 ++ scribo/scribo/table/rebuild.hh | 158 ++ .../{ => scribo}/table/repair_horizontal_lines.hh | 0 scribo/{ => scribo}/table/repair_vertical_lines.hh | 0 scribo/{ => scribo}/text/all.hh | 0 scribo/scribo/text/clean.hh | 127 + scribo/scribo/text/clean_inplace.hh | 147 ++ scribo/scribo/text/extract_lines.hh | 137 ++ scribo/scribo/text/look_like_text_lines.hh | 116 + scribo/scribo/text/merging.hh | 922 ++++++++ scribo/scribo/text/recognition.hh | 269 +++ scribo/scribo/toolchain/nepomuk/text_extraction.hh | 163 ++ scribo/scribo/toolchain/text_in_doc.hh | 294 +++ scribo/scribo/upsampling/bs2x.hh | 147 ++ scribo/scribo/upsampling/eagle.hh | 149 ++ scribo/src/Makefile.am | 88 +- scribo/src/README | 39 + scribo/src/afp/components.hh | 228 ++ scribo/src/afp/link.hh | 178 ++ scribo/src/afp/regroup.hh | 119 + scribo/src/binarization/Makefile.am | 80 +- scribo/src/binarization/fg_sauvola_ms.cc | 108 + .../src/binarization/pgm_global_threshold_auto.cc | 63 + scribo/src/binarization/pgm_sauvola.cc | 80 + scribo/src/binarization/pgm_sauvola_ms.cc | 111 + scribo/src/binarization/ppm_fg_sauvola_ms.cc | 128 ++ scribo/src/binarization/ppm_sauvola.cc | 79 + scribo/src/binarization/ppm_sauvola_ms.cc | 117 + scribo/src/binarization/ppm_sauvola_ms_split.cc | 125 + scribo/src/binarization/sauvola.cc | 43 +- scribo/src/binarization/sauvola_debug.cc | 116 + scribo/src/binarization/sauvola_ms.cc | 398 +--- scribo/src/binarization/sauvola_ms_debug.cc | 147 ++ scribo/src/binarization/sauvola_ms_split.cc | 123 + scribo/src/binarization/sauvola_pgm.cc | 63 - scribo/src/binarization/simple.cc | 61 - scribo/src/contest/Makefile.am | 23 + scribo/src/contest/hdibco-2010/Makefile.am | 25 + .../src/contest/hdibco-2010/sauvola_ms_hdibco.cc | 85 + scribo/src/debug/Makefile.am | 39 +- scribo/src/debug/highlight_text_area.cc | 97 + .../src/debug/show_info_median_inter_characters.cc | 84 + scribo/src/debug/show_info_x_height.cc | 79 + .../src/debug/show_left_right_links_validation.cc | 122 - scribo/src/debug/show_links_bbox_h_ratio.cc | 24 +- scribo/src/debug/show_links_bbox_overlap.cc | 19 +- scribo/src/debug/show_links_bottom_aligned.cc | 30 +- scribo/src/debug/show_links_center_aligned.cc | 19 +- .../show_links_left_right_links_validation.cc | 119 + scribo/src/debug/show_links_non_h_aligned.cc | 25 +- scribo/src/debug/show_links_several_right.cc | 27 +- .../src/debug/show_links_several_right_overlap.cc | 79 +- scribo/src/debug/show_links_single_down.cc | 158 ++ .../debug/show_links_single_down_left_aligned.cc | 101 + .../debug/show_links_single_down_right_aligned.cc | 102 + scribo/src/debug/show_links_single_left.cc | 40 +- .../src/debug/show_links_single_left_dmax_ratio.cc | 48 +- scribo/src/debug/show_links_single_right.cc | 41 +- .../debug/show_links_single_right_dmax_ratio.cc | 40 +- scribo/src/debug/show_links_single_up.cc | 160 ++ .../src/debug/show_links_single_up_left_aligned.cc | 103 + .../debug/show_links_single_up_right_aligned.cc | 101 + scribo/src/debug/show_links_top_aligned.cc | 34 +- scribo/src/debug/show_objects_large.cc | 27 +- scribo/src/debug/show_objects_large_small.cc | 41 +- scribo/src/debug/show_objects_small.cc | 27 +- scribo/src/debug/show_objects_thick.cc | 26 +- scribo/src/debug/show_objects_thin.cc | 24 +- scribo/src/filter/Makefile.am | 6 +- scribo/src/filter/objects_large.cc | 30 +- scribo/src/filter/objects_small.cc | 22 +- scribo/src/filter/objects_thick.cc | 30 +- scribo/src/filter/objects_thin.cc | 30 +- scribo/src/filter/objects_with_holes.cc | 75 + scribo/src/filter/objects_with_holes_pgm.cc | 76 + scribo/src/misc/negate.cc | 5 +- scribo/src/misc/superpose.cc | 7 +- scribo/src/multi_scale/Makefile.am | 22 - scribo/src/multi_scale/find_lines.cc | 180 -- scribo/src/pbm_text_in_doc.cc | 130 ++ scribo/src/postprocessing/Makefile.am | 26 + scribo/src/postprocessing/fill_object_holes.cc | 67 + scribo/src/preprocessing/Makefile.am | 60 +- scribo/src/preprocessing/denoise_bg.cc | 67 + scribo/src/preprocessing/denoise_fg.cc | 66 + scribo/src/preprocessing/homogeneous_contrast.cc | 44 + scribo/src/preprocessing/preprocess.cc | 27 +- scribo/src/preprocessing/rotate.cc | 68 + scribo/src/preprocessing/rotate_90.cc | 77 + scribo/src/preprocessing/split_bg_fg.cc | 19 +- scribo/src/preprocessing/subsample.cc | 67 + scribo/src/preprocessing/to_pgm.cc | 46 + scribo/src/preprocessing/unskew.cc | 22 +- .../extract/extract_discontinued_hlines.cc | 26 +- .../extract/extract_discontinued_lines.cc | 47 +- .../extract/extract_discontinued_vlines.cc | 27 +- .../src/primitive/extract/extract_thick_hlines.cc | 25 +- .../src/primitive/extract/extract_thick_vlines.cc | 25 +- scribo/src/primitive/extract/lines_pattern.cc | 6 +- .../src/primitive/find/find_discontinued_lines.cc | 18 +- scribo/src/primitive/find/find_pattern_lines.cc | 10 +- scribo/src/primitive/find/find_single_lines.cc | 35 +- .../primitive/find/find_thick_and_single_lines.cc | 29 +- scribo/src/primitive/find/find_thick_lines.cc | 20 +- scribo/src/primitive/group/Makefile.am | 15 +- .../src/primitive/group/group_from_double_link.cc | 62 +- .../group/group_from_double_several_links.cc | 34 +- .../group/group_from_several_left_links.cc | 32 +- .../src/primitive/group/group_from_single_link.cc | 62 +- scribo/src/table/erase.cc | 15 +- scribo/src/table/extract.cc | 7 +- scribo/src/text/Makefile.am | 28 +- scribo/src/text/cleantxt.cc | 45 +- scribo/src/text/pbm_lines_recognition.cc | 107 + scribo/src/text/pbm_recognition.cc | 75 + scribo/src/text/recognition.cc | 101 - scribo/src/text_in_doc.cc | 304 --- scribo/src/text_in_doc_ppm.cc | 322 --- scribo/src/text_in_doc_preprocess.cc | 103 + scribo/src/text_in_photo.cc | 250 -- scribo/src/text_in_photo_invert.cc | 245 -- scribo/src/text_in_photo_ppm.cc | 318 --- scribo/src/text_in_picture.cc | 631 +++++ scribo/src/text_recognition_in_picture.cc | 378 +++ scribo/table/align_lines_horizontaly.hh | 101 - scribo/table/erase.hh | 99 - scribo/table/extract.hh | 117 - scribo/table/internal/align_lines.hh | 196 -- scribo/table/internal/connect_lines.hh | 125 - scribo/table/internal/repair_lines.hh | 197 -- scribo/table/rebuild.hh | 157 -- scribo/tests/Makefile.am | 8 +- scribo/tests/binarization/Makefile.am | 30 + scribo/tests/binarization/global_threshold.cc | 24 + scribo/tests/binarization/local_threshold.cc | 29 + scribo/tests/core/Makefile.am | 25 + scribo/tests/filter/Makefile.am | 3 + scribo/tests/filter/objects_with_holes.cc | 62 + scribo/tests/filter/small_and_large_bboxes.cc | 67 +- scribo/tests/img/text_to_group.pgm | Bin 0 -> 3053 bytes scribo/tests/img/wildly.pbm | Bin 0 -> 2208 bytes scribo/tests/preprocessing/Makefile.am | 10 +- scribo/tests/preprocessing/crop.cc | 52 + .../preprocessing/crop_without_localization.cc | 56 + scribo/tests/preprocessing/deskew.cc | 52 + scribo/tests/preprocessing/rotate_90.cc | 59 + scribo/tests/preprocessing/unskew.cc | 44 - scribo/tests/table/extract_lines_with_rank.cc | 5 +- scribo/tests/table/repair_lines.cc | 5 +- scribo/tests/tests.mk | 23 +- scribo/tests/toolchain/Makefile.am | 20 + scribo/tests/toolchain/nepomuk/Makefile.am | 45 + scribo/tests/toolchain/nepomuk/text_extraction.cc | 44 + scribo/tests/unit_test/Makefile.am | 27 +- scribo/tests/unit_test/build_unit_test.sh | 85 - scribo/tests/unit_test/cond_tests_qt | 1 + .../tests/unit_test/cond_tests_qt_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_tesseract_tiff | 2 + scribo/tests/unit_test/disabled_tests | 3 +- scribo/tests/unit_test/unit-tests.mk | 250 ++- scribo/text/clean.hh | 156 -- scribo/text/extract_lines.hh | 152 -- scribo/text/recognition.hh | 193 -- scribo/util/all.hh | 46 - scribo/util/text.hh | 278 --- swilena/ChangeLog | 7 + swilena/python/Makefile.am | 11 +- 1197 files changed, 109979 insertions(+), 22666 deletions(-) create mode 100644 build-aux/autotroll.mk create mode 100644 m4/autotroll.m4 create mode 100644 m4/boost.m4 create mode 100644 m4/pkg.m4 delete mode 100644 milena/img/BUG_lean_ascii.pgm.gz create mode 100644 milena/img/picasso.ppm create mode 100644 milena/mln/convert/to_qimage.hh create mode 100644 milena/mln/convert/to_qimage_nocopy.hh create mode 100644 milena/mln/data/split.hh create mode 100644 milena/mln/debug/mosaic.hh create mode 100644 milena/mln/debug/z_order.hh create mode 100644 milena/mln/draw/box_plain.hh create mode 100644 milena/mln/draw/dashed_line.hh create mode 100644 milena/mln/fun/n2v/all.hh create mode 100644 milena/mln/fun/n2v/white_gaussian.hh create mode 100644 milena/mln/fun/v2v/qt_rgb_to_int_u.hh create mode 100644 milena/mln/fun/v2v/rgb_to_int_u.hh create mode 100644 milena/mln/geom/horizontal_symmetry.hh create mode 100644 milena/mln/geom/nslices.hh delete mode 100644 milena/mln/geom/nslis.hh create mode 100644 milena/mln/geom/vertical_symmetry.hh create mode 100644 milena/mln/histo/equalize.hh create mode 100644 milena/mln/io/dicom/get_header.hh create mode 100644 milena/mln/io/dump/get_header.hh create mode 100644 milena/mln/io/raw/all.hh create mode 100644 milena/mln/io/raw/get_header.hh create mode 100644 milena/mln/io/raw/load.hh create mode 100644 milena/mln/io/raw/save.hh create mode 100644 milena/mln/labeling/value_and_compute.hh create mode 100644 milena/mln/subsampling/antialiased.hh create mode 100644 milena/mln/value/internal/make_generic_name.hh create mode 100644 milena/mln/value/next.hh create mode 100644 milena/mln/value/qt/rgb32.hh create mode 100644 milena/mln/win/sline3d.hh create mode 100644 milena/sandbox/bench/README_CFLAGS create mode 100644 milena/sandbox/bench/extract_vertical_lines.cc create mode 100644 milena/sandbox/bench/fast_components_and_attributes.cc create mode 100644 milena/sandbox/bench/fast_rows.cc create mode 100644 milena/sandbox/bench/fast_tiles.cc create mode 100644 milena/sandbox/bench/fastest.cc create mode 100644 milena/sandbox/bin/labeling/colorize.cc create mode 100644 milena/sandbox/bin/pgm_to_pbm.cc create mode 100644 milena/sandbox/bin/ppm_negate.cc create mode 100644 milena/sandbox/green/bench/transform/distance/Makefile.am create mode 100644 milena/sandbox/green/bench/transform/distance/distance.cc create mode 100644 milena/sandbox/green/demo/annotating/bic/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/bic/bic.cc create mode 100644 milena/sandbox/green/demo/annotating/hsv/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/hsv/hsv.cc create mode 100644 milena/sandbox/green/demo/annotating/lep/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/lep/lep.cc create mode 100644 milena/sandbox/green/demo/annotating/nb_color/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/nb_color/nb_color.cc create mode 100644 milena/sandbox/green/demo/annotating/project/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/project/project.cc create mode 100644 milena/sandbox/green/demo/annotating/rgb_64/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/rgb_64/rgb_64.cc create mode 100644 milena/sandbox/green/demo/annotating/rgb_64_9/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/rgb_64_9/rgb_64_9.cc create mode 100644 milena/sandbox/green/demo/annotating/stddev_color/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/stddev_color/stddev_color.cc create mode 100644 milena/sandbox/green/demo/annotating/stddev_color_16/Makefile.am create mode 100644 milena/sandbox/green/demo/annotating/stddev_color_16/stddev_color_16.cc copy milena/sandbox/green/demo/{accu/stat/histo2d => clustering/kmean_rgb}/Makefile.am (100%) create mode 100644 milena/sandbox/green/demo/clustering/kmean_rgb/kmean_rgb.cc create mode 100644 milena/sandbox/green/demo/labeling/regional_maxima/thresholds.txt create mode 100644 milena/sandbox/green/doc/annotating/class.txt create mode 100644 milena/sandbox/green/doc/annotating/syntheseMillet2008.txt create mode 100644 milena/sandbox/green/doc/annotating/testMillet2008 create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h0_input.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h2_mean.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h2_merge.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h3_mean.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h3_merge.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h4_mean.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h4_merge.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h5_mean.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/h5_merge.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i2_mean.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i2_merge.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i3_mean.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i3_merge.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i4_mean.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i4_merge.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i5_mean.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/i5_merge.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l2_input.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l3_input.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l4_input.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/l5_input.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/reponse_theo.eml create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s2_histo.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s3_histo.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s4_histo.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/s5_histo.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_method/synthese.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h0_input.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q2.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q3.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q6.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q7.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_mean_q8.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q2.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q3.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q6.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q7.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/h5_merge_q8.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q2.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q3.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q6.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q7.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_mean_q8.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q2.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q3.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q6.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q7.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/i5_merge_q8.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q2.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q3.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q6.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q7.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/l5_input_q8.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q2.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q3.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q4.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q5.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q6.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q7.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/s5_histo_q8.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/cmp_quant/synthese.txt create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_all_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_all_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thick_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thick_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thin_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/colormap_thin_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_all_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_all_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thick_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thick_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thin_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/histo_thin_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_all_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_all_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thick_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thick_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thin_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/iz_thin_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_all_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_all_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thick_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thick_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thin_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/labeled_thin_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_all_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_all_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thick_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thick_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thin_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean3_thin_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_all_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_all_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thick_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thick_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thin_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mean4_thin_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c.ppm.gz create mode 100755 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c.sh.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c_thick.pbm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/mp00411c_thin.pbm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_all_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_all_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thick_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thick_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thin_q4.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/opened_thin_q5.dump.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_all_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_all_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thick_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thick_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thin_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj1_thin_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_all_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_all_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thick_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thick_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thin_q4.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj2_thin_q5.pgm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_all_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_all_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thick_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thick_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thin_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj3_thin_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_all_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_all_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thick_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thick_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thin_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/proj4_thin_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/quant_q4.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/quant_q5.ppm.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_all_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_all_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thick_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thick_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thin_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats3_thin_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_all_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_all_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thick_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thick_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thin_q4.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/stats4_thin_q5.txt.gz create mode 100644 milena/sandbox/green/doc/regional_maxima/mp00411c/synthese.txt.gz create mode 100644 milena/sandbox/green/exp/annotating/achromastism/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/achromastism/achromastism.cc create mode 100644 milena/sandbox/green/exp/annotating/achromastism/text-color.txt create mode 100644 milena/sandbox/green/exp/annotating/achromastism/text-img.txt create mode 100644 milena/sandbox/green/exp/annotating/achromastism/text-only.txt create mode 100644 milena/sandbox/green/exp/annotating/bench/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/bench/bench.cc create mode 100644 milena/sandbox/green/exp/annotating/error/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/error/error.cc create mode 100644 milena/sandbox/green/exp/annotating/histo/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/histo/histo.cc create mode 100644 milena/sandbox/green/exp/annotating/hsv/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/hsv/hsv.cc create mode 100644 milena/sandbox/green/exp/annotating/hue/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/hue/hue.cc create mode 100644 milena/sandbox/green/exp/annotating/hue/text-color.txt create mode 100644 milena/sandbox/green/exp/annotating/hue/text-img.txt create mode 100644 milena/sandbox/green/exp/annotating/hue/text-only.txt create mode 100644 milena/sandbox/green/exp/annotating/nb_color/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/nb_color/nb_color.cc create mode 100644 milena/sandbox/green/exp/annotating/saturation/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/saturation/saturation.cc create mode 100644 milena/sandbox/green/exp/annotating/saturation/text-color.txt create mode 100644 milena/sandbox/green/exp/annotating/saturation/text-img.txt create mode 100644 milena/sandbox/green/exp/annotating/saturation/text-only.txt create mode 100644 milena/sandbox/green/exp/annotating/stddev_color/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/stddev_color/stddev_color.cc create mode 100644 milena/sandbox/green/exp/annotating/stddev_color_16/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/stddev_color_16/stddev_color_16.cc create mode 100644 milena/sandbox/green/exp/annotating/value/Makefile.am create mode 100644 milena/sandbox/green/exp/annotating/value/text-color.txt create mode 100644 milena/sandbox/green/exp/annotating/value/text-img.txt create mode 100644 milena/sandbox/green/exp/annotating/value/text-only.txt create mode 100644 milena/sandbox/green/exp/annotating/value/value.cc create mode 100644 milena/sandbox/green/exp/labeling/regional_maxima/Makefile.am create mode 100644 milena/sandbox/green/exp/labeling/regional_maxima/regional_maxima.cc create mode 100644 milena/sandbox/green/mln/clustering/kmean_rgb.hh create mode 100644 milena/sandbox/green/mln/fun/p2b/achromatic.hh create mode 100644 milena/sandbox/green/mln/fun/p2b/component_equals.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/achromatism.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/hue_concentration.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_saturation_map.hh create mode 100644 milena/sandbox/green/mln/fun/v2v/rgb_to_value_map.hh create mode 100644 milena/sandbox/green/mln/math/ceil.hh create mode 100644 milena/sandbox/green/mln/math/floor.hh create mode 100644 milena/sandbox/green/mln/value/hsv.hh create mode 100644 milena/sandbox/green/tools/annotating/histo/Makefile.am create mode 100644 milena/sandbox/green/tools/annotating/histo/histo.cc create mode 100644 milena/sandbox/green/tools/annotating/iz/Makefile.am create mode 100644 milena/sandbox/green/tools/annotating/iz/iz.cc create mode 100644 milena/sandbox/green/tools/annotating/opening/Makefile.am create mode 100644 milena/sandbox/green/tools/annotating/opening/opening.cc create mode 100644 milena/sandbox/green/tools/annotating/regmax/Makefile.am create mode 100644 milena/sandbox/green/tools/annotating/regmax/regmax.cc create mode 100644 milena/sandbox/lazzara/scribo/binarization_naive/main.cc create mode 100644 milena/sandbox/lazzara/scribo/binarization_naive/toto.cc create mode 100644 milena/sandbox/lazzara/scribo/fill_holes/main.cc create mode 100644 milena/sandbox/lazzara/scribo/separateurs_materialises/lines_pattern.cc create mode 100644 milena/sandbox/lazzara/scribo/skeleton_crest/main.cc create mode 100644 milena/tests/convert/to_qimage.cc create mode 100644 milena/tests/convert/to_qimage_nocopy.cc create mode 100644 milena/tests/core/site_set/box.cc create mode 100644 milena/tests/data/paste_without_localization.cc create mode 100644 milena/tests/data/split.cc create mode 100644 milena/tests/fun/v2v/qt_rgb_to_int_u.cc create mode 100644 milena/tests/geom/horizontal_symmetry.cc create mode 100644 milena/tests/geom/nslices.cc delete mode 100644 milena/tests/geom/nslis.cc create mode 100644 milena/tests/geom/vertical_symmetry.cc create mode 100644 milena/tests/subsampling/antialiased.cc create mode 100644 milena/tests/unit_test/cond_tests_boost-tuple create mode 100644 milena/tests/unit_test/cond_tests_cfitsio create mode 100644 milena/tests/unit_test/cond_tests_gdcm create mode 100644 milena/tests/unit_test/cond_tests_magickxx create mode 100644 milena/tests/unit_test/cond_tests_qt create mode 100644 milena/tests/unit_test/cond_tests_tiff create mode 100644 milena/tests/value/builtin/floatings.cc create mode 100644 scribo/README delete mode 100644 scribo/all.hh delete mode 100644 scribo/binarization/binarize.hh delete mode 100644 scribo/binarization/sauvola.hh delete mode 100644 scribo/binarization/sauvola_threshold.hh delete mode 100644 scribo/binarization/simple.hh delete mode 100644 scribo/core/all.hh delete mode 100644 scribo/core/erase_objects.hh delete mode 100644 scribo/core/internal/link_functor_base.hh delete mode 100644 scribo/core/macros.hh delete mode 100644 scribo/core/object_groups.hh delete mode 100644 scribo/core/object_image.hh delete mode 100644 scribo/core/object_links.hh delete mode 100644 scribo/debug/alignment_decision_image.hh delete mode 100644 scribo/debug/decision_image.hh delete mode 100644 scribo/debug/links_decision_image.hh delete mode 100644 scribo/debug/save_bboxes_image.hh delete mode 100644 scribo/debug/save_linked_bboxes_image.hh delete mode 100644 scribo/debug/save_object_diff.hh delete mode 100644 scribo/debug/several_links_decision_image.hh delete mode 100644 scribo/debug/usage.hh create mode 100644 scribo/demo/demat/demat.pro create mode 100644 scribo/demo/demat/demat.qrc create mode 100644 scribo/demo/demat/src/doc_type.hh create mode 100644 scribo/demo/demat/src/main.cc create mode 100644 scribo/demo/demat/src/main_window.cc create mode 100644 scribo/demo/demat/src/main_window.hh create mode 100644 scribo/demo/demat/src/mln_widgets.cc create mode 100644 scribo/demo/demat/src/preprocessing_task.hh create mode 100644 scribo/demo/demat/src/process_args.hh create mode 100644 scribo/demo/demat/src/runner.cc create mode 100644 scribo/demo/demat/src/runner.hh create mode 100644 scribo/demo/demat/ui/main_window.ui delete mode 100644 scribo/demo/demo.pro copy {milena/sandbox/lazzara/igr/gui => scribo/demo/review}/Makefile.am (100%) rename scribo/demo/{ => review}/icons/document-open.png (100%) rename scribo/demo/{ => review}/icons/edit-find.png (100%) rename scribo/demo/{ => review}/icons/format-indent-more.png (100%) rename scribo/demo/{ => review}/icons/go-next.png (100%) rename scribo/demo/{ => review}/icons/image-x-generic.png (100%) rename scribo/demo/{ => review}/icons/list-add.png (100%) rename scribo/demo/{ => review}/icons/ocr.png (100%) rename scribo/demo/{ => review}/icons/text-x-generic.png (100%) rename scribo/demo/{ => review}/icons/view-refresh.png (100%) rename scribo/demo/{ => review}/icons/x-office-spreadsheet.png (100%) create mode 100644 scribo/demo/review/review.pro rename scribo/demo/{demo.qrc => review/review.qrc} (100%) create mode 100644 scribo/demo/review/src/main.cc create mode 100644 scribo/demo/review/src/mainwindow.cc create mode 100644 scribo/demo/review/src/mainwindow.hh rename scribo/demo/{ => review}/ui/mainwindow.ui (100%) create mode 100644 scribo/demo/shared/icons/Symbols-Delete-icon.png create mode 100644 scribo/demo/shared/icons/accept-icon.png create mode 100644 scribo/demo/shared/icons/close.gif create mode 100644 scribo/demo/shared/icons/crop-icon.png create mode 100644 scribo/demo/shared/icons/image-add-icon.png create mode 100644 scribo/demo/shared/icons/image-edit-icon.png create mode 100644 scribo/demo/shared/icons/image-multi-icon.png create mode 100644 scribo/demo/shared/icons/image-next-icon.png create mode 100644 scribo/demo/shared/icons/image-remove-icon.png create mode 100644 scribo/demo/shared/icons/next-icon.png create mode 100644 scribo/demo/shared/icons/page-down-icon.png create mode 100644 scribo/demo/shared/icons/page-search-icon.png create mode 100644 scribo/demo/shared/icons/rotate_ccw.png create mode 100644 scribo/demo/shared/icons/rotate_cw.png create mode 100644 scribo/demo/shared/icons/search-add-icon.png create mode 100644 scribo/demo/shared/icons/search-remove-icon.png create mode 100644 scribo/demo/shared/shared.qrc create mode 100644 scribo/demo/shared/src/bak/crop_item.cc create mode 100644 scribo/demo/shared/src/bak/crop_item.hh create mode 100644 scribo/demo/shared/src/bak/image_viewer.cc create mode 100644 scribo/demo/shared/src/bak/image_viewer.hh create mode 100644 scribo/demo/shared/src/bak/types.hh create mode 100644 scribo/demo/shared/src/browse_widget.cc create mode 100644 scribo/demo/shared/src/browse_widget.hh create mode 100644 scribo/demo/shared/src/crop_item.cc create mode 100644 scribo/demo/shared/src/crop_item.hh create mode 100644 scribo/demo/shared/src/image_viewer.cc create mode 100644 scribo/demo/shared/src/image_viewer.hh create mode 100644 scribo/demo/shared/src/image_viewer.hxx create mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.cc create mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.hh create mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.cc create mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.hh create mode 100644 scribo/demo/shared/src/internal/interactive_scene.cc create mode 100644 scribo/demo/shared/src/internal/interactive_scene.hh create mode 100644 scribo/demo/shared/src/internal/selection_rectangle.cc create mode 100644 scribo/demo/shared/src/internal/selection_rectangle.hh create mode 100644 scribo/demo/shared/src/to_mln_image.hh create mode 100644 scribo/demo/shared/src/types.hh create mode 100644 scribo/demo/shared/ui/browse_widget.ui create mode 100644 scribo/demo/shared/ui/crop_widget.ui create mode 100644 scribo/demo/shared/ui/image_viewer.ui create mode 100644 scribo/demo/shared/ui/interactive_scene.cc create mode 100644 scribo/demo/shared/ui/interactive_scene.hh create mode 100644 scribo/demo/shared/ui/rotate_widget.ui delete mode 100644 scribo/demo/src/main.cc delete mode 100644 scribo/demo/src/mainwindow.cc delete mode 100644 scribo/demo/src/mainwindow.hh create mode 100644 scribo/demo/tip/gui.pro create mode 100644 scribo/demo/tip/gui.qrc create mode 100644 scribo/demo/tip/icons/next.png create mode 100644 scribo/demo/tip/icons/ok.png create mode 100644 scribo/demo/tip/icons/photos.png create mode 100644 scribo/demo/tip/icons/prev.png create mode 100644 scribo/demo/tip/icons/remove.png create mode 100644 scribo/demo/tip/src/custom_delegate.cc create mode 100644 scribo/demo/tip/src/custom_delegate.hh create mode 100644 scribo/demo/tip/src/launch_dialog.cc create mode 100644 scribo/demo/tip/src/launch_dialog.hh create mode 100644 scribo/demo/tip/src/main.cc create mode 100644 scribo/demo/tip/src/main_window.cc create mode 100644 scribo/demo/tip/src/main_window.hh create mode 100644 scribo/demo/tip/ui/launch_dialog.ui create mode 100644 scribo/demo/tip/ui/main_window.ui create mode 100644 scribo/demo/viewer/Makefile.am create mode 100644 scribo/demo/viewer/README create mode 100644 scribo/demo/viewer/browser_widget.cc create mode 100644 scribo/demo/viewer/browser_widget.hh create mode 100644 scribo/demo/viewer/common.hh create mode 100644 scribo/demo/viewer/domitem.cc create mode 100644 scribo/demo/viewer/domitem.hh create mode 100644 scribo/demo/viewer/dommodel.cc create mode 100644 scribo/demo/viewer/dommodel.hh create mode 100644 scribo/demo/viewer/help_dialog.cc create mode 100644 scribo/demo/viewer/help_dialog.hh create mode 100644 scribo/demo/viewer/image_region.cc create mode 100644 scribo/demo/viewer/image_region.hh create mode 100644 scribo/demo/viewer/image_region.hxx create mode 100644 scribo/demo/viewer/image_scene.cc create mode 100644 scribo/demo/viewer/image_scene.hh create mode 100644 scribo/demo/viewer/image_view.cc create mode 100644 scribo/demo/viewer/image_view.hh create mode 100644 scribo/demo/viewer/image_widget.cc create mode 100644 scribo/demo/viewer/image_widget.hh create mode 100644 scribo/demo/viewer/key_widget.cc create mode 100644 scribo/demo/viewer/key_widget.hh create mode 100644 scribo/demo/viewer/main.cc create mode 100644 scribo/demo/viewer/property_widget.cc create mode 100644 scribo/demo/viewer/property_widget.hh create mode 100644 scribo/demo/viewer/step_widget.cc create mode 100644 scribo/demo/viewer/step_widget.hh create mode 100644 scribo/demo/viewer/viewer.cc create mode 100644 scribo/demo/viewer/viewer.hh create mode 100644 scribo/demo/viewer/viewer.hxx create mode 100644 scribo/demo/viewer/xml_widget.cc create mode 100644 scribo/demo/viewer/xml_widget.hh create mode 100644 scribo/demo/wizard/images/dematerialization.png create mode 100644 scribo/demo/wizard/src/crop_page.cc create mode 100644 scribo/demo/wizard/src/crop_page.hh create mode 100644 scribo/demo/wizard/src/crop_widget.cc create mode 100644 scribo/demo/wizard/src/crop_widget.hh create mode 100644 scribo/demo/wizard/src/doc_type.hh create mode 100644 scribo/demo/wizard/src/doc_type_page.cc create mode 100644 scribo/demo/wizard/src/doc_type_page.hh create mode 100644 scribo/demo/wizard/src/doc_type_widget.cc create mode 100644 scribo/demo/wizard/src/doc_type_widget.hh create mode 100644 scribo/demo/wizard/src/load_page.cc create mode 100644 scribo/demo/wizard/src/load_page.hh create mode 100644 scribo/demo/wizard/src/load_widget.cc create mode 100644 scribo/demo/wizard/src/load_widget.hh create mode 100644 scribo/demo/wizard/src/main.cc create mode 100644 scribo/demo/wizard/src/main_window.cc create mode 100644 scribo/demo/wizard/src/main_window.hh create mode 100644 scribo/demo/wizard/src/mln_widgets.cc create mode 100644 scribo/demo/wizard/src/preprocessing_page.cc create mode 100644 scribo/demo/wizard/src/preprocessing_page.hh create mode 100644 scribo/demo/wizard/src/preprocessing_task.hh create mode 100644 scribo/demo/wizard/src/preprocessing_widget.cc create mode 100644 scribo/demo/wizard/src/preprocessing_widget.hh create mode 100644 scribo/demo/wizard/src/process_page.cc create mode 100644 scribo/demo/wizard/src/process_page.hh create mode 100644 scribo/demo/wizard/src/process_widget.cc create mode 100644 scribo/demo/wizard/src/process_widget.hh create mode 100644 scribo/demo/wizard/src/result_page.cc create mode 100644 scribo/demo/wizard/src/result_page.hh create mode 100644 scribo/demo/wizard/src/result_widget.cc create mode 100644 scribo/demo/wizard/src/result_widget.hh create mode 100644 scribo/demo/wizard/src/rotate_page.cc create mode 100644 scribo/demo/wizard/src/rotate_page.hh create mode 100644 scribo/demo/wizard/src/rotate_widget.cc create mode 100644 scribo/demo/wizard/src/rotate_widget.hh create mode 100644 scribo/demo/wizard/src/runner.cc create mode 100644 scribo/demo/wizard/src/runner.hh create mode 100644 scribo/demo/wizard/src/test.cc create mode 100644 scribo/demo/wizard/ui/doc_type_widget.ui create mode 100644 scribo/demo/wizard/ui/load_widget.ui create mode 100644 scribo/demo/wizard/ui/main_window.ui create mode 100644 scribo/demo/wizard/ui/preprocessing_widget.ui create mode 100644 scribo/demo/wizard/wizard.pro create mode 100644 scribo/demo/wizard/wizard.qrc delete mode 100644 scribo/draw/bounding_box_links.hh delete mode 100644 scribo/draw/bounding_boxes.hh delete mode 100644 scribo/estim/object_groups_v_thickness.hh delete mode 100644 scribo/filter/all.hh delete mode 100644 scribo/filter/common/objects_photo.hh delete mode 100644 scribo/filter/internal/compute.hh delete mode 100644 scribo/filter/object_groups_size_ratio.hh delete mode 100644 scribo/filter/object_groups_small.hh delete mode 100644 scribo/filter/object_groups_v_thickness.hh delete mode 100644 scribo/filter/object_links_bbox_h_ratio.hh delete mode 100644 scribo/filter/object_links_bbox_overlap.hh delete mode 100644 scribo/filter/object_links_bbox_ratio.hh delete mode 100644 scribo/filter/object_links_bbox_w_ratio.hh delete mode 100644 scribo/filter/object_links_bottom_aligned.hh delete mode 100644 scribo/filter/object_links_center_aligned.hh delete mode 100644 scribo/filter/object_links_non_aligned.hh delete mode 100644 scribo/filter/object_links_non_aligned_simple.hh delete mode 100644 scribo/filter/object_links_non_h_aligned.hh delete mode 100644 scribo/filter/object_links_non_v_aligned.hh delete mode 100644 scribo/filter/object_links_top_aligned.hh delete mode 100644 scribo/filter/objects_h_thick.hh delete mode 100644 scribo/filter/objects_h_thin.hh delete mode 100644 scribo/filter/objects_large.hh delete mode 100644 scribo/filter/objects_size_ratio.hh delete mode 100644 scribo/filter/objects_small.hh delete mode 100644 scribo/filter/objects_thick.hh delete mode 100644 scribo/filter/objects_thin.hh delete mode 100644 scribo/filter/objects_v_thick.hh delete mode 100644 scribo/filter/objects_v_thin.hh delete mode 100644 scribo/fun/v2b/objects_small_filter.hh delete mode 100644 scribo/make/all.hh delete mode 100644 scribo/make/text.hh delete mode 100644 scribo/preprocessing/all.hh delete mode 100644 scribo/preprocessing/split_bg_fg.hh delete mode 100644 scribo/preprocessing/unskew.hh delete mode 100644 scribo/primitive/extract/all.hh delete mode 100644 scribo/primitive/extract/lines_discontinued.hh delete mode 100644 scribo/primitive/extract/lines_h_discontinued.hh delete mode 100644 scribo/primitive/extract/lines_h_pattern.hh delete mode 100644 scribo/primitive/extract/lines_h_single.hh delete mode 100644 scribo/primitive/extract/lines_h_thick.hh delete mode 100644 scribo/primitive/extract/lines_h_thick_and_single.hh delete mode 100644 scribo/primitive/extract/lines_pattern.hh delete mode 100644 scribo/primitive/extract/lines_thick.hh delete mode 100644 scribo/primitive/extract/lines_v_discontinued.hh delete mode 100644 scribo/primitive/extract/lines_v_pattern.hh delete mode 100644 scribo/primitive/extract/lines_v_single.hh delete mode 100644 scribo/primitive/extract/lines_v_thick.hh delete mode 100644 scribo/primitive/extract/lines_v_thick_and_single.hh delete mode 100644 scribo/primitive/extract/objects.hh delete mode 100644 scribo/primitive/group/all.hh delete mode 100644 scribo/primitive/group/apply.hh delete mode 100644 scribo/primitive/group/from_double_link.hh delete mode 100644 scribo/primitive/group/from_graph.hh delete mode 100644 scribo/primitive/group/from_single_link.hh delete mode 100644 scribo/primitive/internal/all.hh delete mode 100644 scribo/primitive/internal/find_graph_link.hh delete mode 100644 scribo/primitive/internal/find_left_link.hh delete mode 100644 scribo/primitive/internal/find_right_link.hh delete mode 100644 scribo/primitive/internal/find_root.hh delete mode 100644 scribo/primitive/internal/init_link_array.hh delete mode 100644 scribo/primitive/internal/is_invalid_link.hh delete mode 100644 scribo/primitive/internal/is_link_valid.hh delete mode 100644 scribo/primitive/internal/update_link_array.hh delete mode 100644 scribo/primitive/link/all.hh delete mode 100644 scribo/primitive/link/compute.hh delete mode 100644 scribo/primitive/link/compute_several.hh delete mode 100644 scribo/primitive/link/internal/anchors_3.hh delete mode 100644 scribo/primitive/link/internal/find_link.hh delete mode 100644 scribo/primitive/link/internal/find_several_links.hh delete mode 100644 scribo/primitive/link/internal/link_center_dmax_base.hh delete mode 100644 scribo/primitive/link/internal/link_center_dmax_ratio_base.hh delete mode 100644 scribo/primitive/link/internal/link_functor_base.hh delete mode 100644 scribo/primitive/link/internal/link_ms_dmax_base.hh delete mode 100644 scribo/primitive/link/internal/link_ms_dmax_ratio_base.hh delete mode 100644 scribo/primitive/link/merge_double_link.hh delete mode 100644 scribo/primitive/link/with_graph.hh delete mode 100644 scribo/primitive/link/with_rag.hh delete mode 100644 scribo/primitive/link/with_several_graphes.hh delete mode 100644 scribo/primitive/link/with_several_left_links.hh delete mode 100644 scribo/primitive/link/with_several_right_closest_links.hh delete mode 100644 scribo/primitive/link/with_several_right_links.hh delete mode 100644 scribo/primitive/link/with_several_right_links_overlap.hh delete mode 100644 scribo/primitive/link/with_single_left_link.hh delete mode 100644 scribo/primitive/link/with_single_left_link_dmax_ratio.hh delete mode 100644 scribo/primitive/link/with_single_right_link.hh delete mode 100644 scribo/primitive/link/with_single_right_link_bottom.hh delete mode 100644 scribo/primitive/link/with_single_right_link_dmax_ratio.hh delete mode 100644 scribo/primitive/link/with_single_right_link_top.hh create mode 100644 scribo/sandbox/ChangeLog create mode 100644 scribo/sandbox/green/ChangeLog create mode 100644 scribo/sandbox/green/README create mode 100644 scribo/sandbox/green/README.green create mode 100644 scribo/sandbox/green/README.img create mode 100644 scribo/sandbox/green/README.result create mode 100644 scribo/sandbox/green/bench/clustering/distance/Makefile.am create mode 100644 scribo/sandbox/green/bench/clustering/distance/distance.cc create mode 100644 scribo/sandbox/green/demo/clustering/kmean1d/Makefile.am create mode 100644 scribo/sandbox/green/demo/clustering/kmean1d/kmean1d.cc create mode 100644 scribo/sandbox/green/demo/clustering/kmean2d/Makefile.am create mode 100644 scribo/sandbox/green/demo/clustering/kmean2d/kmean2d.cc create mode 100644 scribo/sandbox/green/demo/clustering/kmean3d/Makefile.am create mode 100644 scribo/sandbox/green/demo/clustering/kmean3d/kmean3d.cc create mode 100644 scribo/sandbox/green/demo/clustering/kmean_rgb/Makefile.am create mode 100644 scribo/sandbox/green/demo/clustering/kmean_rgb/kmean_rgb.cc copy {milena/sandbox/green/tests/accu/stat/histo1d => scribo/sandbox/green}/gaussian.sh (100%) copy {milena/sandbox/green/tests/accu/stat/histo2d => scribo/sandbox/green}/gaussian2d.sh (100%) create mode 100644 scribo/sandbox/green/mln/accu/stat/histo1d.hh create mode 100644 scribo/sandbox/green/mln/accu/stat/histo2d.hh create mode 100644 scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh create mode 100644 scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh create mode 100644 scribo/sandbox/green/mln/clustering/k_mean.hh create mode 100644 scribo/sandbox/green/mln/clustering/kmean1d.hh create mode 100644 scribo/sandbox/green/mln/clustering/kmean2d.hh create mode 100644 scribo/sandbox/green/mln/clustering/kmean3d.hh create mode 100644 scribo/sandbox/green/mln/clustering/kmean_rgb.hh create mode 100644 scribo/sandbox/green/mln/display/display_histo.hh create mode 100644 scribo/sandbox/green/mln/display/project_histo.hh create mode 100644 scribo/sandbox/green/mln/fun/p2b/achromatic.hh create mode 100644 scribo/sandbox/green/mln/fun/p2b/component_equals.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/achromatism.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/hue_concentration.hh copy {milena => scribo}/sandbox/green/mln/fun/v2v/int_u16_to_int_u14.hh (100%) copy {milena => scribo}/sandbox/green/mln/fun/v2v/log.hh (100%) create mode 100644 scribo/sandbox/green/mln/fun/v2v/rg_to_rgb.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_rg.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_saturation_map.hh create mode 100644 scribo/sandbox/green/mln/fun/v2v/rgb_to_value_map.hh create mode 100644 scribo/sandbox/green/mln/img_path.hh create mode 100644 scribo/sandbox/green/mln/io/plot/save_image_sh.hh create mode 100644 scribo/sandbox/green/mln/math/ceil.hh create mode 100644 scribo/sandbox/green/mln/math/floor.hh create mode 100644 scribo/sandbox/green/mln/value/hsv.hh create mode 100644 scribo/sandbox/green/mln/value/rg.hh create mode 100644 scribo/sandbox/green/ok/mln/accu/histo/histo1d.hh copy {milena/sandbox/green/mln/accu/stat => scribo/sandbox/green/ok/mln/accu/histo}/histo2d.hh (100%) copy milena/sandbox/green/mln/accu/stat/histo3d_rgb.hh => scribo/sandbox/green/ok/mln/accu/histo/histo3d.hh (100%) create mode 100644 scribo/sandbox/green/ok/mln/img_path.hh copy {milena/sandbox/green/tests/accu/stat/histo1d => scribo/sandbox/green/ok/test/accu/histo}/gaussian.sh (100%) create mode 100755 scribo/sandbox/green/ok/test/accu/histo/histo1d create mode 100644 scribo/sandbox/green/ok/test/accu/histo/histo1d.cc create mode 100644 scribo/sandbox/green/test_labelling.cc create mode 100644 scribo/sandbox/green/test_labelling_2.cc create mode 100644 scribo/sandbox/green/test_labelling_3.cc create mode 100644 scribo/sandbox/green/tests/accu/stat/histo1d/Makefile.am create mode 100644 scribo/sandbox/green/tests/accu/stat/histo1d/histo1d.cc create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_hsl/Makefile.am create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_hsl/histo3d_hsl.cc create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_rgb/Makefile.am create mode 100644 scribo/sandbox/green/tests/accu/stat/histo3d_rgb/histo3d_rgb.cc create mode 100644 scribo/sandbox/green/tests/clustering/k_mean/Makefile.am create mode 100644 scribo/sandbox/green/tests/clustering/k_mean/k_mean.cc copy {milena => scribo}/sandbox/green/tests/clustering/kmean1d/Makefile.am (100%) copy {milena => scribo}/sandbox/green/tests/clustering/kmean1d/kmean1d.cc (100%) create mode 100644 scribo/sandbox/green/tests/io/plot/save_image_sh/Makefile.am create mode 100644 scribo/sandbox/green/tests/io/plot/save_image_sh/save_image_sh.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo1d/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo1d/histo1d.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo2d/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo2d/histo2d.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_hsl/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_hsl/histo3d_hsl.cc create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_rgb/Makefile.am create mode 100644 scribo/sandbox/green/use/accu/stat/histo3d_rgb/histo3d_rgb.cc create mode 100644 scribo/sandbox/green/use/clustering/k_mean/Makefile.am create mode 100644 scribo/sandbox/green/use/clustering/k_mean/k_mean.cc create mode 100644 scribo/sandbox/green/use/clustering/kmean1d/Makefile.am create mode 100644 scribo/sandbox/green/use/clustering/kmean1d/kmean1d.cc create mode 100644 scribo/sandbox/green/use/clustering/kmean2d/Makefile.am create mode 100644 scribo/sandbox/green/use/clustering/kmean2d/kmean2d.cc create mode 100644 scribo/sandbox/green/use/clustering/kmean3d/Makefile.am create mode 100644 scribo/sandbox/green/use/clustering/kmean3d/kmean3d.cc create mode 100644 scribo/sandbox/green/use/clustering/kmean_rgb/Makefile.am create mode 100644 scribo/sandbox/green/use/clustering/kmean_rgb/kmean_rgb.cc create mode 100644 scribo/sandbox/green/use/fun/v2v/rg_to_rgb/Makefile.am create mode 100644 scribo/sandbox/green/use/fun/v2v/rg_to_rgb/rg_to_rgb.cc create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb8_to_rgbn/Makefile.am create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb_to_rg/Makefile.am create mode 100644 scribo/sandbox/green/use/fun/v2v/rgb_to_rg/rgb_to_rg.cc create mode 100644 scribo/sandbox/green/use/io/plot/save_image_sh/Makefile.am create mode 100644 scribo/sandbox/green/use/io/plot/save_image_sh/save_image_sh.cc create mode 100644 scribo/sandbox/green/use/value/rg/Makefile.am create mode 100644 scribo/sandbox/green/use/value/rg/rg.cc create mode 100644 scribo/sandbox/z/white_spaces/hom_sep.cc create mode 100644 scribo/sandbox/z/white_spaces/white_space_closing.cc create mode 100644 scribo/sandbox/z/white_spaces/white_spaces.cc create mode 100644 scribo/scribo/all.hh create mode 100644 scribo/scribo/binarization/all.hh create mode 100644 scribo/scribo/binarization/global_threshold.hh create mode 100644 scribo/scribo/binarization/global_threshold_auto.hh create mode 100644 scribo/scribo/binarization/internal/first_pass_functor.hh create mode 100644 scribo/scribo/binarization/local_threshold.hh create mode 100644 scribo/scribo/binarization/sauvola.hh create mode 100644 scribo/scribo/binarization/sauvola_ms.hh create mode 100644 scribo/scribo/binarization/sauvola_ms_split.hh create mode 100644 scribo/scribo/binarization/sauvola_threshold_image.hh create mode 100644 scribo/scribo/binarization/sauvola_threshold_image_debug.hh create mode 100644 scribo/scribo/canvas/integral_browsing.hh create mode 100644 scribo/scribo/convert/from_qimage.hh create mode 100644 scribo/scribo/core/all.hh rename scribo/{ => scribo}/core/central_sites.hh (100%) create mode 100644 scribo/scribo/core/component_info.hh create mode 100644 scribo/scribo/core/component_set.hh create mode 100644 scribo/scribo/core/concept/dmax_functor.hh rename scribo/{ => scribo}/core/concept/link_functor.hh (100%) create mode 100644 scribo/scribo/core/def/lbl_type.hh create mode 100644 scribo/scribo/core/erase_objects.hh create mode 100644 scribo/scribo/core/init_integral_image.hh create mode 100644 scribo/scribo/core/line_info.hh create mode 100644 scribo/scribo/core/line_set.hh create mode 100644 scribo/scribo/core/macros.hh create mode 100644 scribo/scribo/core/object_groups.hh create mode 100644 scribo/scribo/core/object_links.hh create mode 100644 scribo/scribo/core/tag/anchor.hh create mode 100644 scribo/scribo/core/tag/component.hh create mode 100644 scribo/scribo/core/tag/line.hh create mode 100644 scribo/scribo/debug/alignment_decision_image.hh rename scribo/{ => scribo}/debug/all.hh (100%) create mode 100644 scribo/scribo/debug/bboxes_enlarged_image.hh create mode 100644 scribo/scribo/debug/char_space_image.hh create mode 100644 scribo/scribo/debug/decision_image.hh create mode 100644 scribo/scribo/debug/highlight_text_area.hh create mode 100644 scribo/scribo/debug/line_info_image.hh create mode 100644 scribo/scribo/debug/links_decision_image.hh create mode 100644 scribo/scribo/debug/looks_like_a_text_line_image.hh create mode 100644 scribo/scribo/debug/mean_and_base_lines_image.hh create mode 100644 scribo/scribo/debug/save_bboxes_image.hh create mode 100644 scribo/scribo/debug/save_comp_diff.hh rename scribo/{ => scribo}/debug/save_label_image.hh (100%) create mode 100644 scribo/scribo/debug/save_linked_bboxes_image.hh rename scribo/{ => scribo}/debug/save_table_image.hh (100%) create mode 100644 scribo/scribo/debug/several_links_decision_image.hh create mode 100644 scribo/scribo/debug/text_areas_image.hh create mode 100644 scribo/scribo/debug/usage.hh rename scribo/{ => scribo}/draw/all.hh (100%) create mode 100644 scribo/scribo/draw/bounding_box_links.hh create mode 100644 scribo/scribo/draw/bounding_boxes.hh create mode 100644 scribo/scribo/draw/groups_bboxes.hh create mode 100644 scribo/scribo/estim/object_groups_v_thickness.hh create mode 100644 scribo/scribo/filter/all.hh create mode 100644 scribo/scribo/filter/common/objects_photo.hh create mode 100644 scribo/scribo/filter/internal/alignment_angle.hh create mode 100644 scribo/scribo/filter/internal/component_aligned.hh create mode 100644 scribo/scribo/filter/internal/compute.hh create mode 100644 scribo/scribo/filter/object_groups_size_ratio.hh create mode 100644 scribo/scribo/filter/object_groups_small.hh create mode 100644 scribo/scribo/filter/object_groups_v_thickness.hh create mode 100644 scribo/scribo/filter/object_groups_with_holes.hh create mode 100644 scribo/scribo/filter/object_links_bbox_h_ratio.hh create mode 100644 scribo/scribo/filter/object_links_bbox_overlap.hh create mode 100644 scribo/scribo/filter/object_links_bbox_ratio.hh create mode 100644 scribo/scribo/filter/object_links_bbox_w_ratio.hh create mode 100644 scribo/scribo/filter/object_links_bottom_aligned.hh create mode 100644 scribo/scribo/filter/object_links_center_aligned.hh create mode 100644 scribo/scribo/filter/object_links_left_aligned.hh create mode 100644 scribo/scribo/filter/object_links_non_aligned_simple.hh create mode 100644 scribo/scribo/filter/object_links_right_aligned.hh create mode 100644 scribo/scribo/filter/object_links_top_aligned.hh create mode 100644 scribo/scribo/filter/objects_h_thick.hh create mode 100644 scribo/scribo/filter/objects_h_thin.hh create mode 100644 scribo/scribo/filter/objects_large.hh create mode 100644 scribo/scribo/filter/objects_size_ratio.hh create mode 100644 scribo/scribo/filter/objects_small.hh create mode 100644 scribo/scribo/filter/objects_thick.hh create mode 100644 scribo/scribo/filter/objects_thin.hh create mode 100644 scribo/scribo/filter/objects_v_thick.hh create mode 100644 scribo/scribo/filter/objects_v_thin.hh create mode 100644 scribo/scribo/filter/objects_with_holes.hh create mode 100644 scribo/scribo/fun/v2b/label_to_bool.hh create mode 100644 scribo/scribo/fun/v2b/objects_large_filter.hh create mode 100644 scribo/scribo/fun/v2b/objects_small_filter.hh create mode 100644 scribo/scribo/io/text_boxes/save.hh create mode 100644 scribo/scribo/io/xml/save.hh create mode 100644 scribo/scribo/make/all.hh rename scribo/{ => scribo}/make/debug_filename.hh (100%) rename scribo/{ => scribo}/make/influence_zone_graph.hh (100%) create mode 100644 scribo/scribo/postprocessing/all.hh create mode 100644 scribo/scribo/postprocessing/fill_object_holes.hh create mode 100644 scribo/scribo/preprocessing/all.hh create mode 100644 scribo/scribo/preprocessing/crop.hh create mode 100644 scribo/scribo/preprocessing/crop_without_localization.hh create mode 100644 scribo/scribo/preprocessing/denoise.hh create mode 100644 scribo/scribo/preprocessing/denoise_bg.hh create mode 100644 scribo/scribo/preprocessing/denoise_fg.hh create mode 100644 scribo/scribo/preprocessing/deskew.hh create mode 100644 scribo/scribo/preprocessing/deskew_crop.hh create mode 100644 scribo/scribo/preprocessing/homogeneous_contrast.hh create mode 100644 scribo/scribo/preprocessing/rotate_90.hh create mode 100644 scribo/scribo/preprocessing/split_bg_fg.hh rename scribo/{ => scribo}/primitive/all.hh (100%) create mode 100644 scribo/scribo/primitive/extract/all.hh rename scribo/{ => scribo}/primitive/extract/canvas.hh (100%) rename scribo/{ => scribo}/primitive/extract/cells.hh (100%) create mode 100644 scribo/scribo/primitive/extract/components.hh create mode 100644 scribo/scribo/primitive/extract/horizontal_separators.hh create mode 100644 scribo/scribo/primitive/extract/lines_discontinued.hh create mode 100644 scribo/scribo/primitive/extract/lines_h_discontinued.hh create mode 100644 scribo/scribo/primitive/extract/lines_h_pattern.hh create mode 100644 scribo/scribo/primitive/extract/lines_h_single.hh create mode 100644 scribo/scribo/primitive/extract/lines_h_thick.hh create mode 100644 scribo/scribo/primitive/extract/lines_h_thick_and_single.hh create mode 100644 scribo/scribo/primitive/extract/lines_pattern.hh create mode 100644 scribo/scribo/primitive/extract/lines_thick.hh create mode 100644 scribo/scribo/primitive/extract/lines_v_discontinued.hh create mode 100644 scribo/scribo/primitive/extract/lines_v_pattern.hh create mode 100644 scribo/scribo/primitive/extract/lines_v_single.hh create mode 100644 scribo/scribo/primitive/extract/lines_v_thick.hh create mode 100644 scribo/scribo/primitive/extract/lines_v_thick_and_single.hh create mode 100644 scribo/scribo/primitive/extract/separators.hh create mode 100644 scribo/scribo/primitive/extract/vertical_separators.hh create mode 100644 scribo/scribo/primitive/group/all.hh create mode 100644 scribo/scribo/primitive/group/apply.hh create mode 100644 scribo/scribo/primitive/group/from_double_link.hh create mode 100644 scribo/scribo/primitive/group/from_graph.hh create mode 100644 scribo/scribo/primitive/group/from_single_link.hh create mode 100644 scribo/scribo/primitive/internal/all.hh create mode 100644 scribo/scribo/primitive/internal/find_graph_link.hh create mode 100644 scribo/scribo/primitive/internal/find_root.hh rename scribo/{ => scribo}/primitive/internal/have_link_valid.hh (100%) create mode 100644 scribo/scribo/primitive/internal/is_link_valid.hh create mode 100644 scribo/scribo/primitive/internal/rd.hh rename scribo/{ => scribo}/primitive/internal/update_graph_link.hh (100%) create mode 100644 scribo/scribo/primitive/link/all.hh create mode 100644 scribo/scribo/primitive/link/compute.hh create mode 100644 scribo/scribo/primitive/link/compute_several.hh create mode 100644 scribo/scribo/primitive/link/internal/compute_anchor.hh create mode 100644 scribo/scribo/primitive/link/internal/dmax_default.hh create mode 100644 scribo/scribo/primitive/link/internal/dmax_functor_base.hh create mode 100644 scribo/scribo/primitive/link/internal/dmax_width_and_height.hh create mode 100644 scribo/scribo/primitive/link/internal/dmax_width_only.hh create mode 100644 scribo/scribo/primitive/link/internal/find_link.hh create mode 100644 scribo/scribo/primitive/link/internal/find_several_links.hh create mode 100644 scribo/scribo/primitive/link/internal/link_functor_base.hh create mode 100644 scribo/scribo/primitive/link/internal/link_several_dmax_base.hh create mode 100644 scribo/scribo/primitive/link/internal/link_single_dmax_base.hh create mode 100644 scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh create mode 100644 scribo/scribo/primitive/link/merge_double_link.hh create mode 100644 scribo/scribo/primitive/link/with_graph.hh create mode 100644 scribo/scribo/primitive/link/with_rag.hh create mode 100644 scribo/scribo/primitive/link/with_several_graphes.hh create mode 100644 scribo/scribo/primitive/link/with_several_left_links.hh create mode 100644 scribo/scribo/primitive/link/with_several_right_closest_links.hh create mode 100644 scribo/scribo/primitive/link/with_several_right_links.hh create mode 100644 scribo/scribo/primitive/link/with_several_right_links_overlap.hh create mode 100644 scribo/scribo/primitive/link/with_single_down_link.hh create mode 100644 scribo/scribo/primitive/link/with_single_left_link.hh create mode 100644 scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh create mode 100644 scribo/scribo/primitive/link/with_single_right_link.hh create mode 100644 scribo/scribo/primitive/link/with_single_right_link_bottom.hh create mode 100644 scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh create mode 100644 scribo/scribo/primitive/link/with_single_right_link_top.hh create mode 100644 scribo/scribo/primitive/link/with_single_up_link.hh create mode 100644 scribo/scribo/primitive/regroup/from_single_left_link.hh create mode 100644 scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh create mode 100644 scribo/scribo/primitive/remove/separators.hh create mode 100644 scribo/scribo/subsampling/bilinear.hh create mode 100644 scribo/scribo/subsampling/integral.hh create mode 100644 scribo/scribo/subsampling/integral_single_image.hh create mode 100644 scribo/scribo/table/align_lines_horizontaly.hh rename scribo/{ => scribo}/table/align_lines_verticaly.hh (100%) rename scribo/{ => scribo}/table/all.hh (100%) rename scribo/{ => scribo}/table/connect_horizontal_lines.hh (100%) rename scribo/{ => scribo}/table/connect_vertical_lines.hh (100%) create mode 100644 scribo/scribo/table/erase.hh create mode 100644 scribo/scribo/table/extract.hh create mode 100644 scribo/scribo/table/internal/align_lines.hh rename scribo/{ => scribo}/table/internal/all.hh (100%) create mode 100644 scribo/scribo/table/internal/connect_lines.hh create mode 100644 scribo/scribo/table/internal/repair_lines.hh create mode 100644 scribo/scribo/table/rebuild.hh rename scribo/{ => scribo}/table/repair_horizontal_lines.hh (100%) rename scribo/{ => scribo}/table/repair_vertical_lines.hh (100%) rename scribo/{ => scribo}/text/all.hh (100%) create mode 100644 scribo/scribo/text/clean.hh create mode 100644 scribo/scribo/text/clean_inplace.hh create mode 100644 scribo/scribo/text/extract_lines.hh create mode 100644 scribo/scribo/text/look_like_text_lines.hh create mode 100644 scribo/scribo/text/merging.hh create mode 100644 scribo/scribo/text/recognition.hh create mode 100644 scribo/scribo/toolchain/nepomuk/text_extraction.hh create mode 100644 scribo/scribo/toolchain/text_in_doc.hh create mode 100644 scribo/scribo/upsampling/bs2x.hh create mode 100644 scribo/scribo/upsampling/eagle.hh create mode 100644 scribo/src/README create mode 100644 scribo/src/afp/components.hh create mode 100644 scribo/src/afp/link.hh create mode 100644 scribo/src/afp/regroup.hh create mode 100644 scribo/src/binarization/fg_sauvola_ms.cc create mode 100644 scribo/src/binarization/pgm_global_threshold_auto.cc create mode 100644 scribo/src/binarization/pgm_sauvola.cc create mode 100644 scribo/src/binarization/pgm_sauvola_ms.cc create mode 100644 scribo/src/binarization/ppm_fg_sauvola_ms.cc create mode 100644 scribo/src/binarization/ppm_sauvola.cc create mode 100644 scribo/src/binarization/ppm_sauvola_ms.cc create mode 100644 scribo/src/binarization/ppm_sauvola_ms_split.cc create mode 100644 scribo/src/binarization/sauvola_debug.cc create mode 100644 scribo/src/binarization/sauvola_ms_debug.cc create mode 100644 scribo/src/binarization/sauvola_ms_split.cc delete mode 100644 scribo/src/binarization/sauvola_pgm.cc delete mode 100644 scribo/src/binarization/simple.cc create mode 100644 scribo/src/contest/Makefile.am create mode 100644 scribo/src/contest/hdibco-2010/Makefile.am create mode 100644 scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc create mode 100644 scribo/src/debug/highlight_text_area.cc create mode 100644 scribo/src/debug/show_info_median_inter_characters.cc create mode 100644 scribo/src/debug/show_info_x_height.cc delete mode 100644 scribo/src/debug/show_left_right_links_validation.cc create mode 100644 scribo/src/debug/show_links_left_right_links_validation.cc create mode 100644 scribo/src/debug/show_links_single_down.cc create mode 100644 scribo/src/debug/show_links_single_down_left_aligned.cc create mode 100644 scribo/src/debug/show_links_single_down_right_aligned.cc create mode 100644 scribo/src/debug/show_links_single_up.cc create mode 100644 scribo/src/debug/show_links_single_up_left_aligned.cc create mode 100644 scribo/src/debug/show_links_single_up_right_aligned.cc create mode 100644 scribo/src/filter/objects_with_holes.cc create mode 100644 scribo/src/filter/objects_with_holes_pgm.cc delete mode 100644 scribo/src/multi_scale/Makefile.am delete mode 100644 scribo/src/multi_scale/find_lines.cc create mode 100644 scribo/src/pbm_text_in_doc.cc create mode 100644 scribo/src/postprocessing/Makefile.am create mode 100644 scribo/src/postprocessing/fill_object_holes.cc create mode 100644 scribo/src/preprocessing/denoise_bg.cc create mode 100644 scribo/src/preprocessing/denoise_fg.cc create mode 100644 scribo/src/preprocessing/homogeneous_contrast.cc create mode 100644 scribo/src/preprocessing/rotate.cc create mode 100644 scribo/src/preprocessing/rotate_90.cc create mode 100644 scribo/src/preprocessing/subsample.cc create mode 100644 scribo/src/preprocessing/to_pgm.cc create mode 100644 scribo/src/text/pbm_lines_recognition.cc create mode 100644 scribo/src/text/pbm_recognition.cc delete mode 100644 scribo/src/text/recognition.cc delete mode 100644 scribo/src/text_in_doc.cc delete mode 100644 scribo/src/text_in_doc_ppm.cc create mode 100644 scribo/src/text_in_doc_preprocess.cc delete mode 100644 scribo/src/text_in_photo.cc delete mode 100644 scribo/src/text_in_photo_invert.cc delete mode 100644 scribo/src/text_in_photo_ppm.cc create mode 100644 scribo/src/text_in_picture.cc create mode 100644 scribo/src/text_recognition_in_picture.cc delete mode 100644 scribo/table/align_lines_horizontaly.hh delete mode 100644 scribo/table/erase.hh delete mode 100644 scribo/table/extract.hh delete mode 100644 scribo/table/internal/align_lines.hh delete mode 100644 scribo/table/internal/connect_lines.hh delete mode 100644 scribo/table/internal/repair_lines.hh delete mode 100644 scribo/table/rebuild.hh create mode 100644 scribo/tests/binarization/Makefile.am create mode 100644 scribo/tests/binarization/global_threshold.cc create mode 100644 scribo/tests/binarization/local_threshold.cc create mode 100644 scribo/tests/core/Makefile.am create mode 100644 scribo/tests/filter/objects_with_holes.cc create mode 100644 scribo/tests/img/text_to_group.pgm create mode 100644 scribo/tests/img/wildly.pbm create mode 100644 scribo/tests/preprocessing/crop.cc create mode 100644 scribo/tests/preprocessing/crop_without_localization.cc create mode 100644 scribo/tests/preprocessing/deskew.cc create mode 100644 scribo/tests/preprocessing/rotate_90.cc delete mode 100644 scribo/tests/preprocessing/unskew.cc create mode 100644 scribo/tests/toolchain/Makefile.am create mode 100644 scribo/tests/toolchain/nepomuk/Makefile.am create mode 100644 scribo/tests/toolchain/nepomuk/text_extraction.cc delete mode 100755 scribo/tests/unit_test/build_unit_test.sh create mode 100644 scribo/tests/unit_test/cond_tests_qt create mode 100644 scribo/tests/unit_test/cond_tests_qt_tesseract_tiff create mode 100644 scribo/tests/unit_test/cond_tests_tesseract_tiff delete mode 100644 scribo/text/clean.hh delete mode 100644 scribo/text/extract_lines.hh delete mode 100644 scribo/text/recognition.hh delete mode 100644 scribo/util/all.hh delete mode 100644 scribo/util/text.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-538-g22c02fd config/swig.m4: Catch up with Swilena's version.
by Roland Levillain 03 Nov '10

03 Nov '10

--- extatica/ChangeLog | 4 + extatica/config/swig.m4 | 153 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 156 insertions(+), 1 deletions(-) mode change 120000 => 100644 extatica/config/swig.m4 diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 524156e..fa86dc3 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,9 @@ 2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + * config/swig.m4: Catch up with Swilena's version. + +2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + Revamp the configuration of Extatica's SWIG Python bindings. * configure.ac: Here. diff --git a/extatica/config/swig.m4 b/extatica/config/swig.m4 deleted file mode 120000 index c45fb81..46672c5 --- a/extatica/config/swig.m4 +++ /dev/null @@ -1 +0,0 @@ -../../m4/swig.m4 \ No newline at end of file diff --git a/extatica/config/swig.m4 b/extatica/config/swig.m4 new file mode 100644 index c45fb81..46672c5 --- /dev/null +++ b/extatica/config/swig.m4 @@ -0,0 +1,152 @@ +dnl @synopsis AC_PROG_SWIG([major.minor.micro]) +dnl +dnl This macro searches for a SWIG installation on your system. If found you +dnl should call SWIG via $(SWIG). You can use the optional first argument to +dnl check if the version of the available SWIG is greater than or equal to the +dnl value of the argument. It should have the format: N[.N[.N]] (N is a +dnl number between 0 and 999. Only the first N is mandatory.) +dnl +dnl If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that the +dnl swig package is this version number or higher. +dnl +dnl In configure.in, use as: +dnl +dnl AC_PROG_SWIG(1.3.17) +dnl SWIG_ENABLE_CXX +dnl SWIG_MULTI_MODULE_SUPPORT +dnl SWIG_PYTHON +dnl +dnl @author Sebastian Huber <sebastian-huber(a)web.de>, Alan W. Irwin <irwin(a)beluga.phys.uvic.ca>, Rafael Laboissiere <rafael(a)laboissiere.net>, and Andrew Collier <abcollier(a)yahoo.com>. +dnl @version $Id: ac_pkg_swig.m4,v 1.2 2004/12/24 01:20:01 guidod Exp $ +dnl +AC_DEFUN([AC_PROG_SWIG],[ + AC_PATH_PROG([SWIG],[swig]) + if test -z "$SWIG" ; then + AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org] + SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false' + elif test -n "$1" ; then + AC_MSG_CHECKING([for SWIG version]) + [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*$[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$.*/\1/g'`] + AC_MSG_RESULT([$swig_version]) + if test -n "$swig_version" ; then + # Calculate the required version number components + [required=$1] + [required_major=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_major" ; then + [required_major=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_minor=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_minor" ; then + [required_minor=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_patch=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_patch" ; then + [required_patch=0] + fi + # Calculate the available version number components + [available=$swig_version] + [available_major=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_major" ; then + [available_major=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_minor=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_minor" ; then + [available_minor=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_patch=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_patch" ; then + [available_patch=0] + fi + if test \ + $available_major -lt $required_major \ + -o $ $available_major -eq $required_major \ + -a \( $available_minor -lt $required_minor \ + -o \( $available_minor -eq $required_minor \ + -a $available_patch -lt $required_patch $ \) \) ; then + AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org] + SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' + else + AC_MSG_NOTICE([SWIG executable is '$SWIG']) + SWIG_LIB=`$SWIG -swiglib` + AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB']) + fi + else + AC_MSG_WARN([cannot determine SWIG version]) + SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false' + fi + fi + AC_SUBST([SWIG_LIB]) +]) + +# SWIG_ENABLE_CXX() +# +# Enable SWIG C++ support. This affects all invocations of $(SWIG). +AC_DEFUN([SWIG_ENABLE_CXX],[ + AC_REQUIRE([AC_PROG_SWIG]) + AC_REQUIRE([AC_PROG_CXX]) + SWIG="$SWIG -c++" +]) + +# SWIG_MULTI_MODULE_SUPPORT() +# +# Enable support for multiple modules. This effects all invocations +# of $(SWIG). You have to link all generated modules against the +# appropriate SWIG runtime library. If you want to build Python +# modules for example, use the SWIG_PYTHON() macro and link the +# modules against $(SWIG_PYTHON_LIBS). +# +AC_DEFUN([SWIG_MULTI_MODULE_SUPPORT],[ + AC_REQUIRE([AC_PROG_SWIG]) + SWIG="$SWIG -noruntime" +]) + +# SWIG_PYTHON([use-shadow-classes = {no, yes}]) +# +# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), +# and $(SWIG_PYTHON_OPT) output variables. +# +# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate +# code for Python. Shadow classes are enabled unless the value of the +# optional first argument is exactly 'no'. If you need multi module +# support (provided by the SWIG_MULTI_MODULE_SUPPORT() macro) use +# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It +# contains the SWIG Python runtime library that is needed by the type +# check system for example. +AC_DEFUN([SWIG_PYTHON],[ + AC_REQUIRE([AC_PROG_SWIG]) + AC_REQUIRE([AC_PYTHON_DEVEL]) + test "x$1" != "xno" || swig_shadow=" -noproxy" + AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow]) + AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS]) +]) + + +dnl @synopsis AC_LIB_WAD +dnl +dnl This macro searches for installed WAD library. +dnl +AC_DEFUN([AC_LIB_WAD], +[ + AC_REQUIRE([AC_PYTHON_DEVEL]) + AC_ARG_ENABLE(wad, + AC_HELP_STRING([--enable-wad], [enable wad module]), + [ + case "${enableval}" in + no) ;; + *) if test "x${enableval}" = xyes; + then + check_wad="yes" + fi ;; + esac + ], []) + + if test -n "$check_wad"; + then + AC_CHECK_LIB(wadpy, _init, [WADPY=-lwadpy], [], $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS) + AC_SUBST(WADPY) + fi +]) -- 1.5.6.5

1 0

last-svn-commit-537-gb7eaff0 Revamp the configuration of Extatica's SWIG Python bindings.
by Roland Levillain 03 Nov '10

03 Nov '10

* configure.ac: Here. Lower requirements to SWIG 1.3.35 and Python 2.4. Warn about Python 2.6 and greater. * Makefile.am (SUBDIRS): Remove swig. (SUBDIRS) [SWIG_PYTHON_BINDINGS]: Add swig. --- extatica/ChangeLog | 10 +++++ extatica/Makefile.am | 9 +++- extatica/configure.ac | 101 ++++++++++++++++++++++++++++++------------------ 3 files changed, 80 insertions(+), 40 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 3ab3311..524156e 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,15 @@ 2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + Revamp the configuration of Extatica's SWIG Python bindings. + + * configure.ac: Here. + Lower requirements to SWIG 1.3.35 and Python 2.4. + Warn about Python 2.6 and greater. + * Makefile.am (SUBDIRS): Remove swig. + (SUBDIRS) [SWIG_PYTHON_BINDINGS]: Add swig. + +2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + Use std::string uniformly. * src/data.hh (dyn::data::is_const) diff --git a/extatica/Makefile.am b/extatica/Makefile.am index 737a9f9..44f7b5f 100644 --- a/extatica/Makefile.am +++ b/extatica/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +15,11 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -SUBDIRS = libltdl libmd5 bin src config data test swig +SUBDIRS = libltdl libmd5 bin src config data test + +if SWIG_PYTHON_BINDINGS + SUBDIRS += swig +endif SWIG_PYTHON_BINDINGS ACLOCAL_AMFLAGS = -I config -I libltdl diff --git a/extatica/configure.ac b/extatica/configure.ac index 9f0c0d7..8761e82 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -104,57 +105,81 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) BOOST_FILESYSTEM BOOST_STRING_ALGO -## ------ ## -## Swig. ## -## ------ ## +## ---------------------- ## +## SWIG Python bindings. ## +## ---------------------- ## -# FIXME: Unify the Autoconf machinery w.r.t. SWIG and Python with Olena's. +AC_ARG_ENABLE([swig-python-bindings], + [AS_HELP_STRING([--enable-swig-python-bindings], + [build SWIG Python bindings @<:@default=auto@:>@])], + [], + [enable_swig_python_bindings=auto]) -AC_ARG_WITH([swig], - [AC_HELP_STRING([--with-swig], - [require Swig modules (defaults to auto)])], - [], - [with_swig=auto]) +# Trick borrowed from autotroll.m4 to get a decent flow control with 'break'. +for xtc_ignored in once; do -if test x$with_swig != xno; then - has_swig=yes + # Ensure dynamic libraries are enabled. + if test "x$enable_shared" = xno; then + if test "x$enable_swig_python_bindings" != xauto; then + AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but dynamic +libraries are disabled. Try to invoke configure with `--enable-shared'.]) + fi + break + fi + + # Check for SWIG. + AC_PROG_SWIG([1.3.35]) + if (eval "$SWIG -version") >/dev/null 2>&1; then :; else + if test "x$enable_swig_python_bindings" != xauto; then + AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but SWIG 1.3.35 +(or greater) cannot be found.]) + fi + break + fi # Check for Python. - AM_PATH_PYTHON([2.5]) - adl_CHECK_PYTHON + AM_PATH_PYTHON([2.4], [], [xtc_have_python=no]) + if test "x$xtc_have_python" = xno; then + if test "x$enable_swig_python_bindings" != xauto; then + AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but Python 2.4 +(or greater) cannot be found.]) + fi + break + fi + + # Warn about Python 2.6 which probably won't work with our bindings + # (for the moment). + AS_VERSION_COMPARE([2.5], [$am_cv_python_version], + [AC_MSG_WARN([Python 2.6 and greater may not work with SWIG Python bindings.])]) - # Check for Python and SWIG. + # Set PYTHONINC path. + adl_CHECK_PYTHON + # Check for Python headers. save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$PYTHONINC" - AC_CHECK_HEADERS([Python.h], - [python_headers=yes], - [python_headers=no]) - - if test x$python_headers = xno; then - oln_has_swig=no - if test x$with_swig = xyes; then - AC_MSG_ERROR( - [Python.h is required to build SWIG modules. - Add `-I python_include_path' to `CPPFLAGS' - or `--without-swig' to disable SWIG modules.]) + AC_CHECK_HEADERS([Python.h], [], [xtc_have_python_h=no]) + CPPFLAGS=$save_CPPFLAGS + if test "x$xtc_have_python_h" = xno; then + if test "x$enable_swig_python_bindings" != xauto; then + AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but `Python.h' +cannot be found. Try adding `-I <Python include path>' to `CPPFLAGS'.]) fi + break fi - CPPFLAGS=$save_CPPFLAGS - - AC_PROG_SWIG([1.3.36]) - if (eval "$SWIG -version") >/dev/null 2>&1; then :; else - has_swig=no - fi + # All tests passed: enable SWIG Python bindings. + xtc_swig_python_bindings=yes +done - case $with_swig:$has_swig in - yes:no) - AC_MSG_ERROR([SWIG 1.3.36 is required. - Use `--without-swig' to disable SWIG modules.]);; - esac +AC_MSG_CHECKING([whether to build SWIG Python bindings]) +if test "x$xtc_swig_python_bindings" = "xyes"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) fi -AC_MSG_RESULT([$has_swig]) +AM_CONDITIONAL([SWIG_PYTHON_BINDINGS], + [test "x$xtc_swig_python_bindings" = "xyes"]) AC_CONFIG_FILES([swig/Makefile swig/python/Makefile]) -- 1.5.6.5

1 0

last-svn-commit-536-gb6bb805 Use std::string uniformly.
by Roland Levillain 03 Nov '10

03 Nov '10

* src/data.hh (dyn::data::is_const) * src/function_loader.cc (dyn::gen_cxx_path::gen_cxx_path) (dyn::function_loader_t::gen_cxx): Use std::string::size() instead of std::string::length(). --- extatica/ChangeLog | 9 +++++++++ extatica/src/data.hh | 2 +- extatica/src/function_loader.cc | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index a94bfce..3ab3311 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,14 @@ 2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + Use std::string uniformly. + + * src/data.hh (dyn::data::is_const) + * src/function_loader.cc (dyn::gen_cxx_path::gen_cxx_path) + (dyn::function_loader_t::gen_cxx): + Use std::string::size() instead of std::string::length(). + +2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + Handle 64-bit hosts properly. * src/function_loader.cc (dyn::foreach_path_in_paths) diff --git a/extatica/src/data.hh b/extatica/src/data.hh index 0725464..70b4f99 100644 --- a/extatica/src/data.hh +++ b/extatica/src/data.hh @@ -356,7 +356,7 @@ namespace dyn { { std::string type_(type()); return type_.find("dyn::data_proxy_by_ref<") == 0 - && type_.rfind("const>") == type_.length() - 6; + && type_.rfind("const>") == type_.size() - 6; } meth method(const std::string& method_name); diff --git a/extatica/src/function_loader.cc b/extatica/src/function_loader.cc index 35e5270..090569f 100644 --- a/extatica/src/function_loader.cc +++ b/extatica/src/function_loader.cc @@ -112,7 +112,7 @@ namespace dyn { ostr << "#include "; if (path.find("<") == std::string::npos || path.find("\"") == std::string::npos) - if (path.find(".hh") == path.length() - 3) + if (path.find(".hh") == path.size() - 3) ostr << "\"" << path << "\""; else ostr << "<" << path << ">"; @@ -208,7 +208,7 @@ namespace dyn { str::size_type pos; while ((pos = stripped_type.find(" ")) != str::npos) stripped_type.erase(pos, 1); - std::string::size_type len = stripped_type.length(); + std::string::size_type len = stripped_type.size(); first_type_is_ptr = ((stripped_type.compare(len - 7, 7, "*const>") == 0) || (stripped_type.compare(len - 2, 2, "*>") == 0)); -- 1.5.6.5

1 0

last-svn-commit-535-g2b45fa1 Handle 64-bit hosts properly.
by Roland Levillain 03 Nov '10

03 Nov '10

* src/function_loader.cc (dyn::foreach_path_in_paths) (dyn::function_loader_t::gen_cxx): Use std::string::size_type to store lengths and positions in std::string's. --- extatica/ChangeLog | 9 +++++++++ extatica/src/function_loader.cc | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 698676e..a94bfce 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,14 @@ 2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + Handle 64-bit hosts properly. + + * src/function_loader.cc (dyn::foreach_path_in_paths) + (dyn::function_loader_t::gen_cxx): + Use std::string::size_type to store lengths and positions in + std::string's. + +2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + Fix the stream junction operation. * src/function_loader.cc (join): Take care not to increment a diff --git a/extatica/src/function_loader.cc b/extatica/src/function_loader.cc index 4ace3b0..35e5270 100644 --- a/extatica/src/function_loader.cc +++ b/extatica/src/function_loader.cc @@ -84,7 +84,7 @@ namespace dyn { foreach_path_in_paths(const std::string& header_paths, Fun& fun) { std::list<std::string>::const_iterator it; - unsigned last = 0, pos; + std::string::size_type last = 0, pos; while (true) { pos = header_paths.find(":", last); @@ -98,6 +98,8 @@ namespace dyn { fun(sub); if (pos >= std::string::npos) break; last = pos + 1; + // Invariant. + assert(pos < header_paths.size()); } } @@ -203,10 +205,10 @@ namespace dyn { // Check if the first type is a pointer to choose the good // operator (`.' or `->'). str stripped_type(type); - unsigned pos; + str::size_type pos; while ((pos = stripped_type.find(" ")) != str::npos) stripped_type.erase(pos, 1); - unsigned len = stripped_type.length(); + std::string::size_type len = stripped_type.length(); first_type_is_ptr = ((stripped_type.compare(len - 7, 7, "*const>") == 0) || (stripped_type.compare(len - 2, 2, "*>") == 0)); -- 1.5.6.5

1 0

last-svn-commit-534-g6218ea0 Fix the stream junction operation.
by Roland Levillain 03 Nov '10

03 Nov '10

* src/function_loader.cc (join): Take care not to increment a past-the-end iterator. --- extatica/ChangeLog | 7 +++++++ extatica/src/function_loader.cc | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 6e2abcc..698676e 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,10 @@ +2010-11-03 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the stream junction operation. + + * src/function_loader.cc (join): Take care not to increment a + past-the-end iterator. + 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> * config/boost.m4: Update to upstream version. diff --git a/extatica/src/function_loader.cc b/extatica/src/function_loader.cc index 9dbc138..4ace3b0 100644 --- a/extatica/src/function_loader.cc +++ b/extatica/src/function_loader.cc @@ -63,10 +63,11 @@ OStream& join(const InputIterator& begin, const InputIterator& end, InputIterator it = begin; if (it != end) - ostr << *it; - - for (++it; it != end; ++it) - ostr << elt << *it; + { + ostr << *it; + for (++it; it != end; ++it) + ostr << elt << *it; + } return ostr; } -- 1.5.6.5

1 0

last-svn-commit-533-g4ef5136 config/boost.m4: Update to upstream version.
by Roland Levillain 02 Nov '10

02 Nov '10

--- extatica/ChangeLog | 4 + extatica/config/boost.m4 | 437 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 334 insertions(+), 107 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 64ec7e0..6e2abcc 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,9 @@ 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> + * config/boost.m4: Update to upstream version. + +2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Disable `-Werror' in DYN_CXX_WARNINGS. 2010-04-29 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/extatica/config/boost.m4 b/extatica/config/boost.m4 index b396249..ee3013f 100644 --- a/extatica/config/boost.m4 +++ b/extatica/config/boost.m4 @@ -1,11 +1,18 @@ # boost.m4: Locate Boost headers and libraries for autoconf-based projects. -# Copyright (C) 2007 Benoit Sigoure <tsuna(a)lrde.epita.fr> +# Copyright (C) 2007, 2008, 2009 Benoit Sigoure <tsuna(a)lrde.epita.fr> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # +# Additional permission under section 7 of the GNU General Public +# License, version 3 ("GPLv3"): +# +# If you convey this file as part of a work that contains a +# configuration script generated by Autoconf, you may do so under +# terms of your choice. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -14,10 +21,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# serial 6 -# Original sources can be found at http://repo.or.cz/w/boost.m4.git +m4_define([_BOOST_SERIAL], [m4_translit([ +# serial 12 +], [# +], [])]) + +# Original sources can be found at http://github.com/tsuna/boost.m4 # You can fetch the latest version of the script by doing: -# wget 'http://repo.or.cz/w/boost.m4.git?a=blob_plain;f=build-aux/boost.m4;hb=HEAD' -O boost.m4 +# wget http://github.com/tsuna/boost.m4/raw/master/build-aux/boost.m4 # ------ # # README # @@ -28,99 +39,138 @@ # find the Boost headers of a given (optional) minimum version and it will # define BOOST_CPPFLAGS accordingly. It will add an option --with-boost to # your configure so that users can specify non standard locations. -# For more README and documentation, go to http://repo.or.cz/w/boost.m4.git +# If the user's environment contains BOOST_ROOT and --with-boost was not +# specified, --with-boost=$BOOST_ROOT is implicitly used. +# For more README and documentation, go to http://github.com/tsuna/boost.m4 # Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL. If you don't, don't worry, # simply read the README, it will show you what to do step by step. m4_pattern_forbid([^_?BOOST_]) -# BOOST_REQUIRE([VERSION]) -# ------------------------ + +# _BOOST_SED_CPP(SED-PROGRAM, PROGRAM, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# -------------------------------------------------------- +# Same as AC_EGREP_CPP, but leave the result in conftest.i. +# PATTERN is *not* overquoted, as in AC_EGREP_CPP. It could be useful +# to turn this into a macro which extracts the value of any macro. +m4_define([_BOOST_SED_CPP], +[AC_LANG_PREPROC_REQUIRE()dnl +AC_REQUIRE([AC_PROG_SED])dnl +AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])]) +AS_IF([dnl eval is necessary to expand ac_cpp. +dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell. +dnl Beware of Windows end-of-lines, for instance if we are running +dnl some Windows programs under Wine. In that case, boost/version.hpp +dnl is certainly using "\r\n", but the regular Unix shell will only +dnl strip `\n' with backquotes, not the `\r'. This results in +dnl boost_cv_lib_version='1_37\r' for instance, which breaks +dnl everything else. +dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK +(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + tr -d '\r' | + $SED -n -e "$1" >conftest.i 2>&1], + [$3], + [$4]) +rm -rf conftest* +])# AC_EGREP_CPP + + + +# BOOST_REQUIRE([VERSION], [ACTION-IF-NOT-FOUND]) +# ----------------------------------------------- # Look for Boost. If version is given, it must either be a literal of the form # "X.Y.Z" where X, Y and Z are integers (the ".Z" part being optional) or a # variable "$var". # Defines the value BOOST_CPPFLAGS. This macro only checks for headers with # the required version, it does not check for any of the Boost libraries. -# FIXME: Add a 2nd optional argument so that it's not fatal if Boost isn't found -# and add an AC_DEFINE to tell whether HAVE_BOOST. +# On # success, defines HAVE_BOOST. On failure, calls the optional +# ACTION-IF-NOT-FOUND action if one was supplied. +# Otherwise aborts with an error message. AC_DEFUN([BOOST_REQUIRE], -[dnl First find out what kind of argument we have. -dnl If we have an empty argument, there is no constraint on the version of -dnl Boost to use. If it's a literal version number, we can split it in M4 (so -dnl the resulting configure script will be smaller/faster). Otherwise we do -dnl the splitting at runtime. -m4_bmatch([$1], - [^ *$], [m4_pushdef([BOOST_VERSION_REQ], [])dnl - boost_version_major=0 - boost_version_minor=0 - boost_version_subminor=0 -], - [^[0-9]+$[-._][0-9]+$*$], - [m4_pushdef([BOOST_VERSION_REQ], [ version >= $1])dnl - boost_version_major=m4_bregexp([$1], [^$[0-9]+$], [\1]) - boost_version_minor=m4_bregexp([$1], [^[0-9]+[-._]$[0-9]+$], [\1]) - boost_version_subminor=m4_bregexp([$1], [^[0-9]+[-._][0-9]+[-._]$[0-9]+$], [\1]) -], - [^\$[a-zA-Z_]+$], - [m4_pushdef([BOOST_VERSION_REQ], [])dnl - boost_version_major=`expr "X$1" : 'X$[[^-._]]*$'` - boost_version_minor=`expr "X$1" : 'X[[0-9]]*[[-._]]$[[^-._]]*$'` - boost_version_subminor=`expr "X$1" : 'X[[0-9]]*[[-._]][[0-9]]*[[-._]]$[[0-9]]*$'` - case $boost_version_major:$boost_version_minor in #( - *: | :* | *[[^0-9]]*:* | *:*[[^0-9]]*) - AC_MSG_ERROR([[Invalid argument for REQUIRE_BOOST: `$1']]) - ;; - esac -], - [m4_fatal(Invalid argument: `$1')] -)dnl +[AC_REQUIRE([AC_PROG_CXX])dnl +AC_REQUIRE([AC_PROG_GREP])dnl +echo "$as_me: this is boost.m4[]_BOOST_SERIAL" >&AS_MESSAGE_LOG_FD +boost_save_IFS=$IFS +boost_version_req=$1 +IFS=. +set x $boost_version_req 0 0 0 +IFS=$boost_save_IFS +shift +boost_version_req=`expr "$[1]" '*' 100000 + "$[2]" '*' 100 + "$[3]"` AC_ARG_WITH([boost], [AS_HELP_STRING([--with-boost=DIR], - [prefix of Boost]BOOST_VERSION_REQ[ @<:@guess@:>@])])dnl + [prefix of Boost $1 @<:@guess@:>@])])dnl +AC_ARG_VAR([BOOST_ROOT],[Location of Boost installation])dnl +# If BOOST_ROOT is set and the user has not provided a value to +# --with-boost, then treat BOOST_ROOT as if it the user supplied it. +if test x"$BOOST_ROOT" != x; then + if test x"$with_boost" = x; then + AC_MSG_NOTICE([Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT]) + with_boost=$BOOST_ROOT + else + AC_MSG_NOTICE([Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost]) + fi +fi AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"]) - AC_CACHE_CHECK([for Boost headers[]BOOST_VERSION_REQ], +boost_save_CPPFLAGS=$CPPFLAGS + AC_CACHE_CHECK([for Boost headers version >= $boost_version_req], [boost_cv_inc_path], [boost_cv_inc_path=no AC_LANG_PUSH([C++])dnl - boost_subminor_chk= - test x"$boost_version_subminor" != x \ - && boost_subminor_chk="|| (B_V_MAJ == $boost_version_major \ -&& B_V_MIN == $boost_version_minor \ -&& B_V_SUB < $boost_version_subminor)" - for boost_dir in "$with_boost/include" '' \ - /opt/local/include /usr/local/include /opt/include /usr/include \ - "$with_boost" C:/Boost/include +m4_pattern_allow([^BOOST_VERSION$])dnl + AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#include <boost/version.hpp> +#if !defined BOOST_VERSION +# error BOOST_VERSION is not defined +#elif BOOST_VERSION < $boost_version_req +# error Boost headers version < $boost_version_req +#endif +]])]) + # If the user provided a value to --with-boost, use it and only it. + case $with_boost in #( + ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \ + /usr/include C:/Boost/include;; #( + *) set x "$with_boost/include" "$with_boost";; + esac + shift + for boost_dir do # Without --layout=system, Boost (or at least some versions) installs # itself in <prefix>/include/boost-<version>. This inner loop helps to # find headers in such directories. + # + # Any ${boost_dir}/boost-x_xx directories are searched in reverse version + # order followed by ${boost_dir}. The final '.' is a sentinel for + # searching $boost_dir" itself. Entries are whitespace separated. + # # I didn't indent this loop on purpose (to avoid over-indented code) - for boost_inc in "$boost_dir" "$boost_dir"/boost-* + boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \ + && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \ + && echo .` + for boost_inc in $boost_layout_system_search_list do - # $boost_inc can often be a symlink, so keep -e here. - test -e "$boost_inc" || continue - # Ensure that version.hpp exists: we're going to read it. Moreover, - # Boost could be reachable thanks to the default include path so we can - # mistakenly accept a wrong include path without this check. - test -e "$boost_inc/boost/version.hpp" || continue - boost_save_CPPFLAGS=$CPPFLAGS - test x"$boost_inc" != x && CPPFLAGS="$CPPFLAGS -I$boost_inc" -m4_pattern_allow([^BOOST_VERSION$])dnl - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/version.hpp> -#ifndef BOOST_VERSION -# error BOOST_VERSION is not defined -#endif -#define B_V_MAJ (BOOST_VERSION / 100000) -#define B_V_MIN (BOOST_VERSION / 100 % 1000) -#define B_V_SUB (BOOST_VERSION % 100) -#if (B_V_MAJ < $boost_version_major) \ - || (B_V_MAJ == $boost_version_major \ - && B_V_MIN < $boost_version_minor) $boost_subminor_chk -# error Boost headers version < $1 -#endif -]])], [boost_cv_inc_path=yes], [boost_cv_version=no]) - CPPFLAGS=$boost_save_CPPFLAGS + if test x"$boost_inc" != x.; then + boost_inc="$boost_dir/$boost_inc" + else + boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list + fi + if test x"$boost_inc" != x; then + # We are going to check whether the version of Boost installed + # in $boost_inc is usable by running a compilation that + # #includes it. But if we pass a -I/some/path in which Boost + # is not installed, the compiler will just skip this -I and + # use other locations (either from CPPFLAGS, or from its list + # of system include directories). As a result we would use + # header installed on the machine instead of the /some/path + # specified by the user. So in that precise case (trying + # $boost_inc), make sure the version.hpp exists. + # + # Use test -e as there can be symlinks. + test -e "$boost_inc/boost/version.hpp" || continue + CPPFLAGS="$CPPFLAGS -I$boost_inc" + fi + AC_COMPILE_IFELSE([], [boost_cv_inc_path=yes], [boost_cv_version=no]) if test x"$boost_cv_inc_path" = xyes; then if test x"$boost_inc" != x; then boost_cv_inc_path=$boost_inc @@ -133,28 +183,49 @@ AC_LANG_POP([C++])dnl ]) case $boost_cv_inc_path in #( no) - AC_MSG_ERROR([Could not find Boost headers[]BOOST_VERSION_REQ]) + boost_errmsg="cannot find Boost headers version >= $boost_version_req" + m4_if([$2], [], [AC_MSG_ERROR([$boost_errmsg])], + [AC_MSG_NOTICE([$boost_errmsg])]) + $2 ;;#( yes) BOOST_CPPFLAGS= ;;#( *) - BOOST_CPPFLAGS="-I$boost_cv_inc_path" + AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"]) ;; esac -AC_SUBST([BOOST_CPPFLAGS])dnl + if test x"$boost_cv_inc_path" != xno; then + AC_DEFINE([HAVE_BOOST], [1], + [Defined if the requested minimum BOOST version is satisfied]) AC_CACHE_CHECK([for Boost's header version], [boost_cv_lib_version], [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl - boost_cv_lib_version=unknown - boost_sed_version='/^.*BOOST_LIB_VERSION.*"$[[^"]]*$".*$/!d;s//\1/' - boost_version_hpp="$boost_inc/boost/version.hpp" - test -e "$boost_version_hpp" \ - && boost_cv_lib_version=`sed "$boost_sed_version" "$boost_version_hpp"` - ]) -m4_popdef([BOOST_VERSION_REQ])dnl + _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}], + [#include <boost/version.hpp> +boost-lib-version = BOOST_LIB_VERSION], + [boost_cv_lib_version=`cat conftest.i`])]) + # e.g. "134" for 1_34_1 or "135" for 1_35 + boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` + case $boost_major_version in #( + '' | *[[!0-9]]*) + AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version]) + ;; + esac +fi +CPPFLAGS=$boost_save_CPPFLAGS ])# BOOST_REQUIRE +# BOOST_STATIC() +# -------------- +# Add the "--enable-static-boost" configure argument. If this argument is given +# on the command line, static versions of the libraries will be looked up. +AC_DEFUN([BOOST_STATIC], + [AC_ARG_ENABLE([static-boost], + [AC_HELP_STRING([--enable-static-boost], + [Prefer the static boost libraries over the shared ones [no]])], + [enable_static_boost=yes], + [enable_static_boost=no])])# BOOST_STATIC # BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND]) # -------------------------------------------------------------------------- @@ -162,13 +233,19 @@ m4_popdef([BOOST_VERSION_REQ])dnl # some parts of the Boost library which are only made of headers and don't # require linking (such as Boost.Foreach). # -# Default ACTION-IF-NOT-FOUND: Fail with a fatal error. +# Default ACTION-IF-NOT-FOUND: Fail with a fatal error unless Boost couldn't be +# found in the first place, in which case by default a notice is issued to the +# user. Presumably if we haven't died already it's because it's OK to not have +# Boost, which is why only a notice is issued instead of a hard error. # # Default ACTION-IF-FOUND: define the preprocessor symbol HAVE_<HEADER-NAME> in # case of success # (where HEADER-NAME is written LIKE_THIS, e.g., # HAVE_BOOST_FOREACH_HPP). AC_DEFUN([BOOST_FIND_HEADER], [AC_REQUIRE([BOOST_REQUIRE])dnl +if test x"$boost_cv_inc_path" = xno; then + m4_default([$2], [AC_MSG_NOTICE([Boost not available, not searching for $1])]) +else AC_LANG_PUSH([C++])dnl boost_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" @@ -178,6 +255,7 @@ AC_CHECK_HEADER([$1], [m4_default([$2], [AC_MSG_ERROR([cannot find $1])])]) CPPFLAGS=$boost_save_CPPFLAGS AC_LANG_POP([C++])dnl +fi ])# BOOST_FIND_HEADER @@ -203,9 +281,14 @@ AC_LANG_POP([C++])dnl # ... If you want to make sure you have a specific version of Boost # (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro. AC_DEFUN([BOOST_FIND_LIB], -[AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl -AC_REQUIRE([BOOST_REQUIRE])dnl +[AC_REQUIRE([BOOST_REQUIRE])dnl +AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl +AC_REQUIRE([BOOST_STATIC])dnl AC_REQUIRE([_BOOST_GUESS_WHETHER_TO_USE_MT])dnl +if test x"$boost_cv_inc_path" = xno; then + AC_MSG_NOTICE([Boost not available, not searching for the Boost $1 library]) +else +dnl The else branch is huge and wasn't intended on purpose. AC_LANG_PUSH([C++])dnl AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl @@ -227,10 +310,18 @@ AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib], mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*$.*$'`;; #( *) boost_mt=; boost_rtopt=$2;; esac - # If the PREFERRED-RT-OPT are not empty, prepend a `-'. + if test $enable_static_boost = yes; then + boost_rtopt="s$boost_rtopt" + fi + # Find the proper debug variant depending on what we've been asked to find. case $boost_rtopt in #( - *[[a-z0-9A-Z]]*) boost_rtopt="-$boost_rtopt";; + *d*) boost_rt_d=$boost_rtopt;; #( + *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn') + boost_rt_d=`echo "$boost_rtopt" | sed 's/$s*g*$$p*n*$/\1\2/'`;; #( + *) boost_rt_d='-d';; esac + # If the PREFERRED-RT-OPT are not empty, prepend a `-'. + test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" $boost_guess_use_mt && boost_mt=-mt # Look for the abs path the static archive. # $libext is computed by Libtool but let's make sure it's non empty. @@ -258,7 +349,7 @@ dnl empty because the test file is generated only once above (before we dnl start the for loops). AC_COMPILE_IFELSE([], [ac_objext=do_not_rm_me_plz], - [AC_MSG_ERROR([Cannot compile a test that uses Boost $1])]) + [AC_MSG_ERROR([cannot compile a test that uses Boost $1])]) ac_objext=$boost_save_ac_objext boost_failed_libs= # Don't bother to ident the 6 nested for loops, only the 2 innermost ones @@ -269,9 +360,8 @@ for boost_mt_ in $boost_mt -mt ''; do for boost_rtopt_ in $boost_rtopt '' -d; do for boost_lib in \ boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ - boost_$1$boost_tag_$boost_mt_$boost_ver_ \ boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \ - boost_$1$boost_tag_$boost_mt_ \ + boost_$1$boost_tag_$boost_mt_$boost_ver_ \ boost_$1$boost_tag_$boost_ver_ do # Avoid testing twice the same lib @@ -321,7 +411,8 @@ done rm -f conftest.$ac_objext ]) case $Boost_lib in #( - no) AC_MSG_ERROR([Could not find the flags to link with Boost $1]) + no) _AC_MSG_LOG_CONFTEST + AC_MSG_ERROR([cannot not find the flags to link with Boost $1]) ;; esac AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS]) @@ -331,6 +422,7 @@ AS_VAR_POPDEF([Boost_lib])dnl AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl AS_VAR_POPDEF([Boost_lib_LIBS])dnl AC_LANG_POP([C++])dnl +fi ])# BOOST_FIND_LIB @@ -342,6 +434,20 @@ AC_LANG_POP([C++])dnl # The page http://beta.boost.org/doc/libs is useful: it gives the first release # version of each library (among other things). +# BOOST_ARRAY() +# ------------- +# Look for Boost.Array +AC_DEFUN([BOOST_ARRAY], +[BOOST_FIND_HEADER([boost/array.hpp])]) + + +# BOOST_ASIO() +# ------------ +# Look for Boost.Asio (new in Boost 1.35). +AC_DEFUN([BOOST_ASIO], +[AC_REQUIRE([BOOST_SYSTEM])dnl +BOOST_FIND_HEADER([boost/asio.hpp])]) + # BOOST_BIND() # ------------ @@ -372,12 +478,26 @@ AC_DEFUN([BOOST_DATE_TIME], # BOOST_FILESYSTEM([PREFERRED-RT-OPT]) # ------------------------------------ -# Look for Boost.Filesystem. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -# Do not check for boost/filesystem.hpp because this file was introduced in 1.34. +# Look for Boost.Filesystem. For the documentation of PREFERRED-RT-OPT, see +# the documentation of BOOST_FIND_LIB above. +# Do not check for boost/filesystem.hpp because this file was introduced in +# 1.34. AC_DEFUN([BOOST_FILESYSTEM], -[BOOST_FIND_LIB([filesystem], [$1], +[# Do we have to check for Boost.System? This link-time dependency was +# added as of 1.35.0. If we have a version <1.35, we must not attempt to +# find Boost.System as it didn't exist by then. +if test $boost_major_version -ge 135; then +BOOST_SYSTEM([$1]) +fi # end of the Boost.System check. +boost_filesystem_save_LIBS=$LIBS +boost_filesystem_save_LDFLAGS=$LDFLAGS +m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl +LIBS="$LIBS $BOOST_SYSTEM_LIBS" +LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" +BOOST_FIND_LIB([filesystem], [$1], [boost/filesystem/path.hpp], [boost::filesystem::path p;]) +LIBS=$boost_filesystem_save_LIBS +LDFLAGS=$boost_filesystem_save_LDFLAGS ])# BOOST_FILESYSTEM @@ -441,6 +561,40 @@ AC_DEFUN([BOOST_LAMBDA], [BOOST_FIND_HEADER([boost/lambda/lambda.hpp])]) +# BOOST_MATH() +# ------------ +# Look for Boost.Math +# TODO: This library isn't header-only but it comes in multiple different +# flavors that don't play well with BOOST_FIND_LIB (e.g, libboost_math_c99, +# libboost_math_c99f, libboost_math_c99l, libboost_math_tr1, +# libboost_math_tr1f, libboost_math_tr1l). This macro must be fixed to do the +# right thing anyway. +AC_DEFUN([BOOST_MATH], +[BOOST_FIND_HEADER([boost/math/special_functions.hpp])]) + + +# BOOST_MULTIARRAY() +# ------------------ +# Look for Boost.MultiArray +AC_DEFUN([BOOST_MULTIARRAY], +[BOOST_FIND_HEADER([boost/multi_array.hpp])]) + + +# BOOST_NUMERIC_CONVERSION() +# -------------------------- +# Look for Boost.NumericConversion (policy-based numeric conversion) +AC_DEFUN([BOOST_NUMERIC_CONVERSION], +[BOOST_FIND_HEADER([boost/numeric/conversion/converter.hpp]) +])# BOOST_NUMERIC_CONVERSION + + +# BOOST_OPTIONAL() +# ---------------- +# Look for Boost.Optional +AC_DEFUN([BOOST_OPTIONAL], +[BOOST_FIND_HEADER([boost/optional.hpp])]) + + # BOOST_PREPROCESSOR() # -------------------- # Look for Boost.Preprocessor @@ -509,6 +663,13 @@ BOOST_FIND_HEADER([boost/shared_ptr.hpp]) ]) +# BOOST_STATICASSERT() +# -------------------- +# Look for Boost.StaticAssert +AC_DEFUN([BOOST_STATICASSERT], +[BOOST_FIND_HEADER([boost/static_assert.hpp])]) + + # BOOST_STRING_ALGO() # ------------------- # Look for Boost.StringAlgo @@ -517,6 +678,18 @@ AC_DEFUN([BOOST_STRING_ALGO], ]) +# BOOST_SYSTEM([PREFERRED-RT-OPT]) +# -------------------------------- +# Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the +# documentation of BOOST_FIND_LIB above. This library was introduced in Boost +# 1.35.0. +AC_DEFUN([BOOST_SYSTEM], +[BOOST_FIND_LIB([system], [$1], + [boost/system/error_code.hpp], + [boost::system::error_code e; e.clear();]) +])# BOOST_SYSTEM + + # BOOST_TEST([PREFERRED-RT-OPT]) # ------------------------------ # Look for Boost.Test. For the documentation of PREFERRED-RT-OPT, see the @@ -582,6 +755,13 @@ AC_DEFUN([BOOST_TUPLE], [BOOST_FIND_HEADER([boost/tuple/tuple.hpp])]) +# BOOST_TYPETRAITS() +# -------------------- +# Look for Boost.TypeTraits +AC_DEFUN([BOOST_TYPETRAITS], +[BOOST_FIND_HEADER([boost/type_traits.hpp])]) + + # BOOST_UTILITY() # --------------- # Look for Boost.Utility (noncopyable, result_of, base-from-member idiom, @@ -600,12 +780,33 @@ BOOST_FIND_HEADER([boost/variant.hpp])]) # BOOST_WAVE([PREFERRED-RT-OPT]) # ------------------------------ +# NOTE: If you intend to use Wave/Spirit with thread support, make sure you +# call BOOST_THREADS first. # Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the # documentation of BOOST_FIND_LIB above. AC_DEFUN([BOOST_WAVE], -[BOOST_FIND_LIB([wave], [$1], +[AC_REQUIRE([BOOST_FILESYSTEM])dnl +AC_REQUIRE([BOOST_DATE_TIME])dnl +boost_wave_save_LIBS=$LIBS +boost_wave_save_LDFLAGS=$LDFLAGS +m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl +LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS\ +$BOOST_THREAD_LIBS" +LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS\ +$BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS" +BOOST_FIND_LIB([wave], [$1], [boost/wave.hpp], - [boost::wave::token_id id; get_token_name(id);])]) + [boost::wave::token_id id; get_token_name(id);]) +LIBS=$boost_wave_save_LIBS +LDFLAGS=$boost_wave_save_LDFLAGS +])# BOOST_WAVE + + +# BOOST_XPRESSIVE() +# ----------------- +# Look for Boost.Xpressive (new since 1.36.0). +AC_DEFUN([BOOST_XPRESSIVE], +[BOOST_FIND_HEADER([boost/xpressive/xpressive.hpp])]) # ----------------- # @@ -692,9 +893,11 @@ m4_define([_BOOST_gcc_test], # build. The Boost build system seems to call this a `tag'. AC_DEFUN([_BOOST_FIND_COMPILER_TAG], [AC_REQUIRE([AC_PROG_CXX])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag], -[AC_LANG_PUSH([C++])dnl - boost_cv_lib_tag=unknown +[boost_cv_lib_tag=unknown +if test x$boost_cv_inc_path != xno; then + AC_LANG_PUSH([C++])dnl # The following tests are mostly inspired by boost/config/auto_link.hpp # The list is sorted to most recent/common to oldest compiler (in order # to increase the likelihood of finding the right compiler with the @@ -708,8 +911,9 @@ AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag] # como, edg, kcc, bck, mp, sw, tru, xlc # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines # the same defines as GCC's). - # TODO: Move the test on GCC 4.3 up once it's released. + # TODO: Move the test on GCC 4.4 up once it's released. for i in \ + _BOOST_gcc_test(4, 3) \ _BOOST_gcc_test(4, 2) \ _BOOST_gcc_test(4, 1) \ _BOOST_gcc_test(4, 0) \ @@ -718,7 +922,8 @@ AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag] || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \ _BOOST_gcc_test(3, 4) \ _BOOST_gcc_test(3, 3) \ - "defined _MSC_VER && _MSC_VER >= 1400 @ vc80" \ + "defined _MSC_VER && _MSC_VER >= 1500 @ vc90" \ + "defined _MSC_VER && _MSC_VER == 1400 @ vc80" \ _BOOST_gcc_test(3, 2) \ "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \ _BOOST_gcc_test(3, 1) \ @@ -727,7 +932,7 @@ AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag] "defined __ICC && (defined __unix || defined __unix__) @ il" \ "defined __ICL @ iw" \ "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ - _BOOST_gcc_test(4, 3) \ + _BOOST_gcc_test(4, 4) \ _BOOST_gcc_test(2, 95) \ "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ @@ -745,20 +950,29 @@ AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag] ]])], [boost_cv_lib_tag=$boost_tag; break], []) done AC_LANG_POP([C++])dnl -]) case $boost_cv_lib_tag in #( # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed # to "gcc41" for instance. + *-gcc | *'-gcc ') :;; #( Don't re-add -gcc: it's already in there. gcc*) + boost_tag_x= + case $host_os in #( + darwin*) + if test $boost_major_version -ge 136; then + # The `x' added in r46793 of Boost. + boost_tag_x=x + fi;; + esac # We can specify multiple tags in this variable because it's used by # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ... - boost_cv_lib_tag="$boost_cv_lib_tag -gcc" + boost_cv_lib_tag="$boost_tag_x$boost_cv_lib_tag -${boost_tag_x}gcc" ;; #( unknown) AC_MSG_WARN([[could not figure out which toolset name to use for $CXX]]) boost_cv_lib_tag= ;; esac +fi])dnl end of AC_CACHE_CHECK ])# _BOOST_FIND_COMPILER_TAG @@ -784,11 +998,14 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ # rm -f conftest.$ac_objext in between to really different tests, otherwise # you will try to link a conftest.o left behind by a previous test. # Used to aggressively optimize BOOST_FIND_LIB (see the big comment in this -# macro) +# macro). +# +# Don't use "break" in the actions, as it would short-circuit some code +# this macro runs after the actions. m4_define([_BOOST_AC_LINK_IFELSE], [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl rm -f conftest$ac_exeext -boost_ac_ext_save=$ac_ext +boost_save_ac_ext=$ac_ext boost_use_source=: # If we already have a .o, re-use it. We change $ac_ext so that $ac_link # tries to link the existing object file instead of compiling from source. @@ -807,9 +1024,15 @@ dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough. _AC_MSG_LOG_CONFTEST fi $3]) +ac_objext=$boost_save_ac_objext +ac_ext=$boost_save_ac_ext dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization) dnl information created by the PGI compiler (conftest_ipa8_conftest.oo), dnl as it would interfere with the next link command. rm -f core conftest.err conftest_ipa8_conftest.oo \ conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl ])# _BOOST_AC_LINK_IFELSE + +# Local Variables: +# mode: autoconf +# End: -- 1.5.6.5

1 0

last-svn-commit-532-gae681a7 configure.ac: Disable `-Werror' in DYN_CXX_WARNINGS.
by Roland Levillain 02 Nov '10

02 Nov '10

--- extatica/ChangeLog | 4 ++++ extatica/configure.ac | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index b259605..64ec7e0 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,7 @@ +2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Disable `-Werror' in DYN_CXX_WARNINGS. + 2010-04-29 Roland Levillain <roland(a)lrde.epita.fr> Remove Vcs helper. diff --git a/extatica/configure.ac b/extatica/configure.ac index bbb57ea..9f0c0d7 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -60,8 +60,7 @@ DYN_CXX_WARNINGS([[-Wall], [-Wwrite-strings], [-Wbad-function-cast], [-Wmissing-declarations], - [-Wnested-externs], - [-Werror]]) + [-Wnested-externs]]) ## -------- ## ## Libtool. ## -- 1.5.6.5

1 0

last-svn-commit-544-ga3647b2 Use intermediate variables in src/Makefile.am.
by Roland Levillain 02 Nov '10

02 Nov '10

* src/Makefile.am (RUBY_LIBRUBYARG_SHARED): New variable. Use it... (libdyn_la_LIBADD): ...here. (RUBY_topdir): New variable. Use it... (libdyn_la_CPPFLAGS): ...here. --- extatica/ChangeLog | 11 +++++++++++ extatica/src/Makefile.am | 25 +++++++++++++++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 1cdaa81..2a07f08 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,16 @@ 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> + Use intermediate variables in src/Makefile.am. + + * src/Makefile.am (RUBY_LIBRUBYARG_SHARED): New variable. + Use it... + (libdyn_la_LIBADD): ...here. + (RUBY_topdir): New variable. + Use it... + (libdyn_la_CPPFLAGS): ...here. + +2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> + * INSTALL: New (generated by Automake). 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/extatica/src/Makefile.am b/extatica/src/Makefile.am index 0f5fd9b..5f91f40 100644 --- a/extatica/src/Makefile.am +++ b/extatica/src/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -70,13 +71,25 @@ if DARWIN libdyn_la_SOURCES += libiberty-fix.c endif DARWIN -libdyn_la_LIBADD = @RUBY_LIBRUBYARG_SHARED@ $(LIBLTDL) \ - $(top_builddir)/libmd5/libmd5.la $(BOOST_FILESYSTEM_LIBS) +RUBY_LIBRUBYARG_SHARED = @RUBY_LIBRUBYARG_SHARED@ + +libdyn_la_LIBADD = \ + $(RUBY_LIBRUBYARG_SHARED) \ + $(LIBLTDL) \ + $(top_builddir)/libmd5/libmd5.la \ + $(BOOST_FILESYSTEM_LIBS) libdyn_la_DEPENDENCIES = $(LTDLDEPS) -libdyn_la_CPPFLAGS = \ - $(LTDLINCL) $(BOOST_CPPFLAGS) \ - -I$(top_builddir) -I$(srcdir) -I. -I$(top_srcdir)/libmd5 -I@RUBY_topdir@ +RUBY_topdir = @RUBY_topdir@ + +libdyn_la_CPPFLAGS = \ + $(LTDLINCL) \ + $(BOOST_CPPFLAGS) \ + -I$(top_builddir) \ + -I$(srcdir) \ + -I. \ + -I$(top_srcdir)/libmd5 \ + -I$(RUBY_topdir) libdyn_la_CXXFLAGS = $(WARNING_CXXFLAGS) libdyn_la_LDFLAGS = -version-info 0:1:0 $(BOOST_FILESYSTEM_LDFLAGS) -- 1.5.6.5

1 0