- Olena-patches

4241: Update INSTALL, NEWS and README files.
by Guillaume Lazzara 06 Jul '09

06 Jul '09

* INSTALL, * NEWS, * README: update. --- ChangeLog | 8 ++ INSTALL | 16 +++- NEWS | 9 +- README | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 327 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5ac9ba..76e466e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-07-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Update INSTALL, NEWS and README files. + + * INSTALL, + * NEWS, + * README: update. + 2009-07-03 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * configure.ac: Adjust warning flags if CXX is set to icpc. diff --git a/INSTALL b/INSTALL index 9a6bba1..946675f 100644 --- a/INSTALL +++ b/INSTALL @@ -30,9 +30,21 @@ Optional: - the `texinfo' utilities from GNU + - latex2html + + * to use various image types: + - libMagick++ + + - libTiff + + - libGdcm + * to develop _in_ Olena: - GNU Autotools (Autoconf 2.54, Automake 1.7) + * to develop _in_ Swilena (Python Bindings): + - Swig + 1.2 Configuration ================= @@ -213,7 +225,9 @@ programs with: Olena has been tested on the following configurations : System Compiler -Linux g++ 4.0, 4.1, 4.2 +Linux g++ 3.3, 3.4, 4.0, 4.1, 4.2 + icc 10.1, 11.0 +Linux-64 g++ 4.1 MacOS X g++ 4.0.1 diff --git a/NEWS b/NEWS index e6aca6a..9d0de6c 100644 --- a/NEWS +++ b/NEWS @@ -14,9 +14,12 @@ The Swilena Python Shell (sps) allows interactive Olena sessions. - * Olena contains tools for Document Image Analysis developed - in the context of the SCRIBO project - (http://www.scribo.ws/) + * A reference documentation including a tutorial and a quick + reference guide have been started. They do not cover the + whole library yet. + + * Olena includes some demos which use Milena, the core C++ + library. * Olena 0.11 February 21, 2007 diff --git a/README b/README index d9a09cb..f887435 100644 --- a/README +++ b/README @@ -1,30 +1,241 @@ -Abstract -******** +Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) -This is a public testing version of Olena, a generic image processing -library in C++. +This file is part of Olena. - Please read the files INSTALL for information about building and -installing Olena. +Olena is free software: you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation, version 2 of the License. + +The complete GNU General Public Licence Notice can be found as the +'COPYING' file in the root directory. + +======================= + Introduction to Olena +======================= + +Olena_, a platform dedicated to image processing. + +.. _Olena: http:://olena.lrde.epita.fr + + +Overview +======== - Olena is a project developed by the EPITA Research and Development -Laboratory (<http://www.lrde.epita.fr>) since 1997. We did numerous -prototypes and throwaway experiments before settling into the kind of -programming paradigm which is finally here. +Olena is a platform dedicated to image processing. At the moment it is +mainly composed of a C++ library: Milena. This library features many +tools to easily perform image processing tasks. Its main +characteristic is its genericity: it allows to write an algorithm once +and run it over many kinds of images (grey scale, color, 1D, 2D, 3D, +...). - The documentation does not cover the whole project yet. In the `doc/' -directory you will find the first draft of a reference manual. It -includes a quick reference guide and a tutorial. This is a good start. -In `milena/tools', `milena/doc/tutorial/samples' and `milena/doc/examples' -few sample programs are available. Most of them are already used to -illustrate the tutorial. -For the rest, we're afraid you will have to dig the code or e-mail us. +Olena is a project developed by the `EPITA Research and Development +Laboratory (LRDE)`__ since 1997. We did numerous prototypes and +throwaway experiments before settling into the kind of programming +paradigm which is finally here. + +__ http://www.lrde.epita.fr + +We do our image processing research using this library, but most +importantly we have gathered (and still do) generic programming +expertise from the library development. + +Yet, Olena is an ongoing development project. Few algorithms or +definitions may change in a near future. A list of potential changes +is maintained here : +https://olena.lrde.epita.fr/FeaturesSubjectToChange. + +Likewise, the documentation does not cover the whole project yet. In the +`doc/' directory you will find the first draft of a reference +manual. It includes a quick reference guide and a tutorial. This is a +good start. In `milena/tools' and `milena/doc/examples' few sample +programs are available. Most of them are already used to illustrate +the tutorial. For the rest, we're afraid you will have to dig the +code or e-mail us. Please direct any question or comments to <olena(a)lrde.epita.fr>, or <olena-bugs(a)lrde.epita.fr>. Olena also has a web page, located at -<http://www.lrde.epita.fr/Olena>. +<http://olena.lrde.epita.fr>. + + +Installation +============ + +To install Olena on your system, type in the classical sequence at +the command prompt:: + + ./configure + make + make install (as root) + +Note that an installation is specific to the compiler used to install +it. Indeed, the call to ``./configure`` enables some workarounds and, +consequently, users must compile with the same compiler to avoid +compatibility problems. + +Between ``make`` and ``make install``, you may also want to run:: + + make check + + ``make check`` will run the test suite to check the whole library. +Running the test suite may require up several hours. + + +Please read the INSTALL file for more information about building and +installing Olena. + + +Additional features +------------------- + +Python bindings are provided thanks to Swilena. It is disabled by +default because it requires extra dependencies: Swig. To enable the +compilation of this module use:: + + ./configure --enable-swilena + + +Sample tools are shipped in the tarball. To enable the compilation of + these tools use:: ./configure --enable-tools + + +Sample applications are shipped in the tarball. To Enable the +compilation of these applications use:: + + ./configure --enable-apps + + +To read/write TIFF images with Olena, libtiff is required. To specify +the base directory, use:: + + ./configure --with-tiff=/path/to/basedir + + +To read/write GDCM images with Olena, libgdcm is required. To specify +the base directory, use:: + + ./configure --with-gdcm=/path/to/basedir + + + +Layout of the tarball +--------------------- + +The Olena project directory layout is as follows: + +build-aux + Auxialiary tools used by the GNU Build System during ``configure`` + and ``make`` stages. + +external + Sources of Shipped dependencies. + + +m4 + Portability macros from the ``gnulib`` library. + +milena + + apps + Application examples. + + mln + Header of the Milena library. + + tests + The test suite. + + doc + The documentation. + + tools + Example tools. + + mesh + Mesh images. + + img + Test images. + + demos + Demos of Milena. + + +swilena + Python binding sources. + + +Requirements +============ + +Olena has been tested on the following configurations: + +System Compiler +Linux g++ 3.3, 3.4, 4.0, 4.1, 4.2 + icc 10.1, 11.0 +Linux-64 g++ 4.1 +MacOS X g++ 4.0.1 + + +According to the wanted features, some dependencies may be required: + + +To enable I/O with TIFF images, `libtiff`_ must be installed. + +.. _libtiff: http://www.libtiff.org/ + +To enable I/O with GDCM images, `libgdcm`_ must be installed. + +.. _libgdcm: http://sourceforge.net/apps/mediawiki/gdcm/ + + +To support many image formats in Olena's I/O system, `libmagick++`_ must +be installed. + +.. _libmagick++: Please see your distribution package manager. + + +`Boost`_ may be needed if you want to support tuple accumulators. + +.. _Boost: http://www.boost.org/ + + +See Also +======== + +There are other sources of interest in the distribution. + +- Headline news about the project can be found in the file ``NEWS`` at + the root of the source tree. + +- The library reference HTML documentation, generated by Doxygen_, is + located in ``doc/user/html/``. + +.. _Doxygen: http://www.doxygen.org + + +License +======= + +Olena is released under the GNU General Public Licence. See the file +``COPYING`` (at the root of the source tree) for details. + + +Contacts +======== + +The team can be reached by mail at olena(a)lrde.epita.fr. Snail mail +addresses follow. + +* Olena - LRDE + + | Laboratoire de Recherche et Développement de l'EPITA + | 14-16 rue Voltaire + | 94276 Le Kremlin-Bicêtre CEDEX + | France + + Bibliography ============ @@ -32,52 +243,82 @@ Bibliography Further information about Olena can be found into the following related papers: - * Thierry Géraud, Yoann Fabre, Dimitri Papadopoulos-Orfanos, and - Jean-François Mangin. `Vers une réutilisabilité totale des - algorithmes de traitement d'images'. In the Proceedings of the - 17th Symposium GRETSI on Signal and Image Processing, vol. 2, - pages 331-334, Vannes, France, September 1999. In French - (available in English as Technical Report 9902: `Towards a Total - Reusability of Image Processing Algorithms'). - - * Thierry Géraud, Yoann Fabre, Alexandre Duret-Lutz, Dimitri - Papadopoulos-Orfanos, and Jean-François Mangin. `Obtaining - Genericity for Image Processing and Pattern Recognition - Algorithms'. In the Proceedings of the 15th International - Conference on Pattern Recognition (ICPR'2000), IEEE Computer - Society, vol. 4, pages 816-819, Barcelona, Spain, September 2000. - - * Alexandre Duret-Lutz. `Olena: a Component-Based Platform for - Image Processing, mixing Generic, Generative and OO - Programming'. In the Proceedings of the 2nd International - Symposium on Generative and Component-Based Software Engineering - (GCSE 2000), Young Researchers Workshop (published in - "Net.ObjectDays2000"; ISBN 3-89683-932-2), pages 653-659, - Erfurt, Germany, October 2000. - - * Alexandre Duret-Lutz, Thierry Géraud, and Akim Demaille. `Generic - Design Patterns in C++'. In the Proceedings of the 6th USENIX + * `Vers une réutilisabilité totale des algorithmes de traitement + d'images`. Thierry Géraud, Yoann Fabre, Dimitri + Papadopoulos-Orfanos, and Jean-François Mangin. In the + Proceedings of the 17th Symposium GRETSI on Signal and Image + Processing, vol. 2, pages 331-334, Vannes, France, + September 1999. In French (available in English as Technical + Report 9902: `Towards a Total Reusability of Image Processing + Algorithms'). + + * `Obtaining Genericity for Image Processing and Pattern + Recognition Algorithms`. Thierry Géraud, Yoann Fabre, Alexandre + Duret-Lutz, Dimitri Papadopoulos-Orfanos, and Jean-François + Mangin. In the Proceedings of the 15th International Conference + on Pattern Recognition (ICPR'2000), IEEE Computer Society, + vol. 4, pages 816-819, Barcelona, Spain, September 2000. + + * `Olena: a Component-Based Platform for Image Processing, mixing + Generic, Generative and OO Programming`. Alexandre Duret-Lutz. + In the Proceedings of the 2nd International Symposium on + Generative and Component-Based Software Engineering (GCSE 2000), + Young Researchers Workshop (published in "Net.ObjectDays2000"; + ISBN 3-89683-932-2), pages 653-659, Erfurt, Germany, October + 2000. + + * `Generic Design Patterns in C++`. Alexandre Duret-Lutz, Thierry + Géraud, and Akim Demaille. In the Proceedings of the 6th USENIX Conference on Object-Oriented Technologies and Systems - (COOTS'2001), pages 189-202, San Antonio, Texas, USA, + (COOTS'2001), pages 189-202, San Antonio, Texas, USA, January-February 2001. - * Thierry Géraud, Yoann Fabre, and Alexandre Duret-Lutz. `Applying - Generic Programming to Image Processing'. In the Proceedings of - the IASTED International Conference on Applied Informatics - (AI'2001) - Symposium Advances in Computer Applications, ACTA - Press, pages 577-581, Innsbruck, Austria, February 2001. + * `Applying Generic Programming to Image Processing`, Thierry + Géraud, Yoann Fabre, and Alexandre Duret-Lutz. In the + Proceedings of the IASTED International Conference on Applied + Informatics (AI'2001) - Symposium Advances in Computer + Applications, ACTA Press, pages 577-581, Innsbruck, Austria, + February 2001. - * `Generic Implementation of Morphological Image Operators', - Jérôme Darbon, Thierry Géraud, and Alexandre Duret-Lutz, - submitted to International Symposium On Mathematical Morphology VI - (ISMM 2002), April 3-5, 2002, Sydney, Australia. + * `Generic Implementation of Morphological Image Operators`, Jérôme + Darbon, Thierry Géraud, and Alexandre Duret-Lutz, submitted to + International Symposium On Mathematical Morphology VI (ISMM + 2002), April 3-5, 2002, Sydney, Australia. + + * `Static C++ Object-Oriented Programming (SCOOP)`, Nicolas Burrus, + Alexandre Duret-Lutz, Thierry Géraud, David Lesage, and Raphaël + Poss. In the Proceedings of the Workshop on Multiple Paradigm + with OO Languages (MPOOL'03) Anaheim, CA Oct. 2003. + + * `Generic Algorithmic Blocks Dedicated to Image Processing`, + Jérôme Darbon, Thierry Géraud, Patrick Bellot. In the proceedings + of ECOOP PHD Oslo, Norway June 2004. + + * `Fast Color Image Segmentation Based on Levellings in Feature + Space`, Thierry Géraud, Giovanni Palma, Niels Van Vliet. In the + proceedings of the International Conference on Computer Vision + and Graphics (ICCVG) Warsaw, Poland, September 2004. + + * `Semantics-Driven Genericity: A Sequel to the Static C++ + Object-Oriented Programming Paradigm (SCOOP 2)`. Thierry Géraud, + Roland Levillain. In the proceedings of the 6th International + Workshop on Multiparadigm Programming with Object-Oriented + Languages + http://homepages.fh-regensburg.de/~mpool/mpool08/welcome.html + Paphos, Cyprus July 7, 2008. + + * `Milena: Write Generic Morphological Algorithms Once, Run on Many + Kinds of Images`. Roland Levillain, Thierry Géraud, Laurent + Najman. In the proceedings of the 9th International Symposium on + Mathematical Morphology (ISMM) http://www.cs.rug.nl/~ISMM09/ + Groningen, The Netherlands August 24 - 27, 2009. - * `Static C++ Object-Oriented Programming (SCOOP)' Nicolas - Burrus, Alexandre Duret-Lutz, Thierry Géraud, David Lesage, and - Raphaël Poss. In the Proceedings of the Workshop on Multiple - Paradigm with OO Languages (MPOOL'03) Anaheim, CA Oct. 2003. You can download these papers and related materials from <http://www.lrde.epita.fr/cgi-bin/twiki/view/Publications> + +.. Local Variables: +.. mode: rst +.. End: -- 1.5.6.5

1 0

4240: mln/transform/internal/distance_functor.hh: Split declaration and implementation.
by Guillaume Lazzara 06 Jul '09

06 Jul '09

--- milena/ChangeLog | 5 ++ milena/mln/transform/internal/distance_functor.hh | 55 ++++++++++++++++++-- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fcbfd26..2689703 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2009-07-06 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/transform/internal/distance_functor.hh: Split declaration and + implementation. + +2009-07-06 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix few tests. * tests/core/other/var.cc: Does nothing if compiled with gcc 3.x. diff --git a/milena/mln/transform/internal/distance_functor.hh b/milena/mln/transform/internal/distance_functor.hh index afa0790..ffe1044 100644 --- a/milena/mln/transform/internal/distance_functor.hh +++ b/milena/mln/transform/internal/distance_functor.hh @@ -58,16 +58,19 @@ namespace mln void process(const P&, const P&); - void init_(const I&) {} - bool inqueue_p_wrt_input_p_(const V& input_p) { return input_p == true; } - void init_p_(unsigned) {} - bool inqueue_p_wrt_input_n_(const V& input_n) { return input_n == false; } - void process_(unsigned, unsigned) {} + void init_(const I&); + bool inqueue_p_wrt_input_p_(const V& input_p); + void init_p_(unsigned); + bool inqueue_p_wrt_input_n_(const V& input_n); + void process_(unsigned, unsigned); }; # ifndef MLN_INCLUDE_ONLY + + // Generic implementation. + template <typename I> inline void @@ -86,7 +89,7 @@ namespace mln template <typename I> inline void - distance_functor::init_p(const P&) + distance_functor::init_p(const mln_site(I)&) { } @@ -104,6 +107,46 @@ namespace mln { } + + + // Fastest implementation. + + template <typename I> + inline + void + distance_functor::init_(const I&) + { + } + + template <typename I> + inline + bool + distance_functor::inqueue_p_wrt_input_p_(const V& input_p) + { + return input_p == true; + } + + template <typename I> + inline + void + distance_functor::init_p_(unsigned) + { + } + + template <typename I> + inline + bool + distance_functor::inqueue_p_wrt_input_n_(const V& input_n) + { + return input_n == false; + } + + template <typename I> + inline + void distance_functor::process_(unsigned, unsigned) + { + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::transform::internal -- 1.5.6.5

1 0

4239: Fix few tests.
by Guillaume Lazzara 06 Jul '09

06 Jul '09

* tests/core/other/var.cc: Does nothing if compiled with gcc 3.x. * tests/geom/rotate.cc, * tests/transform/hough.cc: Fix reference values. --- milena/ChangeLog | 9 +++++++++ milena/tests/core/other/var.cc | 22 +++++++++++++++++++++- milena/tests/geom/rotate.cc | 15 +++++++++------ milena/tests/transform/hough.cc | 8 ++++---- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index eab445b..fcbfd26 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2009-07-06 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + Fix few tests. + + * tests/core/other/var.cc: Does nothing if compiled with gcc 3.x. + + * tests/geom/rotate.cc, + * tests/transform/hough.cc: Fix reference values. + 2009-07-03 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> * mln/geom/rotate.hh: Fix compilation issues. diff --git a/milena/tests/core/other/var.cc b/milena/tests/core/other/var.cc index cba6425..4e6fa76 100644 --- a/milena/tests/core/other/var.cc +++ b/milena/tests/core/other/var.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -23,6 +24,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. + +/// \file +/// +/// Test of macros based on mln_VAR. + + #include <mln/core/image/image2d.hh> #include <mln/core/alias/window2d.hh> #include <mln/core/alias/neighb2d.hh> @@ -31,6 +38,13 @@ #include <mln/core/var.hh> + + +// mln_VAR is known not to work with old gcc versions. This test does +// nothing for these compilers. +// +#if (defined(__GNUC__) && __GNUC__ >= 4) + template <typename T> void test_template() { @@ -125,8 +139,14 @@ void test() } } +#endif + int main() { + +#if (defined(__GNUC__) && __GNUC__ >= 4) test(); test_template<int>(); +#endif + } diff --git a/milena/tests/geom/rotate.cc b/milena/tests/geom/rotate.cc index bd2e1f0..c06aeb2 100644 --- a/milena/tests/geom/rotate.cc +++ b/milena/tests/geom/rotate.cc @@ -26,17 +26,15 @@ # include <mln/core/image/image2d.hh> # include <mln/geom/rotate.hh> # include <mln/make/image.hh> +# include <mln/make/box1d.hh> # include <mln/data/compare.hh> int main() { using namespace mln; - bool ref_values[][5] = { { 0, 1, 0, 0, 0 }, - { 0, 1, 1, 0, 0 }, - { 0, 0, 1, 1, 0 }, - { 0, 0, 0, 1, 1 }, - { 0, 0, 0, 0, 1 } }; + bool ref_values[][5] = { { 0, 1, 1, 0, 0 }, + { 0, 0, 1, 1, 0 } }; bool values[][5] = { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 }, @@ -45,7 +43,12 @@ int main() { 0, 0, 1, 0, 0 } }; image2d<bool> ima = make::image(values); - image2d<bool> ref = make::image(ref_values); + + + image2d<bool> ref(make::box2d(1,0, 2,4), 0); + for (unsigned i = 0; i < 2; ++i) + for (unsigned j = 0; j < 5; ++j) + ref(ref.point_at_index(i + j + 4 * i)) = ref_values[i][j]; image2d<bool> ima_rot = geom::rotate(ima, 45); diff --git a/milena/tests/transform/hough.cc b/milena/tests/transform/hough.cc index ff343bf..fc691db 100644 --- a/milena/tests/transform/hough.cc +++ b/milena/tests/transform/hough.cc @@ -23,9 +23,9 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -# include <mln/core/image/image2d.hh> -# include <mln/transform/hough.hh> -# include <mln/make/image.hh> +#include <mln/core/image/image2d.hh> +#include <mln/transform/hough.hh> +#include <mln/make/image.hh> int main() { @@ -48,5 +48,5 @@ int main() max_p = p; // Checking angle value. - mln_assertion(max_p.col() == 335); + mln_assertion(max_p.row() == 155); } -- 1.5.6.5

1 0

4238: mln/geom/rotate.hh: Fix compilation issues.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

--- milena/ChangeLog | 4 ++++ milena/mln/geom/rotate.hh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 745ce55..eab445b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-07-03 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * mln/geom/rotate.hh: Fix compilation issues. + 2009-07-03 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Help g++-3.3 to compile. diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index 0c920d4..8c0e3ca 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -38,7 +38,7 @@ # include <mln/core/image/imorph/tr_image.hh> -# include <mln/accu/bbox.hh> +# include <mln/accu/shape/bbox.hh> # include <mln/data/paste.hh> @@ -89,7 +89,7 @@ namespace mln /// Use literal::zero as default value for the extension. template <typename I> mln_concrete(I) - rotate(const Image& input_, double angle); + rotate(const Image& input, double angle); @@ -105,7 +105,7 @@ namespace mln const I& input = exact(input_); const S& output_domain = exact(output_domain_); - const mln_exact(Ext)& extension = exact(extensions_); + const mln_exact(Ext)& extension = exact(extension_); // Do not check that output_domain_ is valid. If it is not, // further in this routine, we define a default domain. @@ -134,7 +134,7 @@ namespace mln // Automatically adjusting the output domain if needed. if (!output_domain.is_valid()) { - accu::bbox<mln_site(I)> accu; + accu::shape::bbox<mln_site(I)> accu; typedef mln_site(I) P; accu.take(P(comp_transf(input.domain().pmin().to_vec()))); -- 1.5.6.5

1 0

4237: Help g++-3.3 to compile.
by Thierry Geraud 03 Jul '09

03 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Help g++-3.3 to compile. * mln/trait/value/internal/comp.hh, * mln/world/inter_pixel/separator_to_pixels.hh, * mln/core/image/imorph/tr_image.hh, * mln/geom/rotate.hh, * mln/fun/unary.hh, * mln/labeling/wrap.hh, * tests/world/inter_pixel/is_separator.cc, * tests/world/inter_pixel/is_pixel.cc, * tests/world/inter_pixel/immerse.cc: Help g++-3.3 to compile. * demos/genericity/neighborhood/input: New directory. * demos/genericity/neighborhood/output: New directory. * demos/genericity/neighborhood/world.pbm, * demos/genericity/neighborhood/drawing.pbm: Move... * demos/genericity/neighborhood/input/world.pbm, * demos/genericity/neighborhood/input/drawing.pbm: ...here. mln/core/image/imorph/tr_image.hh | 11 ++++-- mln/fun/unary.hh | 12 ++++++- mln/geom/rotate.hh | 2 - mln/labeling/wrap.hh | 8 +++- mln/trait/value/internal/comp.hh | 44 +++++++++++++++++---------- mln/world/inter_pixel/separator_to_pixels.hh | 40 ++++++++++++++++++------ tests/world/inter_pixel/immerse.cc | 4 +- tests/world/inter_pixel/is_pixel.cc | 8 +++- tests/world/inter_pixel/is_separator.cc | 10 +++--- 9 files changed, 96 insertions(+), 43 deletions(-) Index: mln/trait/value/internal/comp.hh --- mln/trait/value/internal/comp.hh (revision 4236) +++ mln/trait/value/internal/comp.hh (working copy) @@ -185,8 +185,18 @@ } }; + + // Technical note: + // + // We distinguish between a type T being a C-array type (T = + // U[dim]) and T a "regular" type (meaning "not a C-array + // type"). We have two stages to help g++-3.3 which has + // difficulty in solving such partial specializations. + + // Regular case. + template <typename T, unsigned i, unsigned dim> - struct get_comp + struct get_comp_with_regular_ { typedef mln::trait::value_<T> Tr; typedef typename Tr::comp C; @@ -199,38 +209,42 @@ } }; - - template <typename T, unsigned i, unsigned dim> - struct get_comp< T[dim], i, dim > + template <typename T> + struct get_comp_with_regular_< T, 0, 1 > { typedef T ret; - static ret on(const T (&v)[dim]) + static ret on(const T& v) { - return v[i]; + return v; } }; - template <typename T> - struct get_comp< T, 0, 1 > + template <typename T, unsigned i, unsigned dim> + struct get_comp : get_comp_with_regular_<T, i, dim> + { + }; + + // C-array case. + + template <typename T, unsigned i, unsigned dim> + struct get_comp_with_C_array { typedef T ret; - static ret on(const T& v) + static ret on(const T (&v)[dim]) { - return v; + return v[i]; } }; - template <typename T> - struct get_comp< T[1], 0, 1 > // Disambiguate between both - // previous specialization. + template <typename T, unsigned i, unsigned dim> + struct get_comp< T[dim], i, dim > : get_comp_with_C_array<T, i, dim> { - typedef T ret; - static ret on(const T (&v)[1]) { return v[0]; } }; + // comp< T, i > template <typename T, unsigned i> Index: mln/world/inter_pixel/separator_to_pixels.hh --- mln/world/inter_pixel/separator_to_pixels.hh (revision 4236) +++ mln/world/inter_pixel/separator_to_pixels.hh (working copy) @@ -69,10 +69,15 @@ Gpoint& p1_, Gpoint& p2_) { const P& s = exact(s_); - mln_precondition(is_separator()(s)); + P& p1 = exact(p1_); + P& p2 = exact(p2_); - P &p1 = exact(p1_), - &p2 = exact(p2_); + { + // Pre-condition. + is_separator is_separator_; + mln_precondition(is_separator_(s)); + (void) is_separator_; + } // FIXME: 2D only. if (s.row() % 2) @@ -88,8 +93,13 @@ p2 = point2d(s.row(), s.col() + 1); } - mln_postcondition(is_pixel()(p1)); - mln_postcondition(is_pixel()(p2)); + { + // Post-conditions. + is_pixel is_pixel_; + mln_postcondition(is_pixel_(p1)); + mln_postcondition(is_pixel_(p2)); + (void) is_pixel_; + } } template <typename Ps, typename P> @@ -99,15 +109,25 @@ Gpoint& p1_, Gpoint& p2_) { const Ps& s = exact(s_); - mln_precondition(is_separator()(s)); + P& p1 = exact(p1_); + P& p2 = exact(p2_); - P &p1 = exact(p1_), - &p2 = exact(p2_); + { + // Pre-condition. + is_separator is_separator_; + mln_precondition(is_separator_(s)); + (void) is_separator_; + } separator_to_pixels(s.to_site(), p1, p2); - mln_postcondition(is_pixel()(p1)); - mln_postcondition(is_pixel()(p2)); + { + // Post-conditions. + is_pixel is_pixel_; + mln_postcondition(is_pixel_(p1)); + mln_postcondition(is_pixel_(p2)); + (void) is_pixel_; + } } # endif // ! MLN_INCLUDE_ONLY Index: mln/core/image/imorph/tr_image.hh --- mln/core/image/imorph/tr_image.hh (revision 4236) +++ mln/core/image/imorph/tr_image.hh (working copy) @@ -126,8 +126,11 @@ /// Test if a pixel value is accessible at \p p. using super_::has; + enum { dim_ = site::dim }; + typedef mln::algebra::vec<dim_, float> vec_t; + /// Test if a pixel value is accessible at \p v. - bool has(const mln::algebra::vec<site::dim, float>& v) const; + bool has(const vec_t& v) const; /// Read-only access of pixel value at point site \p p. /// Mutable access is only OK for reading (not writing). @@ -194,11 +197,11 @@ template <typename S, typename I, typename T> inline bool - tr_image<S,I,T>::has(const algebra::vec<site::dim, float>& v) const + tr_image<S,I,T>::has(const vec_t& v) const { mln_psite(I) p; - algebra::vec<I::site::dim, float> v2 = this->data_->tr_.inv()(v); - for (unsigned i = 0; i < I::site::dim; ++i) + algebra::vec<site::dim, float> v2 = this->data_->tr_.inv()(v); + for (unsigned i = 0; i < site::dim; ++i) p[i] = static_cast<int>(v2[i]); return this->delegatee_().has(p); } Index: mln/geom/rotate.hh --- mln/geom/rotate.hh (revision 4236) +++ mln/geom/rotate.hh (working copy) @@ -146,7 +146,7 @@ typedef tr_image<mln_box(I), extension_val<const I>, comp_transf_t> tr_t; - tr_t tr = transposed_image(b, extend(input, extension_), comp_transf); + tr_t tr = transposed_image(b, extend(input, extension), comp_transf); typedef mln_site(I) P; P rpmin = P(rot(input.domain().pmin().to_vec())); Index: mln/fun/unary.hh --- mln/fun/unary.hh (revision 4236) +++ mln/fun/unary.hh (working copy) @@ -30,6 +30,7 @@ # include <mln/fun/spe/unary.hh> # include <mln/trait/next/solve.hh> + namespace mln { @@ -69,13 +70,20 @@ template <typename T> typename with<T>::ret::template lresult_with<T>::ret operator()(T& v) const { - return typename with<T>::ret(state()).apply_rw(v); + // See the commentary in next method. + typedef typename with<T>::ret fun_t; + fun_t f(state()); + return f.apply_rw(v); } template <typename T, typename R> void set(T& v, const R& r) const { - typename with<T>::ret(state()).set(v, r); + // Decomposing "with<T>::ret(state()).set(v, r)" into 3 lines + // helps g++-3.3! + typedef typename with<T>::ret fun_t; + fun_t f(state()); + f.set(v, r); } template <typename U> Index: mln/labeling/wrap.hh --- mln/labeling/wrap.hh (revision 4236) +++ mln/labeling/wrap.hh (working copy) @@ -38,6 +38,7 @@ # include <mln/metal/is_a.hh> # include <mln/value/label_8.hh> + namespace mln { @@ -62,7 +63,7 @@ /// /// \return A new image with values wrapped with type label_8. template <typename I> - mln_ch_value(I,value::label_8) + mln_ch_value(I, mln::value::label_8) wrap(const Image& input); @@ -88,10 +89,10 @@ template <typename I> inline - mln_ch_value(I,value::label_8) + mln_ch_value(I, mln::value::label_8) wrap(const Image& input) { - return wrap(value::label_8(), input); + return wrap(mln::value::label_8(), input); } # endif // ! MLN_INCLUDE_ONLY @@ -100,4 +101,5 @@ } // end of namespace mln + #endif // ! MLN_LABELING_WRAP_HH Index: tests/world/inter_pixel/is_separator.cc --- tests/world/inter_pixel/is_separator.cc (revision 4236) +++ tests/world/inter_pixel/is_separator.cc (working copy) @@ -34,8 +34,10 @@ point2d p00(0, 0), p01(0, 1), p10(1, 0), p11(1, 1); - mln_assertion(! is_separator()(p00)); - mln_assertion( is_separator()(p01)); - mln_assertion(! is_separator()(p11)); - mln_assertion( is_separator()(p10)); + is_separator is_separator_; // Help g++-3.3. + + mln_assertion(! is_separator_(p00)); + mln_assertion( is_separator_(p01)); + mln_assertion(! is_separator_(p11)); + mln_assertion( is_separator_(p10)); } Index: tests/world/inter_pixel/is_pixel.cc --- tests/world/inter_pixel/is_pixel.cc (revision 4236) +++ tests/world/inter_pixel/is_pixel.cc (working copy) @@ -34,7 +34,9 @@ point2d p00(0, 0), p01(0, 1), p11(1, 1); - mln_assertion( is_pixel()(p00)); - mln_assertion(! is_pixel()(p01)); - mln_assertion(! is_pixel()(p11)); + is_pixel is_pixel_; // Help g++-3.3. + + mln_assertion( is_pixel_(p00)); + mln_assertion(! is_pixel_(p01)); + mln_assertion(! is_pixel_(p11)); } Index: tests/world/inter_pixel/immerse.cc --- tests/world/inter_pixel/immerse.cc (revision 4236) +++ tests/world/inter_pixel/immerse.cc (working copy) @@ -54,7 +54,9 @@ mln_assertion(imax == (make::image2d(refs) | is_pixel())); + is_pixel is_pixel_; // Help g++-3.3. + mln_piter_(Ix) p(imax.domain()); for_all(p) - mln_assertion(is_pixel()(p)); + mln_assertion(is_pixel_(p)); } Property changes on: demos/genericity/neighborhood/input/world.pbm ___________________________________________________________________ Added: svn:mergeinfo Property changes on: demos/genericity/neighborhood/input/drawing.pbm ___________________________________________________________________ Added: svn:mergeinfo

1 0

4236: mln/geom/rotate.hh: use accu::bbox to compute the rotated bbox.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

--- milena/ChangeLog | 4 ++++ milena/mln/geom/rotate.hh | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bc1d723..07e590c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-07-03 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * mln/geom/rotate.hh: use accu::bbox to compute the rotated bbox. + 2009-07-01 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> * mln/debug/filename.hh: Allow to force the file id. diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index 34f9e9b..12793c0 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -38,6 +38,8 @@ # include <mln/core/image/imorph/tr_image.hh> +# include <mln/accu/bbox.hh> + # include <mln/data/paste.hh> # include <mln/geom/bbox.hh> @@ -132,16 +134,13 @@ namespace mln // Automatically adjusting the output domain if needed. if (!output_domain.is_valid()) { - typedef mln_site(I) P; - P - rpmin = P(comp_transf(input.domain().pmin().to_vec())), - rpmax = P(comp_transf(input.domain().pmax().to_vec())); + accu::bbox<mln_site(I)> accu; - for (unsigned i = 0; i < mln_site_(I)::dim; ++i) - if (rpmax[i] < rpmin[i]) - std::swap(rpmax[i], rpmin[i]); + typedef mln_site(I) P; + accu.take(P(comp_transf(input.domain().pmin().to_vec()))); + accu.take(P(comp_transf(input.domain().pmax().to_vec()))); - b = mln_box(I)(rpmin, rpmax); + b = accu.to_result(); } typedef -- 1.5.6.5

1 0

4235: configure.ac: Adjust warning flags if CXX is set to icpc.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

--- ChangeLog | 4 ++++ configure.ac | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4569441..b5ac9ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-03 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: Adjust warning flags if CXX is set to icpc. + 2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * configure.ac: do not configure tests/transformation. diff --git a/configure.ac b/configure.ac index a13a61f..7dfaad1 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,20 @@ if test "$GXX" = yes; then CXXFLAGS="$CXXFLAGS -pipe" fi + +# Adjusting warning options according to compilers. +AC_ARG_VAR([WARNINGS_CXXFLAGS]) +case "$CXX" in + # Intel compiler + *icpc*) + WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418" + ;; + *) + WARNINGS_CXXFLAGS="-Wall -W" + ;; +esac + + # ------------------------------ # # C++ compiler flags for tests. # # ------------------------------ # @@ -63,7 +77,7 @@ AC_ARG_VAR([TESTS_CXXFLAGS]) # We want no optimization for the tests (it slows down compiling # times), and debugging information. if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS"; then - TESTS_CXXFLAGS="-O0 -ggdb -Wall -W" + TESTS_CXXFLAGS="-O0 -ggdb $WARNINGS_CXXFLAGS" fi # Flags for complex tests. @@ -83,7 +97,7 @@ AC_ARG_VAR([TESTS_CXXFLAGS_DEBUG]) # * GNU C++ Library Compile Time Checks (a.k.a. concept checking): # http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch29.html if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS_DEBUG"; then - TESTS_CXXFLAGS_DEBUG="-O0 -ggdb -Wall -W -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS" + TESTS_CXXFLAGS_DEBUG="-O0 -ggdb $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS" fi @@ -402,7 +416,7 @@ AC_CONFIG_FILES([milena/apps/statues/test-mesh-complex-skel], AC_ARG_VAR([APPS_CXXFLAGS]) # We want fast binaries for apps. if test "$GXX" = yes && test -z "$APPS_CXXFLAGS"; then - APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W" + APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS" fi ## ------- ## @@ -421,7 +435,7 @@ AC_CONFIG_FILES([milena/tools/Makefile]) AC_ARG_VAR([TOOLS_CXXFLAGS]) # We want fast binaries for tools. if test "$GXX" = yes && test -z "$TOOLS_CXXFLAGS"; then - TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W" + TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS" fi -- 1.5.6.5

1 0

4234: Delete Dalila's sandbox.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

