Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-531-g9884f00 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, 3 months

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

by Roland Levillain

14 years, 3 months

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

by Roland Levillain

14 years, 3 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, 3 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, 3 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, 3 months

last-svn-commit-555-g1ed8ee4 Makefile.am: Add new rules to build rpm and deb packages for Milena.

by Guillaume Lazzara

--- milena/ChangeLog | 5 +++++ milena/Makefile.am | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f9e9bd2..f530d57 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + * Makefile.am: Add new rules to build rpm and deb packages for + Milena. + 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/labeling/compute.hh: Add a missing overload in dispatch. diff --git a/milena/Makefile.am b/milena/Makefile.am index bac240d..a12aedc 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -110,3 +110,54 @@ EXTRA_DIST += \ tests/img/test_rgb8.tif \ tests/img/test_bw.tif \ tests/img/test_gl.tif + + + +# Packaging +#---------- + +tmp_inst_dir = milena_inst.tmp +tmp_inst_path = $(abs_builddir)/$(tmp_inst_dir) + +regen-inst: + rm -rf $(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/milena_bin_list.inc \ + && mkepmlist --prefix $(datarootdir)/olena -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(datarootdir)/olena \ + >> $(top_srcdir)/pkg-aux/milena_bin_list.inc \ + && mkepmlist --prefix $(datarootdir)/doc -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(datarootdir)/doc \ + > $(top_srcdir)/pkg-aux/milena_doc_list.inc \ + && mkepmlist --prefix $(includedir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(includedir) \ + > $(top_srcdir)/pkg-aux/milena_include_list.inc \ + && rm -rf $(tmp_inst_path) + + +deb: + rm -rf $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f deb -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && rm -rf $(tmp_inst_path) + + +rpm: + rm -rf $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && rm -rf $(tmp_inst_path) + +pkg: + rm -rf $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && epm -v -v -f deb -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && rm -rf $(tmp_inst_path) + -- 1.5.6.5

14 years, 3 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, 3 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, 3 months

branch distribute-scribo updated: last-svn-commit-553-g6067c31

