Olena-patches October 2010

olena-patches@lrde.epita.fr

5 participants
154 discussions

last-svn-commit-531-g2725412 Autoconfiscate Scribo.

by Roland Levillain

* configure.ac: New. * configure.gnu: New. * Makefile.am (ACLOCAL_AMFLAGS): New. (SUBDIRS): Add build-aux. (EXTRA_DIST): Add configure.gnu. * AUTHORS: New. * NEWS: New (imported from Olena and updated). * COPYING: New (imported from Olena). * INSTALL: New (generated by Automake). * README, src/README: Update copyright headers. * m4/autotroll.m4, * m4/oln-with-lib.m4, * m4/pkg.m4: New (imported from Olena). * build-aux/autotroll.mk, * build-aux/build_unit_test.sh, * build-aux/generate_dist_headers.sh, * build-aux/regen-recursive.mk: New (imported from Olena). * build-aux/Makefile.am: New. * demo/review/Makefile.am, * src/Makefile.am, * src/binarization/Makefile.am, * src/contest/Makefile.am, * src/contest/hdibco-2010/Makefile.am, * src/debug/Makefile.am, * src/filter/Makefile.am, * src/misc/Makefile.am, * src/postprocessing/Makefile.am, * src/preprocessing/Makefile.am, * src/primitive/Makefile.am, * src/primitive/extract/Makefile.am, * src/primitive/find/Makefile.am, * src/primitive/group/Makefile.am, * src/table/Makefile.am, * src/text/Makefile.am, * tests/binarization/Makefile.am, * tests/core/Makefile.am, * tests/filter/Makefile.am, * tests/preprocessing/Makefile.am, * tests/table/Makefile.am, * tests/text/Makefile.am, * tests/toolchain/Makefile.am, * tests/toolchain/nepomuk/Makefile.am, * tests/unit_test/Makefile.am: Adjust paths. * tests/data.hh.in: Likewise. * scribo.mk, tests/tests.mk: Likewise. (MILENA_CPPFLAGS): New. Use it... (AM_CPPFLAGS): ...here. --- scribo/.gitignore | 19 ++ scribo/AUTHORS | 35 +++ {swilena => scribo}/COPYING | 0 scribo/ChangeLog | 55 ++++ INSTALL => scribo/INSTALL | 0 scribo/Makefile.am | 7 +- scribo/NEWS | 376 ++++++++++++++++++++++++++++ scribo/README | 8 +- scribo/build-aux/Makefile.am | 19 ++ scribo/build-aux/autotroll.mk | 1 + scribo/build-aux/build_unit_test.sh | 1 + scribo/build-aux/generate_dist_headers.sh | 1 + scribo/build-aux/regen-recursive.mk | 1 + scribo/configure.ac | 294 ++++++++++++++++++++++ {swilena => scribo}/configure.gnu | 0 scribo/demo/review/Makefile.am | 2 +- scribo/m4/autotroll.m4 | 1 + scribo/m4/oln-with-lib.m4 | 1 + scribo/m4/pkg.m4 | 1 + scribo/scribo.mk | 12 +- scribo/src/Makefile.am | 2 +- scribo/src/README | 8 +- scribo/src/binarization/Makefile.am | 2 +- scribo/src/contest/Makefile.am | 4 +- scribo/src/contest/hdibco-2010/Makefile.am | 2 +- scribo/src/debug/Makefile.am | 2 +- scribo/src/filter/Makefile.am | 4 +- scribo/src/misc/Makefile.am | 4 +- scribo/src/postprocessing/Makefile.am | 2 +- scribo/src/preprocessing/Makefile.am | 2 +- scribo/src/primitive/Makefile.am | 4 +- scribo/src/primitive/extract/Makefile.am | 4 +- scribo/src/primitive/find/Makefile.am | 4 +- scribo/src/primitive/group/Makefile.am | 2 +- scribo/src/table/Makefile.am | 4 +- scribo/src/text/Makefile.am | 4 +- scribo/tests/binarization/Makefile.am | 4 +- scribo/tests/core/Makefile.am | 2 +- scribo/tests/data.hh.in | 4 +- scribo/tests/filter/Makefile.am | 4 +- scribo/tests/preprocessing/Makefile.am | 2 +- scribo/tests/table/Makefile.am | 4 +- scribo/tests/tests.mk | 11 +- scribo/tests/text/Makefile.am | 4 +- scribo/tests/toolchain/Makefile.am | 2 +- scribo/tests/toolchain/nepomuk/Makefile.am | 2 +- scribo/tests/unit_test/Makefile.am | 2 +- 47 files changed, 870 insertions(+), 59 deletions(-) create mode 100644 scribo/AUTHORS copy {swilena => scribo}/COPYING (100%) copy INSTALL => scribo/INSTALL (100%) create mode 100644 scribo/NEWS create mode 100644 scribo/build-aux/Makefile.am create mode 120000 scribo/build-aux/autotroll.mk create mode 120000 scribo/build-aux/build_unit_test.sh create mode 120000 scribo/build-aux/generate_dist_headers.sh create mode 120000 scribo/build-aux/regen-recursive.mk create mode 100644 scribo/configure.ac copy {swilena => scribo}/configure.gnu (100%) create mode 120000 scribo/m4/autotroll.m4 create mode 120000 scribo/m4/oln-with-lib.m4 create mode 120000 scribo/m4/pkg.m4 diff --git a/scribo/.gitignore b/scribo/.gitignore index 4dd853a..31b3fa4 100644 --- a/scribo/.gitignore +++ b/scribo/.gitignore @@ -1 +1,20 @@ +/build-aux/config.guess +/build-aux/config.sub +/build-aux/depcomp +/build-aux/install-sh +/build-aux/ltmain.sh +/build-aux/missing +/build-aux/py-compile + +/m4/libtool.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 +/m4/lt~obsolete.m4 + +/*aclocal.m4 +/autom4te.cache* +/configure +/configure.scan + /tests/unit_test/scribo_*.cc diff --git a/scribo/AUTHORS b/scribo/AUTHORS new file mode 100644 index 0000000..0cbd32a --- /dev/null +++ b/scribo/AUTHORS @@ -0,0 +1,35 @@ +This package was written by and with the assistance of + +================== +Active LRDE Staff. +================== + +* Thierry Géraud theo(a)lrde.epita.fr +* Guillaume Lazzara z(a)lrde.epita.fr +* Roland Levillain roland(a)lrde.epita.fr + +================================ +Past contributors of LRDE Staff. +================================ + +* Yann Jacquelet jacquelet(a)lrde.epita.fr + +======== +Interns. +======== + +* Arthur Crépin-Leblond + +========= +Students. +========= + +* Florent D'Halluin +* Edwin Carlinet +* Jérôme Galtier + + +.. Local Variables: +.. mode: rst +.. ispell-local-dictionary: "american" +.. End: diff --git a/swilena/COPYING b/scribo/COPYING similarity index 100% copy from swilena/COPYING copy to scribo/COPYING diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 104f9c6..9789fc5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,58 @@ +2010-10-26 Roland Levillain <roland(a)lrde.epita.fr> + + Autoconfiscate Scribo. + + * configure.ac: New. + * configure.gnu: New. + * Makefile.am (ACLOCAL_AMFLAGS): New. + (SUBDIRS): Add build-aux. + (EXTRA_DIST): Add configure.gnu. + * AUTHORS: New. + * NEWS: New (imported from Olena and updated). + * COPYING: New (imported from Olena). + * INSTALL: New (generated by Automake). + * README, src/README: Update copyright headers. + * m4/autotroll.m4, + * m4/oln-with-lib.m4, + * m4/pkg.m4: + New (imported from Olena). + * build-aux/autotroll.mk, + * build-aux/build_unit_test.sh, + * build-aux/generate_dist_headers.sh, + * build-aux/regen-recursive.mk: + New (imported from Olena). + * build-aux/Makefile.am: New. + * demo/review/Makefile.am, + * src/Makefile.am, + * src/binarization/Makefile.am, + * src/contest/Makefile.am, + * src/contest/hdibco-2010/Makefile.am, + * src/debug/Makefile.am, + * src/filter/Makefile.am, + * src/misc/Makefile.am, + * src/postprocessing/Makefile.am, + * src/preprocessing/Makefile.am, + * src/primitive/Makefile.am, + * src/primitive/extract/Makefile.am, + * src/primitive/find/Makefile.am, + * src/primitive/group/Makefile.am, + * src/table/Makefile.am, + * src/text/Makefile.am, + * tests/binarization/Makefile.am, + * tests/core/Makefile.am, + * tests/filter/Makefile.am, + * tests/preprocessing/Makefile.am, + * tests/table/Makefile.am, + * tests/text/Makefile.am, + * tests/toolchain/Makefile.am, + * tests/toolchain/nepomuk/Makefile.am, + * tests/unit_test/Makefile.am: + Adjust paths. + * tests/data.hh.in: Likewise. + * scribo.mk, tests/tests.mk: Likewise. + (MILENA_CPPFLAGS): New. Use it... + (AM_CPPFLAGS): ...here. + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> Require Tesseract for scribo/toolchain/text_in_doc.hh's unit test. diff --git a/INSTALL b/scribo/INSTALL similarity index 100% copy from INSTALL copy to scribo/INSTALL diff --git a/scribo/Makefile.am b/scribo/Makefile.am index b18366b..463753d 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -15,7 +15,12 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -SUBDIRS = demo tests src +ACLOCAL_AMFLAGS = -I m4 + +SUBDIRS = build-aux demo tests src + +# `configure' wrapper used in recursive configuration. +EXTRA_DIST = configure.gnu .PHONY: bin diff --git a/scribo/NEWS b/scribo/NEWS new file mode 100644 index 0000000..b7abbba --- /dev/null +++ b/scribo/NEWS @@ -0,0 +1,376 @@ +* Swilena 1.0a + + * Starting with Olena 1.1, Scribo is an independent component + of the project, distributed both together with the Olena + package and as a standalone package. + + * Misc fixes and improvements. + + +* Olena 1.0 July 14, 2009 + + * The core C++ library, renamed to Milena, has been rewritten from + scratch and features numerous additions over the past releases. + Some features have also been dropped or disabled, and some of them + will be reintegrated in future releases. The programming + interface has changed from previous versions, but most programs + using Olena 0.11 can be adapted to the Olena 1.0 API. + + * Milena uses a simplified version of the SCOOP 2 paradigm + (informally called SCOOP 1.5), to improve the speed of compilation + and make developing easier while still providing very good + run-time performances. + + * A first (re)implementation of Swilena featuring Python wrappers + for a very small subset of Milena is available. The bundled + Swilena Python Shell (sps) allows interactive Olena sessions. + + * A reference documentation including a tutorial and a quick + reference guide have been started. They do not cover the whole + Milena library yet. + + * Olena includes some demos and applications using Milena. + + +* Olena 0.11 February 21, 2007 + + * The whole Olena distribution compiles with the GNU C++ + Compiler (G++) 4.0 and 4.1. The compatibility with previous + versions of the compiler has been broken. + + * Revamp of Swilena. + The Swilena wrappers have been repaired, as they had become + incompatible with recent versions of SWIG, G++, Python and Ruby. + Moreover, a lot of small bugs have been fixed in Swilena. + The test suite of Rblena, the Ruby wrappers for Olena, has + been completed and is comparable to Pylena's (the Python + wrappers for Olena). + + * Libtool. + The whole package uses GNU Libtool to handle libraries. + Swilena benefits this, and uses Libtool to create shared + libraries upon which SWIG wrappers are built. + + * Miscellaneous corrections in Olena and Integre, as well as in + their test suites. + + +* Olena 0.10 April 15, 2004 + + * New documentation system. + Now any comment should use Doxygen style (i.e. /*! ... */). + You can also write some programs inside the comments. They are + compiled at documentation generation time. It is useful to + illustrate some algorithms with concrete input and output. To + use this feature the program has to be between \code and \endcode + tags. If you produce an image, you can include it in the comments + with the \image command, using the same name you used to produce + it, but with the png extension. To make sure your image will not + overwrite another existing one, you should name it taking care of + the namespace you are using: e.g. if you comment the function + oln::boo::bar::fun, the image should be named oln_foo_bar_fun.ppm. + The macros IMG_IN and IMG_OUT correspond to the path of the images. + + * Border behavior can be controlled with the behavior hierarchy. + If an algorithm support it, you can choose the way the image + border will be seen. Three behaviors are available: mirror, + replicate or user defined value. + + * Attribute opening/closing enhancement + - Make the algorithm more generic. + - Add a lot of attributes (area, disk, square, dist, + rectangle, volume, height, maxvalue, minvalue). + + * Change the color conversion system + - CIE RGB is the main color system i.e. it can be converted + directly into any other color system. + - Conversion between 2 color systems should pass by the RGB one. + + * Generic and concrete morphers are now implemented in Olena. + - Five morphers are included in this release: + Color morpher + Sub quantifying morpher + Piece morpher + Iter morpher + Slicing morpher + - These morphers can be manipulated as if they were normal images. + + +* Olena 0.9 August 8, 2003 + + * New static hierarchy paradigm + - Complete rewrite of the image hierarchy. + - The new hierarchy benefits from multiple inheritance and + diamond constructs. + - Objects' abstract interfaces made available, leading to + safer and easier algorithm writing. + - Label images such as binary_image or vectorial_image added. + + * Partial rewrite of images I/O + - Support for 1d, 3d images and windows. + - Better handling of built-in types. + + * Color conversions fixed and improved. + + * Cleanup and coding style conformance. + + * Many bug fixes. + * Improved test-suite. + + +* Olena 0.8 April 10, 2003 + + IMPORTANT NOTE: This version is not compatible with older + versions of Olena. The project has been split into three part, + so many header files have moved and new namespaces have been + created. Please read the UPGRADING file for more information. + + * Many source code cleanups. + * The source code has been split into 3 parts: image + processing (olena/), data types (integre/) and meta-programming + tools (metalic/). + * First part of the new static hierarchy paradigm implementation. + * Support for combinatorial maps. + * Many bug fixes. + + +* Olena 0.7 February 10, 2003 + + * Manual pages for the command-line utilities. + * New, saner, source tree layout. + * Each `part' of the source tree can be excluded from the + build process with configuration flags. + * New `oln.m4' file for use by autoconf'ed user projects. + * Major documentation updates. + * New `oln-config.sh' scripts for user Makefiles. + * Olena now works on Mac OS X, NetBSD, FreeBSD and Cygwin. + + +* Olena 0.6 January 15, 2003 + + * Complete rewriting of data types. + * Command line utilities. + * Fully implementation of convolutions + * Fast Fourier Transform (FFT) + * Discrete Wavelet Transform (Daubechie's wavelet) (DWT) + * Many bug fixes. + + +* Olena 0.5 July 25, 2002 + + * Documentation in LaTeX (instead of Texinfo). + * Support reading/writing gziped images + (include <oln/io/gz.hh> and link with libz). + * Complete rewrite of the static arrays + (meta::array1d, meta::array2d, meta::array3d). + * Preliminary implementation of convolutions + (oln::convol::convolve) + * All headers should now be referenced with the `oln/' prefix, + as in `#include <oln/basics2d.hh>'. + * New conversion operator: convert::stretch. + * Many bug fixes. + + +* Olena 0.4.1 April 25, 2002 + + * Buglet in the 0.4 Makefiles. + + +* Olena 0.4 April 24, 2002 + + * New morpho:: operators: + - thinning + - thickening + * New convert:: operators: + - ng_to_se + - ng_to_cse + * First sketch of a test suite. + * Many bug fixes. + + +* Olena 0.3 January 14, 2002 + + * fast_morpho() speeded-up. + * Minor bug fixes. + * "Documentation" updates. + + +* Olena 0.2b December 13, 2001 + + * Value: + - Support for HSL and HSV color systems. + - Define internal::default_less<vec<N,T>>. + + * Core: + - New window generator: mk_win_ellipse, mk_win_disc, + mk_win_ellipsoid, and mk_win_ball. + + * Various #include fixes. + + +* Olena 0.2 November 28, 2001 + + * Color: + - nrgb_8, nrgb_16, nrgb_32: new types for NTSC RGB. The + conversion from and to YIQ and HSI which assumed NTSC RGB + has been adjusted to actually use nrgb_* (instead of rgb_*) + and renamed accordingly. + - yuv_8, yuv_16, yuv_32: New types. + + The currently available conversions are + + hsi yuv + \ / + rgb -- nrgb + \ / \ + xyz yiq + + * Various cleanups and bug fixes. Especially: + - border handling (mirroring, copying) simplified and fixed. + - ++k, --k: return a value with the same type as k. + + * I/O: + - pnm/P1, pnm/P3, and pnm/P6 support for image_3d. + + +* Olena 0.1f November 22, 2001 + + * Core: + - Several bug fixes in memory handling. + + * Types: + - New color types: HSI, YIQ; with conversions to and from RGB. + - `min()' and `max()' are now defined with the types (i.e. + not in math/macros.hh), along with the other operators. + Also, these procedures will two arguments of different + types. + + * Casts: + - `cast::round': similar to C's round() + - `cast::rbound': ditto, but constrained to fit the + output type's range. + + * I/O: + - Support for `image_3d<int_u<N> >' (as PNM P2 & P5). + + * Processings + - `level::is_greater_or_equal', `level::is_greater', + `level::is_lower_or_equal', `level::is_lower', + `level::is_equal': Comparisons between images. + - `level::connected_component': Number connected components. + - `morpho::geodesic_dilation', `morpho::simple_geodesic_dilation'. + - `morpho::geodesic_erosion', `morpho::simple_geodesic_erosion'. + - `morpho::get_plus_se_only', `morpho::get_plus_se_p', + `morpho::get_minus_se_only', `morpho::get_minus_se_p': Split + a structural element in a `plus' (lexically before than the center) + and `minus' (after). + + * Misc: + - `utils::timer': for benchmarking + - `level::lut', `level::hlut': Lookup tables. + + +* Olena 0.1d November 15, 2001 + + * Core: + - `point's, `dpoint's, and `image_size's feature a `nth()' method, + that returns the value of the nth coordinate. + - `fold': new high order operator. + + * Types: + - `vec<N,T>' uses an array to store its elements + and accepts builtin types. + - `rgb<T>' has been replaced by `rgb_8', `rgb_16', `rgb_32' + - `xyz_8', `xyz_16', `xyz_32' are new types. + - the latter six types are instances of the `color' type. + + * Processings: + - All basic morphological processings (`opening', + `hit_or_miss', `beucher_gradient', etc.) from namespace + `morpho::' have their fast equivalent in namespace + `morpho::fast::'. + - `convert::apply' is similar to `apply' but will work + for all types of conversions while `apply' can only work + on `conversion_to_type' conversions. + + * Tools: + - `utils::fill': fill an image + - `utils::f_moments', `utils::f_minmax': statistical functors. + + * Casts: + - `cast::bound': similar to `convert::bound'. + + * I/O: + - It's possible to load and save as PPM any kind of image2d + whose color has 3 components on 8 bits. + + +* Olena 0.1b November 8, 2001 + + * New type: rgb<T> + + * New processings: + - morpho::watershed_con + - convol::fast::gaussian + - convol::fast::gaussian_derivative + - convol::fast::gaussian_second_derivative + + * Conversion are organized in the following hierarchy + + conversion<Inferior> + ^ + | + conversion_to_type<To,Inferior> + ^ + | + conversion_from_type_to_type<From,To,Inferior> + + All children of conversion_from_type_to_type are models of + Adaptable Unary Function. See conversion.hh for more comments. + + * The only two functions that perform file i/o are `load' and + `save'. The other functions (`read', `write', `read_pnm', + `write_pnm') have been removed. + + * image2d<rgb<int_u8> > can be loaded and saved as ppm. + + * All iterators support a new method, cur(), that returns + the current point (or dpoint). It is meant to be used + at places where the compiler is unable to implicitly convert + an iterator into a point (or dpoint). + + * Bug fixes: + - Olena now compiles successfully with -pedantic. + - `image2d<int_u8> lena = load("lena.pgm");' works. + - Multiplications and subtractions on 'vec' no longer + perform additions. + + +* Olena 0.1 November 1, 2001 + + * Initial public release. + + +Local Variables: +mode: outline +ispell-local-dictionary: "american" +End: + +---- + +Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009, 2010 EPITA Research and +Development Laboratory (LRDE) + +This file is part of 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. + +Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. diff --git a/scribo/README b/scribo/README index 8506c66..e3e4a99 100644 --- a/scribo/README +++ b/scribo/README @@ -1,12 +1,12 @@ Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) -This file is part of Scribo. +This file is part of Olena. -Scribo is free software: you can redistribute it and/or modify it under +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. -Scribo is distributed in the hope that it will be useful, +Olena 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. @@ -49,4 +49,4 @@ scribo/ The C++ headers of Scribo. src/ - Various small tools related to DIA. See src/README. \ No newline at end of file + Various small tools related to DIA. See src/README. diff --git a/scribo/build-aux/Makefile.am b/scribo/build-aux/Makefile.am new file mode 100644 index 0000000..7fa77cb --- /dev/null +++ b/scribo/build-aux/Makefile.am @@ -0,0 +1,19 @@ +# Copyright (C) 2006, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). +# +# This file is part of 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. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. + +# File generators. +EXTRA_DIST = generate_dist_headers.sh build_unit_test.sh diff --git a/scribo/build-aux/autotroll.mk b/scribo/build-aux/autotroll.mk new file mode 120000 index 0000000..b37e671 --- /dev/null +++ b/scribo/build-aux/autotroll.mk @@ -0,0 +1 @@ +../../build-aux/autotroll.mk \ No newline at end of file diff --git a/scribo/build-aux/build_unit_test.sh b/scribo/build-aux/build_unit_test.sh new file mode 120000 index 0000000..15a20e9 --- /dev/null +++ b/scribo/build-aux/build_unit_test.sh @@ -0,0 +1 @@ +../../build-aux/build_unit_test.sh \ No newline at end of file diff --git a/scribo/build-aux/generate_dist_headers.sh b/scribo/build-aux/generate_dist_headers.sh new file mode 120000 index 0000000..ffa8b88 --- /dev/null +++ b/scribo/build-aux/generate_dist_headers.sh @@ -0,0 +1 @@ +../../build-aux/generate_dist_headers.sh \ No newline at end of file diff --git a/scribo/build-aux/regen-recursive.mk b/scribo/build-aux/regen-recursive.mk new file mode 120000 index 0000000..25c382c --- /dev/null +++ b/scribo/build-aux/regen-recursive.mk @@ -0,0 +1 @@ +../../build-aux/regen-recursive.mk \ No newline at end of file diff --git a/scribo/configure.ac b/scribo/configure.ac new file mode 100644 index 0000000..59ecc49 --- /dev/null +++ b/scribo/configure.ac @@ -0,0 +1,294 @@ +# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and +# Development Laboratory (LRDE). +# +# This file is part of 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. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. + +m4_pattern_forbid([^OLN_]) + +AC_PREREQ([2.61]) + + +## ---------------- ## +## Package set up. ## +## ---------------- ## + +AC_INIT([Olena-Scribo], [1.0a], [olena(a)lrde.epita.fr], [olena-scribo]) + +# M4 macros. +AC_CONFIG_MACRO_DIR([m4]) + +# Auxiliary files. +AC_CONFIG_AUX_DIR([build-aux]) +### AC_CONFIG_FILES([build-aux/Makefile]) + +# Automake. +AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall]) + +## --------------------- ## +## C++ compiler set up. ## +## --------------------- ## + +# If the user doesn't provide any CXXFLAGS, prevent Autoconf from +# settings its own default ones (e.g., `-g -O2' for g++). +if test ! ${CXXFLAGS+set}; then + CXXFLAGS="" +fi + +# Look for a C++ compiler. +AC_LANG([C++]) +AC_PROG_CXX + +# Set `ICPC' to `yes' if the Intel C++ compiler is used. +test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes + +# GNU C++ compiler setup. +if test "$GXX" = yes; then + # Speed up compiling times. + CXXFLAGS="$CXXFLAGS -pipe" + + # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with + # a high optimization level (`-O3') and without + # `-fno-strict-aliasing' might be wrong, at least with Debian's g++ + # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this + # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc. + # Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine. + # + # So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS + # to `-fno-strict-aliasing'. + if $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then + STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing + fi +fi +AC_SUBST([STRICT_ALIASING_CXXFLAGS]) + + +# Adjusting warning options according to compilers. +AC_ARG_VAR([WARNINGS_CXXFLAGS], [C++ compiler warning flags]) +case "$CXX" in + # Intel compiler + *icpc*) + WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418" + ;; + *) + WARNINGS_CXXFLAGS="-Wall -W" + ;; +esac + + +## -------- ## +## Milena. ## +## -------- ## + +# The current approach to providing Scribo a path to Milena's headers +# is naive: for instance, we cannot provide two paths (source and +# build dirs) in the case of an Olena build using a parallel build +# (where srcdir != builddir). Improve if needed. + +AC_ARG_WITH([milena], + [AC_HELP_STRING([--with-milena=DIR], [path to Milena headers])], + [if test x"$with_milena" = xno; then + AC_MSG_ERROR([Milena is required for Scribo. Try to invoke configure +without `--with-milena=no' nor `--without-milena.']) + fi]) +if test -n "$with_milena" && test x"$with_milena" != xyes; then + MILENA_CPPFLAGS="-I$with_milena" +fi +swl_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$MILENA_CPPFLAGS $CPPFLAGS" +AC_CHECK_HEADER([mln/core/essential.hh], [], + AC_MSG_ERROR([Cannot find Milena's headers. Try to invoke configure with +`--with-milena=DIR'.])) +CPPFLAGS=$swl_save_CPPFLAGS +AC_SUBST([MILENA_CPPFLAGS]) + + +## ------------------ ## +## Libraries set up. ## +## ------------------ ## + +# Use Libtool. +# To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used. +AC_PROG_LIBTOOL + + +## -------------------- ## +## External libraries. ## +## -------------------- ## + +# ---------- # +# Magick++. # +# ---------- # + +OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx], + [MAGICKXX], [], [ImageMagick++]) + +# ---- # +# Qt. # +# ---- # + +AT_WITH_QT([xml], [], [], [:], [oln_have_qt=yes]) +if test x$oln_have_qt = xyes; then + AT_REQUIRE_QT_VERSION([4], + AC_MSG_WARN([Qt-dependent programs will be disabled.]), + oln_have_expected_qt_version=yes) +fi +AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes]) + +# ----------- # +# Tesseract. # +# ----------- # + +OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], + [tesseract], [TESSERACT]) + +# -------------- # +# TIFF library. # +# -------------- # + +OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) + + +dnl<<lrde +## -------- ## +## Scribo. ## +## -------- ## + +AC_ARG_ENABLE([scribo], + [AS_HELP_STRING([--enable-scribo], + [enable Scribo])]) +AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes]) + +AC_CONFIG_FILES([ + Makefile + build-aux/Makefile + demo/Makefile + demo/review/Makefile + demo/viewer/Makefile + src/Makefile + src/binarization/Makefile + src/contest/Makefile + src/contest/hdibco-2010/Makefile + src/debug/Makefile + src/filter/Makefile + src/misc/Makefile + src/postprocessing/Makefile + src/preprocessing/Makefile + src/primitive/Makefile + src/primitive/extract/Makefile + src/primitive/find/Makefile + src/primitive/group/Makefile + src/table/Makefile + src/text/Makefile +]) + +AC_CONFIG_FILES([tests/data.hh]) + +AC_CONFIG_FILES([ + tests/Makefile + tests/binarization/Makefile + tests/core/Makefile + tests/filter/Makefile + tests/preprocessing/Makefile + tests/table/Makefile + tests/text/Makefile + tests/toolchain/Makefile + tests/toolchain/nepomuk/Makefile + tests/unit_test/Makefile +]) + +# Flags for Scribo +AC_ARG_VAR([SCRIBO_CXXFLAGS], [C++ compiler flags for Scribo binaries]) +AC_ARG_VAR([SCRIBO_TESTS_CXXFLAGS], [C++ compiler flags for Scribo tests]) +if test "$GXX" = yes || test "$ICPC" = yes; then + test -z "$SCRIBO_CXXFLAGS" && SCRIBO_CXXFLAGS="-DNDEBUG -O2" + # FIXME: We might want to use -ggdb when g++ is used. + test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0" +fi +dnl>> + +## ----------------- ## +## Verbose display. ## +## ----------------- ## + +# Do not print this information by default, since `configure' outputs +# should be kept short. Longer explanations are always available in +# config.log. + +AC_ARG_ENABLE([verbose], + [AS_HELP_STRING([--enable-verbose], [enable verbose display])], + [if test "x$enable_verbose" != xno; then + AC_MSG_RESULT([ +------------------------------------------------------------------------------- +Configuration summary. + + +Host system type: $host +Build system type: $build + +================ +| Dependencies | +================ + + + Option Enabled and available +------------------------------------------------------------------------------- +Magick++ --with-magickxx $oln_have_magickxx +Qt --with-qt $oln_have_qt +Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract +TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff +------------------------------------------------------------------------------- + + + + +Options used to compile and link: + PREFIX = $PREFIX_DIR + EXEC-PREFIX = $EXEC_PREFIX_DIR + VERSION = $PACKAGE_VERSION + CC = $CC + CFLAGS = $CFLAGS + CPPFLAGS = $MAGICK_CPPFLAGS + DEFS = $DEFS + LDFLAGS = $LDFLAGS + LIBS = $MAGICK_LIBS + CXX = $CXX + CXXFLAGS = $CXXFLAGS + PKG_CONFIG = $PKG_CONFIG + QT_PATH = $QT_PATH + QMAKE = $QMAKE + MOC = $MOC + UIC = $UIC + RCC = $RCC + MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS + MAGICKXX_LIBS = $MAGICKXX_LDFLAGS + SCRIBO_CXXFLAGS = $SCRIBO_CXXFLAGS + + + +******************************************************************************* +Scribo is configured as stated above. Please verify that this configuration +matches your expectations. + +Then, type 'make' to build Olena and 'make install' to install it on +your system. +]) +fi]) + + +## -------- ## +## Output. ## +## -------- ## + +AC_OUTPUT diff --git a/swilena/configure.gnu b/scribo/configure.gnu similarity index 100% copy from swilena/configure.gnu copy to scribo/configure.gnu diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index b51084e..3fd0e02 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -1,6 +1,6 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk .PHONY : demo diff --git a/scribo/m4/autotroll.m4 b/scribo/m4/autotroll.m4 new file mode 120000 index 0000000..cd1f77e --- /dev/null +++ b/scribo/m4/autotroll.m4 @@ -0,0 +1 @@ +../../m4/autotroll.m4 \ No newline at end of file diff --git a/scribo/m4/oln-with-lib.m4 b/scribo/m4/oln-with-lib.m4 new file mode 120000 index 0000000..446a869 --- /dev/null +++ b/scribo/m4/oln-with-lib.m4 @@ -0,0 +1 @@ +../../m4/oln-with-lib.m4 \ No newline at end of file diff --git a/scribo/m4/pkg.m4 b/scribo/m4/pkg.m4 new file mode 120000 index 0000000..38eeb23 --- /dev/null +++ b/scribo/m4/pkg.m4 @@ -0,0 +1 @@ +../../m4/pkg.m4 \ No newline at end of file diff --git a/scribo/scribo.mk b/scribo/scribo.mk index c899631..ad0b76e 100644 --- a/scribo/scribo.mk +++ b/scribo/scribo.mk @@ -15,13 +15,13 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. +MILENA_CPPFLAGS = @MILENA_CPPFLAGS@ -# Add path to Scribo's headers -AM_CPPFLAGS = \ - -I$(top_srcdir)/scribo \ - -I$(top_builddir)/scribo\ - -I$(top_srcdir)/milena \ - -I$(top_builddir)/milena +# Add paths to Scribo's and Milena's headers. +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(MILENA_CPPFLAGS) SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_CXXFLAGS) diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 52df66d..c8eca53 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk SUBDIRS = \ binarization \ diff --git a/scribo/src/README b/scribo/src/README index 582168d..e0d00d8 100644 --- a/scribo/src/README +++ b/scribo/src/README @@ -1,12 +1,12 @@ Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) -This file is part of Scribo. +This file is part of Olena. -Scribo is free software: you can redistribute it and/or modify it under +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. -Scribo is distributed in the hope that it will be useful, +Olena 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. @@ -36,4 +36,4 @@ Here is a description of some of them: text_recognition_in_picture: Localize, extract and try to recognize text in pictures - (experimental). \ No newline at end of file + (experimental). diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 277125a..42420d9 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ pgm_global_threshold_auto \ diff --git a/scribo/src/contest/Makefile.am b/scribo/src/contest/Makefile.am index 81f314b..8a0c7de 100644 --- a/scribo/src/contest/Makefile.am +++ b/scribo/src/contest/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk SUBDIRS = \ - hdibco-2010 \ No newline at end of file + hdibco-2010 diff --git a/scribo/src/contest/hdibco-2010/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am index a59e424..624f57d 100644 --- a/scribo/src/contest/hdibco-2010/Makefile.am +++ b/scribo/src/contest/hdibco-2010/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk bin_PROGRAMS = sauvola_ms_hdibco diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index f3dd4f9..5e0b68a 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ show_info_x_height \ diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am index 4e2b8d1..15b097c 100644 --- a/scribo/src/filter/Makefile.am +++ b/scribo/src/filter/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ objects_large \ diff --git a/scribo/src/misc/Makefile.am b/scribo/src/misc/Makefile.am index 693b579..88a672c 100644 --- a/scribo/src/misc/Makefile.am +++ b/scribo/src/misc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ dmap \ diff --git a/scribo/src/postprocessing/Makefile.am b/scribo/src/postprocessing/Makefile.am index b21cac2..ecfa50e 100644 --- a/scribo/src/postprocessing/Makefile.am +++ b/scribo/src/postprocessing/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ fill_object_holes diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 0c6e00a..25bddd3 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ denoise_bg \ diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/Makefile.am index 7e46a66..8ef9877 100644 --- a/scribo/src/primitive/Makefile.am +++ b/scribo/src/primitive/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk SUBDIRS = \ extract \ diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 6f20ea3..f2141dd 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am index 3b5dbd2..eb6e2a0 100644 --- a/scribo/src/primitive/find/Makefile.am +++ b/scribo/src/primitive/find/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index afc4f8e..bfe8d27 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ group_from_double_link \ diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 7fc7008..b90c093 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ erase \ diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index fc03ae8..6f4df18 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo.mk bin_PROGRAMS = \ cleantxt diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index c845b43..92c45e6 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk check_PROGRAMS = \ global_threshold \ diff --git a/scribo/tests/core/Makefile.am b/scribo/tests/core/Makefile.am index cf1c528..5affcdc 100644 --- a/scribo/tests/core/Makefile.am +++ b/scribo/tests/core/Makefile.am @@ -18,7 +18,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk check_PROGRAMS = diff --git a/scribo/tests/data.hh.in b/scribo/tests/data.hh.in index 6a6f95f..fb551a8 100644 --- a/scribo/tests/data.hh.in +++ b/scribo/tests/data.hh.in @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -34,6 +34,6 @@ (as well as additional burden in Makefiles, too.). */ /// \brief The absolute path to the img directory of Scribo. -# define SCRIBO_IMG_DIR "@abs_top_srcdir@/scribo/tests/img" +# define SCRIBO_IMG_DIR "@abs_top_srcdir@/tests/img" #endif // ! SCRIBO_TESTS_DATA_HH diff --git a/scribo/tests/filter/Makefile.am b/scribo/tests/filter/Makefile.am index b0659be..0d585bd 100644 --- a/scribo/tests/filter/Makefile.am +++ b/scribo/tests/filter/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk check_PROGRAMS = \ objects_with_holes \ diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am index 24686fe..9e4bfc6 100644 --- a/scribo/tests/preprocessing/Makefile.am +++ b/scribo/tests/preprocessing/Makefile.am @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk check_PROGRAMS = \ crop \ diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 3427e6b..ce50c40 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk check_PROGRAMS = \ extract_lines_with_rank \ diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk index d95e4d2..b0c57ad 100644 --- a/scribo/tests/tests.mk +++ b/scribo/tests/tests.mk @@ -15,11 +15,12 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -AM_CPPFLAGS = \ - -I$(top_srcdir)/scribo \ - -I$(top_builddir)/scribo\ - -I$(top_srcdir)/milena \ - -I$(top_builddir)/milena +MILENA_CPPFLAGS = @MILENA_CPPFLAGS@ + +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(MILENA_CPPFLAGS) SCRIBO_TESTS_CXXFLAGS = @SCRIBO_TESTS_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS) diff --git a/scribo/tests/text/Makefile.am b/scribo/tests/text/Makefile.am index 0d48025..6c8d51d 100644 --- a/scribo/tests/text/Makefile.am +++ b/scribo/tests/text/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk check_PROGRAMS = diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/tests/toolchain/Makefile.am index 1e4a032..4350a41 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/tests/toolchain/Makefile.am @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk SUBDIRS = \ nepomuk diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am index 4bce3bd..0d24045 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/tests/toolchain/nepomuk/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk check_PROGRAMS = diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index b150824..631337b 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/tests/tests.mk +include $(top_srcdir)/tests/tests.mk COND_TESTS = cond_tests_qt \ cond_tests_qt_tesseract_tiff \ -- 1.5.6.5

14 years, 2 months

last-svn-commit-532-g9b1df69 Autoconfiscate Scribo.

by Roland Levillain

14 years, 2 months

last-svn-commit-531-ge476c25 Factor .gitignore files.

by Roland Levillain

--- .gitignore | 26 ++++++++++++++++++++++++++ build-aux/.gitignore | 19 ------------------- dynamic-use-of-static-c++/.gitignore | 8 ++++++++ dynamic-use-of-static-c++/config/.gitignore | 7 ------- m4/.gitignore | 5 ----- milena/.gitignore | 19 +++++++++++++++++++ milena/doc/.gitignore | 23 ----------------------- milena/tests/unit_test/.gitignore | 1 - scribo/.gitignore | 1 + scribo/tests/unit_test/.gitignore | 1 - 10 files changed, 54 insertions(+), 56 deletions(-) delete mode 100644 build-aux/.gitignore delete mode 100644 dynamic-use-of-static-c++/config/.gitignore delete mode 100644 m4/.gitignore create mode 100644 milena/.gitignore delete mode 100644 milena/doc/.gitignore delete mode 100644 milena/tests/unit_test/.gitignore create mode 100644 scribo/.gitignore delete mode 100644 scribo/tests/unit_test/.gitignore diff --git a/.gitignore b/.gitignore index dd885f5..60e1d08 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,29 @@ Makefile /configure.scan /diffs.patch /stamp-h1 + +/build-aux/config.guess +/build-aux/config.sub +/build-aux/depcomp +/build-aux/diffs.patch +/build-aux/*.elc +/build-aux/elisp-comp +/build-aux/install-sh +/build-aux/*.log +/build-aux/ltmain.sh +/build-aux/*Makefile +/build-aux/*Makefile?in +/build-aux/mdate-sh +/build-aux/missing +/build-aux/*.patch +/build-aux/patches* +/build-aux/py-compile +/build-aux/*.rej +/build-aux/*TAGS +/build-aux/texinfo.tex + +/m4/libtool.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 +/m4/lt~obsolete.m4 diff --git a/build-aux/.gitignore b/build-aux/.gitignore deleted file mode 100644 index fb342f9..0000000 --- a/build-aux/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -/config.guess -/config.sub -/depcomp -/diffs.patch -/*.elc -/elisp-comp -/install-sh -/*.log -/ltmain.sh -/*Makefile -/*Makefile?in -/mdate-sh -/missing -/*.patch -/patches* -/py-compile -/*.rej -/*TAGS -/texinfo.tex diff --git a/dynamic-use-of-static-c++/.gitignore b/dynamic-use-of-static-c++/.gitignore index 26254f4..721031b 100644 --- a/dynamic-use-of-static-c++/.gitignore +++ b/dynamic-use-of-static-c++/.gitignore @@ -19,3 +19,11 @@ /diffs.patch /libltdl /stamp-h1 + +/config/argz.m4 +/config/libtool.m4 +/config/ltdl.m4 +/config/ltoptions.m4 +/config/ltsugar.m4 +/config/ltversion.m4 +/config/lt~obsolete.m4 diff --git a/dynamic-use-of-static-c++/config/.gitignore b/dynamic-use-of-static-c++/config/.gitignore deleted file mode 100644 index 86d9151..0000000 --- a/dynamic-use-of-static-c++/config/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/argz.m4 -/libtool.m4 -/ltdl.m4 -/ltoptions.m4 -/ltsugar.m4 -/ltversion.m4 -/lt~obsolete.m4 diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index 94e6f26..0000000 --- a/m4/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/libtool.m4 -/ltoptions.m4 -/ltsugar.m4 -/ltversion.m4 -/lt~obsolete.m4 diff --git a/milena/.gitignore b/milena/.gitignore new file mode 100644 index 0000000..8c2049a --- /dev/null +++ b/milena/.gitignore @@ -0,0 +1,19 @@ +/doc/Doxyfile_user +/doc/user-refman +/doc/user-refman.pdf +/doc/Doxyfile_devel +/doc/devel-refman +/doc/devel-refman.pdf +/doc/figures/*.png +/doc/ref-guide.hh +/doc/ref-guide.pdf +/doc/ref-guide/ +/doc/technical.pdf +/doc/technical/ +/doc/tutorial.hh +/doc/tutorial.pdf +/doc/tutorial/ +/doc/white-paper.pdf +/doc/white-paper/ + +/tests/unit_test/mln_*.cc diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore deleted file mode 100644 index 3c88ad7..0000000 --- a/milena/doc/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -/Doxyfile_user -/user-refman -/user-refman.pdf - -/Doxyfile_devel -/devel-refman -/devel-refman.pdf - -/figures/*.png - -/ref-guide.hh -/ref-guide.pdf -/ref-guide/ - -/technical.pdf -/technical/ - -/tutorial.hh -/tutorial.pdf -/tutorial/ - -/white-paper.pdf -/white-paper/ diff --git a/milena/tests/unit_test/.gitignore b/milena/tests/unit_test/.gitignore deleted file mode 100644 index bb4b393..0000000 --- a/milena/tests/unit_test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mln_*.cc diff --git a/scribo/.gitignore b/scribo/.gitignore new file mode 100644 index 0000000..4dd853a --- /dev/null +++ b/scribo/.gitignore @@ -0,0 +1 @@ +/tests/unit_test/scribo_*.cc diff --git a/scribo/tests/unit_test/.gitignore b/scribo/tests/unit_test/.gitignore deleted file mode 100644 index d67e8d6..0000000 --- a/scribo/tests/unit_test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/scribo_*.cc -- 1.5.6.5

14 years, 2 months

last-svn-commit-530-gf9da35e Factor .gitignore files.

by Roland Levillain

14 years, 2 months

last-svn-commit-531-g9884f00 Factor .gitignore files.

by Roland Levillain

14 years, 2 months

last-svn-commit-546-ge313ea2 Add tests for objects filtering routines.

by Guillaume Lazzara

* tests/filter/Makefile.am: Add targets. * tests/filter/components_large.cc, * tests/filter/components_small.cc: New. * tests/filter/small_and_large_bboxes.cc: Remove. Depracted. --- scribo/ChangeLog | 11 ++++ scribo/tests/filter/Makefile.am | 9 ++- ...all_and_large_bboxes.cc => components_large.cc} | 49 +++++++++++++------- ...all_and_large_bboxes.cc => components_small.cc} | 48 +++++++++++++------ 4 files changed, 81 insertions(+), 36 deletions(-) copy scribo/tests/filter/{small_and_large_bboxes.cc => components_large.cc} (68%) rename scribo/tests/filter/{small_and_large_bboxes.cc => components_small.cc} (69%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 54d8d47..5db7b16 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2010-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add tests for objects filtering routines. + + * tests/filter/Makefile.am: Add targets. + + * tests/filter/components_large.cc, + * tests/filter/components_small.cc: New. + + * tests/filter/small_and_large_bboxes.cc: Remove. Depracted. + +2010-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix objects filtering routines. * scribo/filter/objects_large.hh: Add an overload. diff --git a/scribo/tests/filter/Makefile.am b/scribo/tests/filter/Makefile.am index b0659be..8064646 100644 --- a/scribo/tests/filter/Makefile.am +++ b/scribo/tests/filter/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -18,10 +19,12 @@ include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = \ objects_with_holes \ - small_and_large_bboxes + components_small \ + components_large objects_with_holes_SOURCES = objects_with_holes.cc -small_and_large_bboxes_SOURCES = small_and_large_bboxes.cc +components_small_SOURCES = components_small.cc +components_large_SOURCES = components_large.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/filter/small_and_large_bboxes.cc b/scribo/tests/filter/components_large.cc similarity index 68% copy from scribo/tests/filter/small_and_large_bboxes.cc copy to scribo/tests/filter/components_large.cc index b3d7d5f..543b90d 100644 --- a/scribo/tests/filter/small_and_large_bboxes.cc +++ b/scribo/tests/filter/components_large.cc @@ -24,6 +24,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file + #include <iostream> #include <mln/core/image/image2d.hh> @@ -36,7 +38,7 @@ #include <scribo/primitive/group/apply.hh> #include <scribo/primitive/link/with_single_left_link.hh> #include <scribo/primitive/group/from_single_link.hh> -#include <scribo/filter/objects_small.hh> +#include <scribo/filter/objects_large.hh> #include <scribo/make/debug_filename.hh> #include <scribo/debug/save_bboxes_image.hh> @@ -54,30 +56,43 @@ int main() image2d<bool> input; io::pbm::load(input, img.c_str()); - value::label_16 nbboxes; - typedef image2d<value::label_16> L; - component_set<L> - text = primitive::extract::components(input, c8(), nbboxes); + typedef value::label_16 V; + typedef image2d<V> L; + + { + V nbboxes; + component_set<L> + text = primitive::extract::components(input, c8(), nbboxes); + + object_links<L> links = primitive::link::with_single_left_link(text, 30); + + + mln_assertion(nbboxes == 12u); - object_links<L> links = primitive::link::with_single_left_link(text, 30); + object_groups<L> groups = primitive::group::from_single_link(links); + component_set<L> grouped_comps = primitive::group::apply(groups); - mln_assertion(nbboxes == 12u); + mln_assertion(grouped_comps.nelements() == 6u); - object_groups<L> groups = primitive::group::from_single_link(links); + component_set<L> + filtered_comps = scribo::filter::components_large(grouped_comps, 20); - component_set<L> grouped_comps = primitive::group::apply(groups); + unsigned valid_comps = 0; + for_all_comps(c, filtered_comps) + if (filtered_comps(c).is_valid()) + ++valid_comps; - mln_assertion(grouped_comps.nelements() == 6u); + mln_assertion(valid_comps == 4u); + } - component_set<L> - filtered_comps = scribo::filter::components_small(grouped_comps, 20); - unsigned valid_comps = 0; - for_all_comps(c, filtered_comps) - if (filtered_comps(c).is_valid()) - ++valid_comps; + { + V nlabels; + image2d<bool> output = scribo::filter::components_large(input, c8(), + nlabels, 20); - mln_assertion(valid_comps == 2u); + mln_assertion(nlabels == 4u); + } } diff --git a/scribo/tests/filter/small_and_large_bboxes.cc b/scribo/tests/filter/components_small.cc similarity index 69% rename from scribo/tests/filter/small_and_large_bboxes.cc rename to scribo/tests/filter/components_small.cc index b3d7d5f..d9b5325 100644 --- a/scribo/tests/filter/small_and_large_bboxes.cc +++ b/scribo/tests/filter/components_small.cc @@ -24,6 +24,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file + #include <iostream> #include <mln/core/image/image2d.hh> @@ -44,6 +46,7 @@ #include "tests/data.hh" + int main() { using namespace scribo; @@ -54,30 +57,43 @@ int main() image2d<bool> input; io::pbm::load(input, img.c_str()); - value::label_16 nbboxes; - typedef image2d<value::label_16> L; - component_set<L> - text = primitive::extract::components(input, c8(), nbboxes); + typedef value::label_16 V; + typedef image2d<V> L; + + { + V nbboxes; + component_set<L> + text = primitive::extract::components(input, c8(), nbboxes); + + object_links<L> links = primitive::link::with_single_left_link(text, 30); + + + mln_assertion(nbboxes == 12u); - object_links<L> links = primitive::link::with_single_left_link(text, 30); + object_groups<L> groups = primitive::group::from_single_link(links); + component_set<L> grouped_comps = primitive::group::apply(groups); - mln_assertion(nbboxes == 12u); + mln_assertion(grouped_comps.nelements() == 6u); - object_groups<L> groups = primitive::group::from_single_link(links); + component_set<L> + filtered_comps = scribo::filter::components_small(grouped_comps, 20); - component_set<L> grouped_comps = primitive::group::apply(groups); + unsigned valid_comps = 0; + for_all_comps(c, filtered_comps) + if (filtered_comps(c).is_valid()) + ++valid_comps; - mln_assertion(grouped_comps.nelements() == 6u); + mln_assertion(valid_comps == 2u); + } - component_set<L> - filtered_comps = scribo::filter::components_small(grouped_comps, 20); - unsigned valid_comps = 0; - for_all_comps(c, filtered_comps) - if (filtered_comps(c).is_valid()) - ++valid_comps; + { + V nlabels; + image2d<bool> output = scribo::filter::components_small(input, c8(), + nlabels, 20); - mln_assertion(valid_comps == 2u); + mln_assertion(nlabels == 8u); + } } -- 1.5.6.5

14 years, 2 months

last-svn-commit-545-g8022d3d Fix objects filtering routines.

by Guillaume Lazzara

* scribo/filter/objects_large.hh: Add an overload. * scribo/filter/objects_small.hh: Fix undefined variable. * scribo/fun/v2b/objects_large_filter.hh, * scribo/fun/v2b/objects_small_filter.hh: Correctly count the non filtered object. --- scribo/ChangeLog | 12 ++++++ scribo/scribo/filter/objects_large.hh | 46 +++++++++++++++++++++++++ scribo/scribo/filter/objects_small.hh | 7 ++-- scribo/scribo/fun/v2b/objects_large_filter.hh | 15 ++++++-- scribo/scribo/fun/v2b/objects_small_filter.hh | 19 +++++++--- 5 files changed, 87 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5660dc5..54d8d47 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,15 @@ +2010-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix objects filtering routines. + + * scribo/filter/objects_large.hh: Add an overload. + + * scribo/filter/objects_small.hh: Fix undefined variable. + + * scribo/fun/v2b/objects_large_filter.hh, + * scribo/fun/v2b/objects_small_filter.hh: Correctly count the non + filtered object. + 2010-08-31 Guillaume Lazzara <z(a)lrde.epita.fr> Change return value for background in filtering functions. diff --git a/scribo/scribo/filter/objects_large.hh b/scribo/scribo/filter/objects_large.hh index 81986e4..8dfec9d 100644 --- a/scribo/scribo/filter/objects_large.hh +++ b/scribo/scribo/filter/objects_large.hh @@ -72,10 +72,56 @@ namespace scribo const V& label_type, unsigned max_size); + /// Remove too large components. + /// + /// \param[in] components An object image. + /// \param[in] max_size The maximum cardinality of an object. + /// + /// \return A component set with large components set to + /// component::Ignored. + template <typename L> + inline + component_set<L> + components_large(const component_set<L>& components, + unsigned max_size); + # ifndef MLN_INCLUDE_ONLY + + template <typename I, typename N, typename V> + inline + mln_concrete(I) + components_large(const Image<I>& input_, + const Neighborhood<N>& nbh_, + V& nlabels, + unsigned min_size) + { + trace::entering("scribo::filter::components_large"); + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + mln_precondition(input.is_valid()); + mln_precondition(nbh.is_valid()); + + typedef mln_ch_value(I,V) lbl_t; + component_set<lbl_t> + lbl = primitive::extract::components(input, nbh, nlabels); + + typedef fun::v2b::components_large_filter<mln_ch_value(I,V)> func_t; + func_t fv2b(lbl, min_size); + mln_concrete(I) + output = mln::data::transform(lbl.labeled_image(), fv2b); + nlabels = fv2b.nlabels_; + + trace::exiting("scribo::filter::components_large"); + return output; + } + + + template <typename L> inline component_set<L> diff --git a/scribo/scribo/filter/objects_small.hh b/scribo/scribo/filter/objects_small.hh index 1520f7d..c18c86f 100644 --- a/scribo/scribo/filter/objects_small.hh +++ b/scribo/scribo/filter/objects_small.hh @@ -70,7 +70,7 @@ namespace scribo mln_concrete(I) components_small(const Image<I>& input_, const Neighborhood<N>& nbh_, - const V& label_type, + V& nlabels, unsigned min_size); @@ -79,7 +79,8 @@ namespace scribo /// \param[in] components An object image. /// \param[in] min_size The minimum cardinality of an object. /// - /// \return An object image without small components. + /// \return A component set with small components set to + /// component::Ignored. template <typename L> component_set<L> components_small(const component_set<L>& components, @@ -104,9 +105,7 @@ namespace scribo mln_precondition(input.is_valid()); mln_precondition(nbh.is_valid()); - (void) label_type; - V nlabels; typedef mln_ch_value(I,V) lbl_t; component_set<lbl_t> lbl = primitive::extract::components(input, nbh, nlabels); diff --git a/scribo/scribo/fun/v2b/objects_large_filter.hh b/scribo/scribo/fun/v2b/objects_large_filter.hh index 91da10d..bb41850 100644 --- a/scribo/scribo/fun/v2b/objects_large_filter.hh +++ b/scribo/scribo/fun/v2b/objects_large_filter.hh @@ -88,7 +88,10 @@ namespace scribo const component_set<L> components_; /// The number of labels remaining after filtering. - mln_value(L) nlabels_; + mutable mln_value(L) nlabels_; + + /// Has already been taken into account. + mutable util::array<bool> marked_; }; @@ -102,7 +105,8 @@ namespace scribo components_large_filter<L>::components_large_filter( const component_set<L>& components, unsigned max_size) - : max_size_(max_size), components_(components) + : max_size_(max_size), components_(components), nlabels_(0), + marked_(mln::value::next(components.nelements()), false) { } @@ -117,9 +121,14 @@ namespace scribo return false; if (components_.info(l).card() <= max_size_) { - ++nlabels_; + if (!marked_(l)) + { + nlabels_ = value::next(nlabels_); + marked_(l) = true; + } return true; } + return false; } diff --git a/scribo/scribo/fun/v2b/objects_small_filter.hh b/scribo/scribo/fun/v2b/objects_small_filter.hh index 86d9287..0eda4cd 100644 --- a/scribo/scribo/fun/v2b/objects_small_filter.hh +++ b/scribo/scribo/fun/v2b/objects_small_filter.hh @@ -32,7 +32,6 @@ /// Remove small components in a binary image. - # include <mln/core/concept/function.hh> # include <mln/util/array.hh> @@ -41,8 +40,9 @@ # include <mln/labeling/compute.hh> -# include <scribo/core/component_set.hh> +# include <mln/value/next.hh> +# include <scribo/core/component_set.hh> namespace scribo { @@ -89,7 +89,10 @@ namespace scribo const component_set<L> components_; /// The number of labels remaining after filtering. - mln_value(L) nlabels_; + mutable mln_value(L) nlabels_; + + /// Has already been taken into account. + mutable mln::util::array<bool> marked_; }; @@ -103,7 +106,8 @@ namespace scribo components_small_filter<L>::components_small_filter( const component_set<L>& components, unsigned min_size) - : min_size_(min_size), components_(components), nlabels_(0) + : min_size_(min_size), components_(components), nlabels_(0), + marked_(mln::value::next(components.nelements()), false) { } @@ -118,9 +122,14 @@ namespace scribo return false; if (components_.info(l).card() >= min_size_) { - ++nlabels_; + if (!marked_(l)) + { + nlabels_ = value::next(nlabels_); + marked_(l) = true; + } return true; } + return false; } -- 1.5.6.5

14 years, 2 months

last-svn-commit-525-g83d0183 Fix Milena's distribution.

by Roland Levillain

* Makefile.am (dist_img_DATA): Add img/picasso.ppm. --- milena/ChangeLog | 6 ++++++ milena/Makefile.am | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f9b40f9..cbdb79b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2010-10-26 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Milena's distribution. + + * Makefile.am (dist_img_DATA): Add img/picasso.ppm. + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> * headers.mk, tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/Makefile.am b/milena/Makefile.am index bac240d..99f5268 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -94,6 +94,7 @@ dist_img_DATA = \ img/medium.ppm \ img/picasso.pbm \ img/picasso.pgm \ + img/picasso.ppm \ img/quite-small.pgm \ img/small.pbm \ img/small.pgm \ -- 1.5.6.5

14 years, 2 months

last-svn-commit-557-gbd17ca0 Makefile.am: Add new rules to build rpm and deb packages.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ Makefile.am | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56ed6c1..34b038c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * Makefile.am: Add new rules to build rpm and deb packages. + +2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add package configuration files. * configure.ac: Ask for the generation of some package diff --git a/Makefile.am b/Makefile.am index f89da9f..063a088 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,3 +136,23 @@ snapshot: && $(MAKE) $(AM_MAKEFLAGS) dist \ && mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac #>> + + +regen-inst: + cd milena && $(MAKE) regen-inst \ + && cd scribo && $(MAKE) regen-inst + +deb: + cd milena && $(MAKE) deb \ + && cd scribo && $(MAKE) deb + +rpm: + cd milena && $(MAKE) rpm \ + && cd scribo && $(MAKE) rpm + +pkg: + cd $(abs_top_builddir)/milena \ + && $(MAKE) pkg \ + && cd $(abs_top_builddir)/scribo \ + && $(MAKE) pkg \ + && cd $(abs_top_builddir) \ No newline at end of file -- 1.5.6.5

14 years, 2 months

last-svn-commit-556-g2c33841 Makefile.am: Add new rules to build rpm and deb packages for Scribo.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 ++++ scribo/Makefile.am | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4a840b1..992d7c2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * Makefile.am: Add new rules to build rpm and deb packages for + Scribo. + +2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/Makefile.am (CLEANFILES): Fix invalid variable name. 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 741cca4..2857d57 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -41,3 +41,56 @@ $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh scribo headers.mk nodist-headers include $(srcdir)/headers.mk + + + + +# Packaging +#---------- + +tmp_inst_dir = scribo_inst.tmp +tmp_inst_path = $(abs_builddir)/$(tmp_inst_dir) + +regen-inst: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && mkepmlist --prefix $(bindir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(bindir) \ + > $(top_srcdir)/pkg-aux/scribo_bin_list.inc \ + && mkepmlist --prefix $(libexecdir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(libexecdir) \ + >> $(top_srcdir)/pkg-aux/scribo_bin_list.inc \ + && mkepmlist --prefix $(includedir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(includedir) \ + > $(top_srcdir)/pkg-aux/scribo_include_list.inc \ + && rm -rf $(tmp_inst_path) + + +deb: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f deb -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && rm -rf $(tmp_inst_path) + + +rpm: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && rm -rf $(tmp_inst_path) + +pkg: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && epm -v -v -f deb -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && rm -rf $(tmp_inst_path) + -- 1.5.6.5

14 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches October 2010