* dalila/Makefile, * dalila/photo.cc, * dalila/plop.cc, * dalila/start.sh, * dalila/table.cc: Delete. --- milena/sandbox/ChangeLog | 10 ++++++ milena/sandbox/dalila/Makefile | 18 ----------- milena/sandbox/dalila/photo.cc | 64 -------------------------------------- milena/sandbox/dalila/plop.cc | 19 ----------- milena/sandbox/dalila/start.sh | 44 -------------------------- milena/sandbox/dalila/table.cc | 66 ---------------------------------------- 6 files changed, 10 insertions(+), 211 deletions(-) delete mode 100644 milena/sandbox/dalila/Makefile delete mode 100644 milena/sandbox/dalila/photo.cc delete mode 100644 milena/sandbox/dalila/plop.cc delete mode 100755 milena/sandbox/dalila/start.sh delete mode 100644 milena/sandbox/dalila/table.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 216b67c..089a6f4 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,13 @@ +2009-07-03 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Delete Dalila's sandbox. + + * dalila/Makefile, + * dalila/photo.cc, + * dalila/plop.cc, + * dalila/start.sh, + * dalila/table.cc: Delete. + 2009-07-01 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Add new programs to extract data from microfilms. diff --git a/milena/sandbox/dalila/Makefile b/milena/sandbox/dalila/Makefile deleted file mode 100644 index 7ab2b0a..0000000 --- a/milena/sandbox/dalila/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -OLENA_INCLUDE_PATH=../../../ -CXXFLAGS=-I$(OLENA_INCLUDE_PATH) -ggdb3 -Wall -O1 -DNDEBUG - -all: photo table - -photo: demat.hh photo.cc - g++ $(CXXFLAGS) photo.cc -o photo - -table: demat.hh table.cc - g++ $(CXXFLAGS) table.cc -o table - -dclean: clean - rm -f photo - rm -f table - -clean: - rm -f *.pbm *.pgm *.ppm - diff --git a/milena/sandbox/dalila/photo.cc b/milena/sandbox/dalila/photo.cc deleted file mode 100644 index 118411b..0000000 --- a/milena/sandbox/dalila/photo.cc +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory -// -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - - -#include "demat.hh" - -int main(int argc, char*argv[]) -{ - using namespace mln; - using value::int_u8; - - if (argc < 2) - { - std::cout << argv[0] << " <in.pbm> <out.pgm> <l> <bbox_larger> <bbox_distance> <min_comp_nsites>" << std::endl - << std::endl << std::endl - << std::endl - << "==========" - << std::endl << std::endl - << "<in.pbm> B/W inverted input image." - << std::endl << std::endl -/* << "<out.ppm> RGB8 output image." - << std::endl << std::endl - << "<bbox_distance> Maximum distance between character bounding boxes. Used for bbox grouping." - << std::endl << std::endl - << "<min_comp_nsites> Minimum site count of a character/text component." - << std::endl - << " If a component have a site count lesser than this value, it is erased." - << std::endl << std::endl - << std::endl*/ - << "==========" - << std::endl << std::endl - << "HINT: compile with -DNOUT to avoid debug images." - << std::endl << std::endl; - return 1; - } - - scribo::demat(argv, false); - - return 0; -} diff --git a/milena/sandbox/dalila/plop.cc b/milena/sandbox/dalila/plop.cc deleted file mode 100644 index a4c284d..0000000 --- a/milena/sandbox/dalila/plop.cc +++ /dev/null @@ -1,19 +0,0 @@ -#include <mln/essential/2d.hh> - -int main() -{ - using namespace mln; - - image2d<bool> ima1(2, 3); - image2d<bool> ima2(2, 3); - - data::fill(ima1, 2); - data::fill(ima2, 3); - -// debug::println(ima1); -// debug::println(ima2); - -// debug::println(ima2 - ima1); -// debug::println(arith::minus(ima2, ima1)); - ima1 * ima2; -} diff --git a/milena/sandbox/dalila/start.sh b/milena/sandbox/dalila/start.sh deleted file mode 100755 index de4840c..0000000 --- a/milena/sandbox/dalila/start.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -out_location="./images-out" - -treat_file() -{ - file=$1 - shift - echo "-------------------------" - echo " * Processing $file..." - echo " => Running: $1 $file" - echo "-------------------------" - d1=`date +%s` - time $1 $file - d2=`date +%s` - echo "" - dstdir="$out_location/`basename $file .pbm`" - echo "Moving output files to $dstdir..." - mkdir -p $dstdir - mv -f *.pbm $dstdir 2>/dev/null - mv -f *.ppm $dstdir 2>/dev/null - mv -f *.pgm $dstdir 2>/dev/null - echo "" -} - -treat_dir() -{ - for file in $2/*; do - treat_file $file $1 - done -} - -rm -f *.pbm *.ppm *.pgm -make - -# Traite une seule image -# Usage: ./starh.sh <file.pbm> <table | photo> -if [ $# -eq 2 ]; then - treat_file $1 ./$2 -else -# Traite toutes les images - treat_dir ./table ./images/factures - treat_dir ./photo ./images/photos -fi diff --git a/milena/sandbox/dalila/table.cc b/milena/sandbox/dalila/table.cc deleted file mode 100644 index 76faf57..0000000 --- a/milena/sandbox/dalila/table.cc +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory -// -// This file is part of the Milena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - - -#include "demat.hh" - -int main(int argc, char*argv[]) -{ - using namespace mln; - using value::int_u8; - - if (argc < 2) - { - std::cout << argv[0] << " <in.pbm> <out.pgm> <l> <bbox_larger> <bbox_distance> <min_comp_nsites>" << std::endl - << std::endl << std::endl - << std::endl - << "==========" - << std::endl << std::endl - << "<in.pbm> B/W inverted input image." - << std::endl << std::endl -/* << "<out.ppm> RGB8 output image." - << std::endl << std::endl - << "<l> Line length" - << std::endl << std::endl - << "<bbox_distance> Maximum distance between character bounding boxes. Used for bbox grouping." - << std::endl << std::endl - << "<min_comp_nsites> Minimum site count of a character/text component." - << std::endl - << " If a component have a site count lesser than this value, it is erased." - << std::endl << std::endl - << std::endl*/ - << "==========" - << std::endl << std::endl - << "HINT: compile with -DNOUT to avoid debug images." - << std::endl << std::endl; - return 1; - } - - scribo::demat(argv, true); - - return 0; -} -- 1.5.6.5

1 0

4233: Update Scribo.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