by lazzara＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch distribute-scribo has been updated discards a73e820e40678a7b1ce37e134766b854322fc11e (commit) discards 9d6e03f2dc8fc61320aae6d0eca1766b10b3611b (commit) discards 330d20be0d0be1488add27f82a546263b2d191e3 (commit) discards e23121549516d2c6ec01f47c834d93900c332866 (commit) discards 01b0be04ac4abb7739b9ebc415cc95c997a36937 (commit) discards 8d50316b6cef7a40f53cbeee1534f2bc0151a7e5 (commit) discards 86afde11be03ca0f23630b97d9b9797228b6dabd (commit) discards eeb2374b8ab58b8e8ad3edcf745573b96c96dcc6 (commit) discards dce59ecf2488784f4c403f9704f213f2ee25af06 (commit) discards 4a2bb958c2a6159916a7e943a655f3b65184d3d3 (commit) discards 41318782a928e2ff9d3b0fbf46e432658e289d6e (commit) discards 5e6b26dcba53c84a5ccdc8deb719a21647d91e8c (commit) discards 59dededb8e58c6baf67bf1f43a039ffc32840c08 (commit) discards de89d9cc0d3bd2b1bb375e5a9b4bcc439d5cc6ca (commit) via 6067c3116a8d2b93468a31dade50dc9b08b546ed (commit) via 41c86c19ddf572f665b2792482326c3931b73ff7 (commit) via c26599b5852077c93b6a034e6227a900920ca460 (commit) via cb6073b98417014a52d6eef64b9f64ae5ccb150b (commit) via 0e9feb0f40d45a2f0d6bf2e4e306dc8639f80cc5 (commit) via abb3c6e5f0828c643bc8fb2edf20803e2612b234 (commit) via c76e031ae15f0f2dfb5bdfb6003c1e014b245ca4 (commit) via 099775a7808c97a11f2a3bdee4a867d869b74244 (commit) via 996b5e8954ae8cca3d02b95944b92587624707f0 (commit) via 9f61c59a05cd064bf8a936735809230f77c02e15 (commit) via 3553ffac27fc5037e01e4f9f1d2b74154f399b3d (commit) via 6b001285348e035cb589a1c760934954652f25f3 (commit) via 56c14243d62ab8acb9e743ce3499a3d495a4dcb9 (commit) via f8e2118bd19023a35a46a91666ea23c8ba5e6508 (commit) via 1d96a82bf04b223792855301b01a0bc8f40ec162 (commit) via d8f86fcf336b9ab608b23cd3d8926413eb064ee1 (commit) via b018159ad335cb63ad52bcd74787d759252dbbcc (commit) via 4f0776278d9559d965b90092fa7d7f568d8644b4 (commit) via 2eafecb020b1a4666eb9eeab739f82570ae5adbe (commit) via 40966ccf914d0289ee0e84c049b06f3606af738e (commit) via f8cd44ed57c9f1ba77825aa949741f7a02bd08b0 (commit) via 2f0dd88656925244a51a763ee0032f0963931dff (commit) via 677cf61d18c7f4e7a16513ed96787b04f034a138 (commit) via a912c618793646fd40dec6024dc70378dc033edb (commit) via df42e566d39e2684f747a96ea0ee417d82427bc4 (commit) via c24234ae068e910ffbb2574b7159715c7e4a7141 (commit) via 57977f81558b43b3893bc5d911788e6454bbb7fb (commit) via c5f99a53310656248179f8298a4ef1227dfa67ee (commit) via 74fe46474374fc2fb128f79a94590adfae77864e (commit) via c043808bc7590289ae081ebe381f4ddab862a1bc (commit) via b9df1795cd61827f66a60ce6cd7edde8115b5b7f (commit) via 3a2500e1a3628de9314d46459c47555f56a3a711 (commit) via 767a8e2076101a7448265dfd3085a4aeaa625eda (commit) via 4b467cf5cbddf2f24b931d1aa19c1e8b99804e3c (commit) via ba4ead142db4b22e2823596f5860b85d6cba5ecf (commit) via 2dafa4753683b1d68d6ec7e3293f2fd4e1290d15 (commit) via a42fcb6d12877b504714982175b2e1a6b7c30223 (commit) via 8a8fddca95f9a4f8778e7867797d4798d1aea735 (commit) via 3086fc9ecfbdca81f66d436856d48d0656ea3b1c (commit) via bddf6ea31d206404da2b996a4d4cd1744030f295 (commit) via 89cb68ce41151437ee1b5e9ef79779162f0fe8b7 (commit) via b369b21a34fdec2d4eecf7ca541eab134b4b4f69 (commit) via 1085d061a2ded99cea81264971abfeafe22aa66f (commit) via 891e7283fd5bf923bfb5731e3a9c294801278955 (commit) via 829030ba9da901dac83587ab19865afb0c783962 (commit) via 6fbd302e5cfd421f741415ddb576067a5bfb17a2 (commit) via 52908636a521d9d5d33399ef01f9ff91eba8972f (commit) via 637d70cf4ba56454a0b4861b22f58df3218a742d (commit) via 944186e4a1317365fe2625b6980f93916eeee893 (commit) via 6e8b5fee00e3fbeb0170c12cf827056df3ff2d45 (commit) via 283a487eabbdb01f80a1d08c90588ccc5e0fb2b5 (commit) via f8e324b5f132b91296bc42048053fd40bbdd6dd2 (commit) via 46eae02df17b253473adcb3fbee915def6faf21a (commit) via 6b37fbf4eb648ee104e6f7e15f18e86971725cae (commit) via ffdbc84b364c6fba34cc75ae59cce0af3957840a (commit) via 949f1cba189a1f184e3e7f175a3c6a37ca68b595 (commit) via e102484ec1067be75dd6589397b5582a103f38e4 (commit) via 9c95965d51707c380726c4e04e7f5d583298a412 (commit) via 87288fed8c7c58240b9da5a6b6838b97fbc40f8e (commit) via b44674d0134c582ab347d94f0cdf0489eca2c00b (commit) via b63755a60df439aecf78e36d4a8d702ef620abc3 (commit) via a913e1f860971df1a7b804daca3d190bfcefc729 (commit) via 396cb06881fb4ce584e9c9fdfe3bd49ea2e565be (commit) via 6713b18ae5ff02fd54f2496881ccb1118c02f45c (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (a73e820e40678a7b1ce37e134766b854322fc11e) \ N -- N -- N (6067c3116a8d2b93468a31dade50dc9b08b546ed) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 117 ++++++ HACKING | 16 +- README | 63 +++- configure.ac | 380 +++++++------------- m4/autotroll.m4 | 3 + m4/oln-with-lib.m4 | 171 ++++++++-- milena/ChangeLog | 102 ++++++ milena/headers.mk | 1 + milena/mln/accu/label_used.hh | 3 +- milena/mln/algebra/vec.hh | 4 +- milena/mln/core/image/vmorph/fun_image.hh | 6 +- milena/mln/core/internal/labeled_image_base.hh | 6 +- milena/mln/fun/x2x/rotation.hh | 222 ++++++------ milena/mln/io/magick/load.hh | 4 +- milena/mln/io/magick/save.hh | 6 +- milena/mln/labeling/colorize.hh | 7 +- milena/mln/labeling/compute.hh | 23 +- milena/mln/labeling/relabel.hh | 6 +- milena/mln/labeling/superpose.hh | 14 +- milena/mln/make/relabelfun.hh | 9 +- milena/mln/set/compute_with_weights.hh | 6 +- milena/mln/value/next.hh | 125 +++++++ milena/mln/value/ops.hh | 6 +- milena/tests/accu/Makefile.am | 10 +- milena/tests/fun/x2x/composed.cc | 6 +- milena/tests/labeling/Makefile.am | 11 +- milena/tests/unit_test/Makefile.am | 10 +- ...rocessor_boost-tuple => cond_tests_boost-tuple} | 0 milena/tests/unit_test/unit-tests.mk | 8 +- milena/tests/value/builtin/Makefile.am | 6 +- milena/tests/value/builtin/floatings.cc | 38 ++ scribo/ChangeLog | 182 ++++++++++ .../binarization/internal/first_pass_functor.hh | 6 +- scribo/scribo/binarization/local_threshold.hh | 4 +- scribo/scribo/binarization/sauvola_ms.hh | 128 ++++---- .../scribo/binarization/sauvola_threshold_image.hh | 7 +- scribo/scribo/core/component_set.hh | 18 +- scribo/scribo/core/line_info.hh | 32 ++- scribo/scribo/core/line_set.hh | 2 +- scribo/scribo/core/object_links.hh | 4 +- scribo/scribo/debug/highlight_text_area.hh | 2 +- scribo/scribo/debug/usage.hh | 9 +- scribo/scribo/filter/object_groups_with_holes.hh | 5 +- scribo/scribo/filter/object_links_bbox_overlap.hh | 2 +- scribo/scribo/filter/object_links_bbox_ratio.hh | 7 +- scribo/scribo/filter/object_links_bbox_w_ratio.hh | 8 +- .../filter/object_links_non_aligned_simple.hh | 9 +- scribo/scribo/filter/objects_h_thick.hh | 2 +- scribo/scribo/filter/objects_h_thin.hh | 2 +- scribo/scribo/filter/objects_size_ratio.hh | 2 +- scribo/scribo/filter/objects_small.hh | 3 +- scribo/scribo/filter/objects_thick.hh | 2 +- scribo/scribo/filter/objects_thin.hh | 2 +- scribo/scribo/filter/objects_v_thick.hh | 2 +- scribo/scribo/filter/objects_v_thin.hh | 2 +- scribo/scribo/filter/objects_with_holes.hh | 11 +- scribo/scribo/fun/v2b/objects_large_filter.hh | 10 +- scribo/scribo/fun/v2b/objects_small_filter.hh | 15 +- scribo/scribo/postprocessing/fill_object_holes.hh | 6 +- scribo/scribo/primitive/link/compute.hh | 5 +- .../link/internal/link_single_dmax_base.hh | 14 - scribo/scribo/primitive/link/merge_double_link.hh | 5 +- .../link/with_single_left_link_dmax_ratio.hh | 2 +- scribo/scribo/subsampling/integral_single_image.hh | 8 +- scribo/scribo/table/internal/align_lines.hh | 2 +- scribo/scribo/text/merging.hh | 38 +- scribo/scribo/text/recognition.hh | 58 +++- scribo/scribo/toolchain/nepomuk/text_extraction.hh | 15 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 32 ++- scribo/src/Makefile.am | 12 +- scribo/src/pbm_text_in_doc.cc | 5 +- scribo/src/text/Makefile.am | 6 +- scribo/src/text/pbm_lines_recognition.cc | 4 + scribo/src/text/pbm_recognition.cc | 4 + scribo/src/text_in_picture.cc | 8 +- scribo/src/text_recognition_in_picture.cc | 4 + scribo/src/toolchain/Makefile.am | 19 + scribo/src/toolchain/nepomuk/Makefile.am | 45 +++ scribo/src/toolchain/nepomuk/text_extraction.cc | 62 ++++ scribo/tests/Makefile.am | 1 + scribo/tests/binarization/global_threshold.cc | 28 ++- scribo/tests/binarization/local_threshold.cc | 34 ++- scribo/tests/core/Makefile.am | 4 +- scribo/tests/core/line_info.cc | 87 +++++ scribo/tests/filter/objects_with_holes.cc | 4 +- scribo/tests/filter/small_and_large_bboxes.cc | 2 +- scribo/tests/img/pixels.pbm | 4 + scribo/tests/primitive/Makefile.am | 21 ++ scribo/tests/primitive/link/Makefile.am | 25 ++ scribo/tests/primitive/link/merge_double_link.cc | 92 +++++ scribo/tests/toolchain/nepomuk/Makefile.am | 3 +- scribo/tests/toolchain/nepomuk/text_extraction.cc | 4 + scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 + scribo/tests/unit_test/unit-tests.mk | 8 +- 94 files changed, 1847 insertions(+), 692 deletions(-) create mode 100644 milena/mln/value/next.hh rename milena/tests/unit_test/{cond_tests_boost-preprocessor_boost-tuple => cond_tests_boost-tuple} (100%) create mode 100644 milena/tests/value/builtin/floatings.cc create mode 100644 scribo/src/toolchain/Makefile.am create mode 100644 scribo/src/toolchain/nepomuk/Makefile.am create mode 100644 scribo/src/toolchain/nepomuk/text_extraction.cc create mode 100644 scribo/tests/core/line_info.cc create mode 100644 scribo/tests/img/pixels.pbm create mode 100644 scribo/tests/primitive/Makefile.am create mode 100644 scribo/tests/primitive/link/Makefile.am create mode 100644 scribo/tests/primitive/link/merge_double_link.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches