October 2010 - Olena-patches

last-svn-commit-524-g7924629 Fix Swilena's dependency tracking.
by Roland Levillain 25 Oct '10

25 Oct '10

* python/Makefile.am (%-wrap.cc %.py): Honor Automake's `AMDEP' internal conditional. --- swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index d2e2998..6d31d60 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,10 @@ +2010-10-25 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Swilena's dependency tracking. + + * python/Makefile.am (%-wrap.cc %.py): Honor Automake's `AMDEP' + internal conditional. + 2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> Canonize Swilena's tests' output file names. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index df28551..531880f 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -32,11 +32,12 @@ AM_LDFLAGS = -avoid-version -module -shared ## Run Swig to create the C++ wrapper files, the Python interface ## files, and the dependency Makefile snippets. %-wrap.cc %.py: $(top_srcdir)/swilena/%.i - if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ - mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ - else \ - rm -f "$(DEPDIR)/$*-wrap.Tcc"; exit 1;\ - fi +@AMDEP_TRUE@ if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ +@AMDEP_TRUE@ mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ +@AMDEP_TRUE@ else \ +@AMDEP_TRUE@ rm -f "$(DEPDIR)/$*-wrap.Tcc"; exit 1;\ +@AMDEP_TRUE@ fi +@AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $@ $< # ltihooks.py: Python import hooks that understand Libtool libraries. -- 1.5.6.5

1 0

branch exp/next-build-ok updated: last-svn-commit-501-g57977f8
by lazzara＠lrde.epita.fr 25 Oct '10

25 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next-build-ok has been updated via 57977f81558b43b3893bc5d911788e6454bbb7fb (commit) via c5f99a53310656248179f8298a4ef1227dfa67ee (commit) via 74fe46474374fc2fb128f79a94590adfae77864e (commit) via c043808bc7590289ae081ebe381f4ddab862a1bc (commit) from e102484ec1067be75dd6589397b5582a103f38e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 57977f8 configure.ac: Configure new test directories. c5f99a5 Small fixes in Scribo 74fe464 Add a new test for primitive::link::merge_double_link. c043808 Negate Sauvola's result. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 2 + scribo/ChangeLog | 31 +++++ scribo/scribo/binarization/local_threshold.hh | 4 +- scribo/scribo/binarization/sauvola_ms.hh | 128 ++++++++++---------- scribo/scribo/core/line_info.hh | 5 + scribo/src/text_in_doc_preprocess.cc | 2 - scribo/src/text_in_picture.cc | 2 - scribo/tests/Makefile.am | 4 +- scribo/tests/filter/objects_with_holes.cc | 4 +- scribo/tests/img/pixels.pbm | 4 + scribo/tests/{toolchain => primitive}/Makefile.am | 3 +- .../tests/primitive/link}/Makefile.am | 8 +- .../link/merge_double_link.cc} | 53 +++++++-- 14 files changed, 165 insertions(+), 89 deletions(-) create mode 100644 scribo/tests/img/pixels.pbm copy scribo/tests/{toolchain => primitive}/Makefile.am (98%) copy {milena/tests/subsampling => scribo/tests/primitive/link}/Makefile.am (86%) copy scribo/tests/{filter/objects_with_holes.cc => primitive/link/merge_double_link.cc} (55%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-501-g57977f8 configure.ac: Configure new test directories.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

--- ChangeLog | 4 ++++ configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0cac72..6a1eee9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure new test directories. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/oln-with-lib.m4: Force headers lookup in specified path. diff --git a/configure.ac b/configure.ac index 5ea0ac8..d54b3dc 100644 --- a/configure.ac +++ b/configure.ac @@ -487,6 +487,8 @@ AC_CONFIG_FILES([ scribo/tests/core/Makefile scribo/tests/filter/Makefile scribo/tests/preprocessing/Makefile + scribo/tests/primitive/Makefile + scribo/tests/primitive/link/Makefile scribo/tests/table/Makefile scribo/tests/text/Makefile scribo/tests/toolchain/Makefile -- 1.5.6.5

1 0

last-svn-commit-500-gc5f99a5 Small fixes in Scribo
by Guillaume Lazzara 25 Oct '10

25 Oct '10

* scribo/core/line_info.hh: Fix invalid extended bboxes. * src/text_in_doc_preprocess.cc: Do not invert data anymore. * tests/filter/objects_with_holes.cc: Remove useless arguments. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/core/line_info.hh | 5 +++++ scribo/src/text_in_doc_preprocess.cc | 2 -- scribo/tests/filter/objects_with_holes.cc | 4 +++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7c0ab7c..98c90d6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo + + * scribo/core/line_info.hh: Fix invalid extended bboxes. + + * src/text_in_doc_preprocess.cc: Do not invert data anymore. + + * tests/filter/objects_with_holes.cc: Remove useless arguments. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for primitive::link::merge_double_link. * tests/img/pixels.pbm: New test image. diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 99650d7..5328b33 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -672,6 +672,11 @@ namespace scribo if (D <= 2 && A > 2) D = A; + if (D < 0) + D = 0; + if (A < 0) + A = 0; + int delta = delta_of_line(); ebbox_ = mln::make::box2d(meanline_ - A, bbox().pmin().col() - delta, diff --git a/scribo/src/text_in_doc_preprocess.cc b/scribo/src/text_in_doc_preprocess.cc index 27ed9ed..fdbb018 100644 --- a/scribo/src/text_in_doc_preprocess.cc +++ b/scribo/src/text_in_doc_preprocess.cc @@ -97,7 +97,5 @@ int main(int argc, char* argv[]) std::cout << "Binarizing foreground..." << std::endl; image2d<bool> input_bin = scribo::binarization::sauvola_ms(input_gl, 101, 3); - logical::not_inplace(input_bin); - mln::io::pbm::save(input_bin, argv[2]); } diff --git a/scribo/tests/filter/objects_with_holes.cc b/scribo/tests/filter/objects_with_holes.cc index c556513..d50d6d5 100644 --- a/scribo/tests/filter/objects_with_holes.cc +++ b/scribo/tests/filter/objects_with_holes.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 <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> @@ -37,7 +39,7 @@ #include "tests/data.hh" -int main(int argc, char *argv[]) +int main() { using namespace mln; using namespace scribo; -- 1.5.6.5

1 0

last-svn-commit-499-g74fe464 Add a new test for primitive::link::merge_double_link.
by Guillaume Lazzara 25 Oct '10

25 Oct '10

* tests/img/pixels.pbm: New test image. * tests/Makefile.am (SUBDIRS): add primitive directory. * tests/primitive/Makefile.am, * tests/primitive/link/Makefile.am, * tests/primitive/link/merge_double_link.cc: New. --- scribo/ChangeLog | 12 +++++ scribo/tests/Makefile.am | 4 +- scribo/tests/img/pixels.pbm | 4 ++ scribo/tests/{toolchain => primitive}/Makefile.am | 3 +- .../tests/primitive/link}/Makefile.am | 8 +-- .../link/merge_double_link.cc} | 53 +++++++++++++++---- 6 files changed, 66 insertions(+), 18 deletions(-) create mode 100644 scribo/tests/img/pixels.pbm copy scribo/tests/{toolchain => primitive}/Makefile.am (98%) copy {milena/tests/subsampling => scribo/tests/primitive/link}/Makefile.am (86%) copy scribo/tests/{filter/objects_with_holes.cc => primitive/link/merge_double_link.cc} (55%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 73fea45..7c0ab7c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,15 @@ +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new test for primitive::link::merge_double_link. + + * tests/img/pixels.pbm: New test image. + + * tests/Makefile.am (SUBDIRS): add primitive directory. + + * tests/primitive/Makefile.am, + * tests/primitive/link/Makefile.am, + * tests/primitive/link/merge_double_link.cc: New. + 2010-10-11 Guillaume Lazzara <z(a)lrde.epita.fr> Negate Sauvola's result. diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index a6ed969..d16453c 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/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. # @@ -21,6 +22,7 @@ SUBDIRS = \ core \ filter \ preprocessing \ + primitive \ text \ toolchain \ unit_test diff --git a/scribo/tests/img/pixels.pbm b/scribo/tests/img/pixels.pbm new file mode 100644 index 0000000..e69f06d --- /dev/null +++ b/scribo/tests/img/pixels.pbm @@ -0,0 +1,4 @@ +P4 +# CREATOR: GIMP PNM Filter Version 1.1 +38 23 +ÿÿÿÿüÿÿÿÿüÿþ¿ÿüÿÿÿÿüÿþÿÿüÿÿÿÿüÿûÿÿüÿïÿÿüÿÿÿÿüÿÿÿÿüÿïÿÿüÿßÿÿüÿ×ÿÿüÿÿÿÿüÿÿÿÿüÿÿÿüÿoÿÿüÿïÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿü \ No newline at end of file diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/tests/primitive/Makefile.am similarity index 98% copy from scribo/tests/toolchain/Makefile.am copy to scribo/tests/primitive/Makefile.am index 1e4a032..82c773a 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/tests/primitive/Makefile.am @@ -17,4 +17,5 @@ include $(top_srcdir)/scribo/tests/tests.mk SUBDIRS = \ - nepomuk + link + diff --git a/milena/tests/subsampling/Makefile.am b/scribo/tests/primitive/link/Makefile.am similarity index 86% copy from milena/tests/subsampling/Makefile.am copy to scribo/tests/primitive/link/Makefile.am index 7e859b4..a42f7f5 100644 --- a/milena/tests/subsampling/Makefile.am +++ b/scribo/tests/primitive/link/Makefile.am @@ -14,14 +14,12 @@ # 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)/milena/tests/tests.mk - +include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = \ - antialiased - + merge_double_link -antialiased_SOURCES = antialiased.cc +merge_double_link_SOURCES = merge_double_link.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/filter/objects_with_holes.cc b/scribo/tests/primitive/link/merge_double_link.cc similarity index 55% copy from scribo/tests/filter/objects_with_holes.cc copy to scribo/tests/primitive/link/merge_double_link.cc index c556513..ca3002b 100644 --- a/scribo/tests/filter/objects_with_holes.cc +++ b/scribo/tests/primitive/link/merge_double_link.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,6 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +// \file + #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> @@ -34,29 +35,59 @@ #include <scribo/filter/objects_with_holes.hh> #include <scribo/primitive/extract/components.hh> +#include <scribo/primitive/link/with_single_left_link_dmax_ratio.hh> +#include <scribo/primitive/link/with_single_right_link_dmax_ratio.hh> +#include <scribo/primitive/link/merge_double_link.hh> +#include <scribo/primitive/link/internal/dmax_width_and_height.hh> #include "tests/data.hh" -int main(int argc, char *argv[]) + +int main() { using namespace mln; using namespace scribo; - std::string img = SCRIBO_IMG_DIR "/text_to_group_and_clean.pbm"; + std::string img = SCRIBO_IMG_DIR "/pixels.pbm"; + + unsigned ref_left[] = {0, 1, 1, 3, 4, 5, 6, 6, 8}; + unsigned ref_right[] = {0, 2, 2, 3, 4, 5, 6, 7, 8}; + unsigned ref_merged[] = {0, 1, 1, 3, 4, 5, 6, 7, 8}; + image2d<bool> input; io::pbm::load(input, img.c_str()); value::label_16 nlabels; - typedef component_set<image2d<value::label_16> > O; + typedef image2d<value::label_16> L; + typedef component_set<L> O; O comps = scribo::primitive::extract::components(input, c8(), nlabels); - O filtered_comps = scribo::filter::objects_with_holes(comps, 2, 1); - unsigned valid_comps = 0; - for_all_comps(c, filtered_comps) - if (filtered_comps(c).is_valid()) - ++valid_comps; + typedef primitive::link::internal::dmax_width_and_height dmax_fun_t; + + object_links<L> left_link + = primitive::link::with_single_left_link_dmax_ratio(comps, + dmax_fun_t(1), + anchor::MassCenter); + object_links<L> right_link + = primitive::link::with_single_right_link_dmax_ratio(comps, + dmax_fun_t(1), + anchor::MassCenter); + + // Validating left and right links. + object_links<L> + merged_links = primitive::link::merge_double_link(left_link, + right_link); + + + for_all_links(i, left_link) + mln_assertion(ref_left[i] == left_link(i)); + + for_all_links(i, right_link) + mln_assertion(ref_right[i] == right_link(i)); + + for_all_links(i, merged_links) + mln_assertion(ref_merged[i] == merged_links(i)); - mln_assertion(valid_comps == 8u); } -- 1.5.6.5

1 0

last-svn-commit-498-gc043808 Negate Sauvola's result.
by Guillaume Lazzara 22 Oct '10

22 Oct '10

* scribo/binarization/local_threshold.hh, * scribo/binarization/sauvola_ms.hh: Invert threshold test. * src/text_in_picture.cc: Do not negate Sauvola's output anymore. --- scribo/ChangeLog | 9 ++ scribo/scribo/binarization/local_threshold.hh | 4 +- scribo/scribo/binarization/sauvola_ms.hh | 128 ++++++++++++------------ scribo/src/text_in_picture.cc | 2 - 4 files changed, 75 insertions(+), 68 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f9fc04..73fea45 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2010-10-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Negate Sauvola's result. + + * scribo/binarization/local_threshold.hh, + * scribo/binarization/sauvola_ms.hh: Invert threshold test. + + * src/text_in_picture.cc: Do not negate Sauvola's output anymore. + 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in Scribo diff --git a/scribo/scribo/binarization/local_threshold.hh b/scribo/scribo/binarization/local_threshold.hh index aa53664..9d116ed 100644 --- a/scribo/scribo/binarization/local_threshold.hh +++ b/scribo/scribo/binarization/local_threshold.hh @@ -110,7 +110,7 @@ namespace scribo mln_piter(I) p(input.domain()); for_all(p) - output(p) = (input(p) >= threshold(p)); + output(p) = (input(p) <= threshold(p)); trace::exiting("scribo::binarization::impl::generic::local_threshold"); @@ -140,7 +140,7 @@ namespace scribo mln_pixter(const T) pt(threshold); mln_pixter(O) po(output); for_all_3(pi, pt, po) - po.val() = pi.val() >= pt.val(); + po.val() = pi.val() <= pt.val(); trace::exiting("scribo::binarization::impl::generic::local_threshold_fastest"); return output; diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index e767b86..f63a9a1 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -330,20 +330,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -354,20 +354,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1b; ptr__in += delta1b; } @@ -378,20 +378,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -403,20 +403,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1c; ptr__in += delta1c; } @@ -432,20 +432,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -456,20 +456,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1b; ptr__in += delta1b; } @@ -480,20 +480,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -504,20 +504,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1d; ptr__in += delta1d; } @@ -533,20 +533,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -557,20 +557,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1b; ptr__in += delta1b; } @@ -581,20 +581,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -605,20 +605,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1c; ptr__in += delta1c; } @@ -634,20 +634,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -658,20 +658,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1b; ptr__in += delta1b; } @@ -682,20 +682,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1f; ptr__in += delta1f; } @@ -706,20 +706,20 @@ namespace scribo { for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1; ptr__in += delta1; } for (unsigned j = 1; j < s; ++j) { - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ++ptr__out; ++ptr__in; } - *ptr__out = *ptr__in >= threshold; + *ptr__out = *ptr__in <= threshold; ptr__out += delta1e; ptr__in += delta1e; } } diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 8f530db..5cb9a9d 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -298,8 +298,6 @@ int main(int argc, char* argv[]) #endif // !NOUT - logical::not_inplace(input); - // if (debug) // io::pbm::save(input, "input.pbm"); t_ = timer_; -- 1.5.6.5

1 0

branch next-next updated: last-svn-commit-523-gb9df179
by git＠lrde.epita.fr 22 Oct '10

22 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-next has been updated via b9df1795cd61827f66a60ce6cd7edde8115b5b7f (commit) via 3a2500e1a3628de9314d46459c47555f56a3a711 (commit) via 767a8e2076101a7448265dfd3085a4aeaa625eda (commit) from 4b467cf5cbddf2f24b931d1aa19c1e8b99804e3c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- b9df179 headers.mk, tests/unit_test/unit-tests.mk: Regen. 3a2500e Do not trigger an error when Qt is missing, too old or not working. 767a8e2 Have AutoTroll always restore the initial ``current directory''. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 14 ++++++++++++++ configure.ac | 4 ++-- m4/autotroll.m4 | 3 +++ milena/ChangeLog | 4 ++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 2 ++ 6 files changed, 26 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-523-gb9df179 headers.mk, tests/unit_test/unit-tests.mk: Regen.
by Roland Levillain 22 Oct '10

22 Oct '10

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 578464c..f9b40f9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + * headers.mk, tests/unit_test/unit-tests.mk: Regen. + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> Disable the non deterministic test on mln::labeling::colorize. diff --git a/milena/headers.mk b/milena/headers.mk index b483024..f986150 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1229,6 +1229,7 @@ mln/value/label_32.hh \ mln/value/label_8.hh \ mln/value/lut_vec.hh \ mln/value/mixin.hh \ +mln/value/next.hh \ mln/value/ops.hh \ mln/value/other.hh \ mln/value/proxy.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 71543be..c5dba4c 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1353,6 +1353,7 @@ mln_value_label_32 \ mln_value_label_8 \ mln_value_lut_vec \ mln_value_mixin \ +mln_value_next \ mln_value_ops \ mln_value_other \ mln_value_proxy \ @@ -2672,6 +2673,7 @@ mln_value_label_32_SOURCES = mln_value_label_32.cc mln_value_label_8_SOURCES = mln_value_label_8.cc mln_value_lut_vec_SOURCES = mln_value_lut_vec.cc mln_value_mixin_SOURCES = mln_value_mixin.cc +mln_value_next_SOURCES = mln_value_next.cc mln_value_ops_SOURCES = mln_value_ops.cc mln_value_other_SOURCES = mln_value_other.cc mln_value_proxy_SOURCES = mln_value_proxy.cc -- 1.5.6.5

1 0

last-svn-commit-522-g3a2500e Do not trigger an error when Qt is missing, too old or not working.
by Roland Levillain 22 Oct '10

22 Oct '10

* configure.ac: Here. Protect a test from a variable expanding to an empty string. --- ChangeLog | 7 +++++++ configure.ac | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c85044..263dfff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Do not trigger an error when Qt is missing, too old or not working. + + * configure.ac: Here. + Protect a test from a variable expanding to an empty string. + +2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Have AutoTroll always restore the initial ``current directory''. * m4/autotroll.m4 (AT_WITH_QT): Always come back to the top-level diff --git a/configure.ac b/configure.ac index 4f0ddd6..63e26c0 100644 --- a/configure.ac +++ b/configure.ac @@ -216,8 +216,8 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) # Qt. # # ---- # -AT_WITH_QT([xml], [], [], [], [oln_have_qt=yes]) -if test $oln_have_qt = yes; then +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) -- 1.5.6.5

1 0

last-svn-commit-521-g767a8e2 Have AutoTroll always restore the initial ``current directory''.
by Roland Levillain 22 Oct '10

22 Oct '10

* m4/autotroll.m4 (AT_WITH_QT): Always come back to the top-level directory upon failure. --- ChangeLog | 7 +++++++ m4/autotroll.m4 | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e584ef2..4c85044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Have AutoTroll always restore the initial ``current directory''. + + * m4/autotroll.m4 (AT_WITH_QT): Always come back to the top-level + directory upon failure. + +2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Add a warning about Python 2.6 and greater regarding Swilena. * configure.ac: Here. diff --git a/m4/autotroll.m4 b/m4/autotroll.m4 index 9a7a96e..2a382d4 100644 --- a/m4/autotroll.m4 +++ b/m4/autotroll.m4 @@ -257,6 +257,7 @@ int main() _ASEOF if $QMAKE -project; then :; else AX_INSTEAD_IF([$4], [Calling $QMAKE -project failed.]) + cd .. break fi @@ -265,6 +266,7 @@ _ASEOF test -f $pro_file || pro_file=`echo *.pro` if test -f "$pro_file"; then :; else AX_INSTEAD_IF([$4], [Can't find the .pro file generated by Qmake.]) + cd .. break fi @@ -284,6 +286,7 @@ m4_ifval([$3], if $QMAKE $at_qmake_args; then :; else AX_INSTEAD_IF([$4], [Calling $QMAKE $at_qmake_args failed.]) + cd .. break fi -- 1.5.6.5

1 0