* src/extract_text_double_link.cc: Improve usage output and add new parameters to be passed as arguments. * src/recognition.cc: Add a new program argument. * text/clean.hh: Disable cleaning for now. * text/recognition.hh: may store the recognized text into a file. --- scribo/ChangeLog | 13 ++++++++++++ scribo/src/extract_text_double_link.cc | 33 +++++++++++++++++++++---------- scribo/src/recognition.cc | 9 ++++--- scribo/text/clean.hh | 28 +++++++++++++------------- scribo/text/recognition.hh | 26 ++++++++++++++++++++---- 5 files changed, 75 insertions(+), 34 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f11cfa1..c508cbd 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Update Scribo. + + * src/extract_text_double_link.cc: Improve usage output and add new + parameters to be passed as arguments. + + * src/recognition.cc: Add a new program argument. + + * text/clean.hh: Disable cleaning for now. + + * text/recognition.hh: may store the recognized text into a file. + +2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * tests/preprocessing/unskew.cc: fix test. 2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/src/extract_text_double_link.cc b/scribo/src/extract_text_double_link.cc index 50706d8..aa47ac6 100644 --- a/scribo/src/extract_text_double_link.cc +++ b/scribo/src/extract_text_double_link.cc @@ -45,22 +45,33 @@ #include <scribo/debug/save_bboxes_image.hh> #include <scribo/make/debug_filename.hh> -int usage(const char *name) -{ - std::cout << "Usage: " << name << " <input.pbm> " << std::endl; - return 1; -} +#include <scribo/debug/usage.hh> -int main(int argc, char* argv[]) +const char *args_desc[][2] = +{ + { "input.pbm", "A binary image. 'True' for objects, 'False'\ +for the background." }, + { "hlmax", "Maximum distance between two grouped objects while browsing on the left." }, + { "hrmax", "Maximum distance between two grouped objects while browsing on the right." }, + { "prefix", "Output names prefix" }, + {0, 0} +}; + +int main(int argc, char *argv[]) { using namespace scribo; using namespace mln; - if (argc < 1) - return usage(argv[0]); + if (argc != 5) + return scribo::debug::usage(argv, + "Group potential text objects using a double validation link.", + "input.pbm hlmax hrmax prefix", + args_desc, + "Several images showing the process."); + - scribo::make::internal::debug_filename_prefix = "extract_text_double_link"; + scribo::make::internal::debug_filename_prefix = argv[4]; image2d<bool> input; io::pbm::load(input, argv[1]); @@ -72,9 +83,9 @@ int main(int argc, char* argv[]) text = filter::small_objects(text, 4); mln::util::array<unsigned> left_link - = text::grouping::group_with_single_left_link(text, 30); + = text::grouping::group_with_single_left_link(text, atoi(argv[2])); mln::util::array<unsigned> right_link - = text::grouping::group_with_single_right_link(text, 30); + = text::grouping::group_with_single_right_link(text, atoi(argv[3])); std::cout << "BEFORE - nbboxes = " << nbboxes << std::endl; diff --git a/scribo/src/recognition.cc b/scribo/src/recognition.cc index 87bbade..97f2880 100644 --- a/scribo/src/recognition.cc +++ b/scribo/src/recognition.cc @@ -51,6 +51,7 @@ const char *args_desc[][2] = { { "input.pbm", "A binary image. 'True' for objects, 'False'\ for the background." }, + { "out.txt", "OCR's output." }, {0, 0} }; @@ -61,12 +62,12 @@ int main(int argc, char* argv[]) using namespace scribo; using namespace mln; - if (argc != 2) + if (argc != 3) return scribo::debug::usage(argv, "Text extraction and recognition", - "input.pbm", + "input.pbm out.txt", args_desc, - "The text is printed on the standard output."); + "The text is printed on the standard output and stored in 'out.txt'"); trace::entering("main"); @@ -91,7 +92,7 @@ int main(int argc, char* argv[]) objects = text::grouping::group_from_double_link(objects, left_link, right_link); /// Try to recognize text in grouped objects. - scribo::text::recognition(objects, "fra"); + scribo::text::recognition(objects, "fra", argv[2]); trace::exiting("main"); } diff --git a/scribo/text/clean.hh b/scribo/text/clean.hh index 24973c5..0f87139 100644 --- a/scribo/text/clean.hh +++ b/scribo/text/clean.hh @@ -98,31 +98,31 @@ namespace scribo mln_precondition(input.is_valid()); mln_precondition(dmap_win.is_valid()); - I input_large = world::binary_2d::enlarge(input, 2); +// I input_large = world::binary_2d::enlarge(input, 2); // image2d<bool> blur = linear::gaussian(input_large, 2); // image2d<value::int_u8> blur = linear::gaussian(level::convert(value::int_u8(), input_large), 2); // image2d<bool> blur = level::transform(linear::gaussian(level::convert(value::int_u8(), input_large), 2), fun::v2b::threshold<value::int_u8>(100)); - mln_ch_value(I,unsigned) - dmap = transform::distance_front(logical::not_(input_large), c8(), - dmap_win, - mln_max(unsigned)); +// mln_ch_value(I,unsigned) +// dmap = transform::distance_front(logical::not_(input_large), c8(), +// dmap_win, +// mln_max(unsigned)); // io::pgm::save(labeling::wrap(dmap), mln::debug::filename("dmap.pgm")); // I skeleton = topo::skeleton::crest(input_large, dmap, c8()); - I constraint = topo::skeleton::crest(input_large, dmap, c8()); - mln_postcondition(constraint.is_valid()); +// I constraint = topo::skeleton::crest(input_large, dmap, c8()); +// mln_postcondition(constraint.is_valid()); // io::pgm::save(labeling::wrap(constraint), mln::debug::filename("constraint.pgm")); - I skeleton = - morpho::skeleton_constrained(input_large, c8(), - topo::skeleton::is_simple_point<I,neighb2d>, - extend(constraint, false), arith::revert(dmap)); +// I skeleton = +// morpho::skeleton_constrained(input_large, c8(), +// topo::skeleton::is_simple_point<I,neighb2d>, +// extend(constraint, false), arith::revert(dmap)); - win::octagon2d disk(7); - I output = morpho::dilation(skeleton, disk); +// win::octagon2d disk(7); +// I output = morpho::dilation(skeleton, disk); // if (plop > 20 && plop < 50) { @@ -134,7 +134,7 @@ namespace scribo // ++plop; trace::exiting("scribo::text::clean"); - return output; + return input; } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/text/recognition.hh b/scribo/text/recognition.hh index 75410e4..6293e28 100644 --- a/scribo/text/recognition.hh +++ b/scribo/text/recognition.hh @@ -33,6 +33,8 @@ /// \todo For each text bbox, we create a new image. We may like to avoid that. /// \todo Do not store the result in an image? +# include <ostream> + # include <mln/core/image/dmorph/image_if.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/box.hh> @@ -76,15 +78,19 @@ namespace scribo /// Passes the text bboxes to Tesseract (OCR). /// - /// \param[in] text The lines of text. - /// \param[in] language the language which should be recognized by Tesseract. - /// (fra, en, ...) + /// \param[in] text The lines of text. + /// \param[in] language The language which should be recognized by + /// Tesseract. (fra, en, ...) + /// \param[in] output_file If set, store the recognized text in + /// this file. /// /// \return An image of characters. + // template <typename L> mln_ch_value(L,char) recognition(const object_image(L)& objects, - const char *language); + const char *language, + const char *output_file); @@ -94,7 +100,8 @@ namespace scribo template <typename L> mln_ch_value(L,char) recognition(const object_image(L)& objects, - const char *language) + const char *language, + const char *output_file) { trace::entering("scribo::text::recognition"); @@ -114,6 +121,10 @@ namespace scribo 0, 9, 0, 9, 0 }; w_window2d_int dmap_win = mln::make::w_window2d_int(vals); + std::ofstream file; + if (output_file != 0) + file.open(output_file); + /// Use text bboxes with Tesseract for_all_ncomponents(i, objects.nlabels()) { @@ -147,6 +158,8 @@ namespace scribo if (s != 0) { std::cout << s << std::endl; + if (output_file != 0) + file << s << std::endl; mln::debug::put_word(txt, p, s); } @@ -154,6 +167,9 @@ namespace scribo free(s); } + if (output_file != 0) + file.close(); + trace::exiting("scribo::text::recognition"); return txt; } -- 1.5.6.5

1 0

4232: mln/debug/filename.hh: Allow to force the file id.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

--- milena/ChangeLog | 4 ++++ milena/mln/debug/filename.hh | 24 ++++++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ae208c4..bc1d723 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-07-01 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/debug/filename.hh: Allow to force the file id. + +2009-07-01 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/transform/hough.hh: Improve. 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/mln/debug/filename.hh b/milena/mln/debug/filename.hh index dd0a0a3..1df7992 100644 --- a/milena/mln/debug/filename.hh +++ b/milena/mln/debug/filename.hh @@ -69,8 +69,9 @@ namespace mln } // end of namespace scribo::make::internal + inline std::string - filename(const std::string& filename, int postfix_id = -1) + filename(const std::string& filename, int id = -1) { static int file_id = 1; @@ -79,17 +80,20 @@ namespace mln if (! internal::filename_prefix.empty()) os << internal::filename_prefix << "_"; - if (file_id < 10) - os << "0"; - if (file_id < 100) - os << "0"; + if (id >= 0) + { + if (file_id < 10) + os << "0"; + if (file_id < 100) + os << "0"; - os << file_id++ - << "_" - << filename; + os << file_id++; + } + else + os << "_" << id; - if (postfix_id >= 0) - os << "_" << postfix_id; + os << "_" + << filename; return os.str(); } -- 1.5.6.5

1 0