- Olena-patches

Re: [Olena-patches] [Olena] #247: mln_min() of a floating type is not the effective minimum of the range value
by Olena Trac 29 Nov '11

29 Nov '11

#247: mln_min() of a floating type is not the effective minimum of the range value -----------------------+---------------------------------------------------- Reporter: lazzara | Owner: lazzara Type: defect | Status: closed Priority: critical | Milestone: Component: Milena | Version: 2.0 Resolution: fixed | Keywords: -----------------------+---------------------------------------------------- Changes (by lazzara): * status: new => closed * resolution: => fixed Comment: The build was successful. Bug fixed. -- Ticket URL: <https://trac.lrde.org/olena/ticket/247#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

branch fix-min-float deleted: olena-2.0-19-g7876a2c
by git＠lrde.epita.fr 29 Nov '11

29 Nov '11

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 fix-min-float has been deleted was 7876a2ce362a03e89fc494def140d0bb0c6d654f ----------------------------------------------------------------------- 7876a2ce362a03e89fc494def140d0bb0c6d654f Fix invalid minimum value for builtin floating types. (ticket #247) ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: olena-2.0-19-g7876a2c
by git＠lrde.epita.fr 29 Nov '11

29 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 7876a2ce362a03e89fc494def140d0bb0c6d654f (commit) from 6c73505ca244e78dfc6557fe69387381d2e81916 (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 +++++++ milena/mln/value/builtin/floatings.hh | 19 +++++++++++++--- milena/tests/value/builtin/floatings.cc | 34 +++++++++++++++++++++++------- 3 files changed, 49 insertions(+), 12 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

Re: [Olena-patches] [Olena] #247: mln_min() of a floating type is not the effective minimum of the range value
by Olena Trac 28 Nov '11

28 Nov '11

#247: mln_min() of a floating type is not the effective minimum of the range value ----------------------+----------------------------------------------------- Reporter: lazzara | Owner: lazzara Type: defect | Status: new Priority: critical | Milestone: Component: Milena | Version: 2.0 Keywords: | ----------------------+----------------------------------------------------- Changes (by lazzara): * owner: Olena Team => lazzara * reporter: David Coeurjolly and Julien Marquegnies => lazzara Comment: Patch 7876a2ce362a03e89fc494def140d0bb0c6d654f should fix that issue. We are testing it on our buildfarm. If it is fine, it will be integrated in the 'next' branch. -- Ticket URL: <https://trac.lrde.org/olena/ticket/247#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

branch fix-min-float created: olena-2.0-18-g1b01c2d
by git＠lrde.epita.fr 28 Nov '11

28 Nov '11

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 fix-min-float has been created at 1b01c2d8ec3d4b8db867dc52274777b8d1620c21 (commit) - Log ----------------------------------------------------------------- 1b01c2d mln/value/builtin/floatings.hh: Fix invalid minimum value for builtin floating types. (ticket #247) ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-18-g1b01c2d mln/value/builtin/floatings.hh: Fix invalid minimum value for builtin floating types. (ticket #247)
by Guillaume Lazzara 28 Nov '11

28 Nov '11

--- milena/ChangeLog | 5 +++++ milena/mln/value/builtin/floatings.hh | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c8c67db..8696d58 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2011-11-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/value/builtin/floatings.hh: Fix invalid minimum value for + builtin floating types. (ticket #247) + 2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration. diff --git a/milena/mln/value/builtin/floatings.hh b/milena/mln/value/builtin/floatings.hh index e30e949..89e8007 100644 --- a/milena/mln/value/builtin/floatings.hh +++ b/milena/mln/value/builtin/floatings.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -75,7 +76,12 @@ namespace mln static float min() { - static const float min_ = mln::value::internal::limits<float>::min(); + // NOTE: limits<float>::min() returns the minimum positive + // value. However, in Milena, min() means the minimum value of the + // possible range value, i.e., the lowest negative + // value. Since float has a symetric range value, we can + // safely use -MAX. + static const float min_ = - mln::value::internal::limits<float>::max(); return min_; } static float max() @@ -114,7 +120,12 @@ namespace mln static double min() { - static const double min_ = mln::value::internal::limits<double>::min(); + // NOTE: limits<double>::min() returns the minimum positive + // value. However, in Milena, min() means the minimum value of + // the possible range value, i.e., the lowest negative + // value. Since double has a symetric range value, we can + // safely use -MAX. + static const double min_ = - mln::value::internal::limits<double>::max(); return min_; } static double max() -- 1.7.2.5

1 0

olena-2.0-30-g77f1a73 Fix copyright section name
by Guillaume Lazzara 28 Nov '11

28 Nov '11

--- scribo/doc/mainpage.dox | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scribo/doc/mainpage.dox b/scribo/doc/mainpage.dox index ffe2185..a81f335 100644 --- a/scribo/doc/mainpage.dox +++ b/scribo/doc/mainpage.dox @@ -58,7 +58,7 @@ look at the following files : Take also a look at the <a href="modules.html">Modules section</a>. -\section copyright Copyright and License +\section Copyright and License Copyright (C) 2011 EPITA Research and Development (LRDE) -- 1.7.2.5

1 0

olena-2.0-29-g5f8d131 Regen auto-generated makefiles
by Guillaume Lazzara 28 Nov '11

28 Nov '11

--- milena/headers.mk | 3 +++ milena/tests/unit_test/unit-tests.mk | 6 ++++++ scribo/headers.mk | 12 +++++++++--- scribo/tests/unit_test/unit-tests.mk | 24 ++++++++++++++++++------ 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/milena/headers.mk b/milena/headers.mk index c3d75ab..3db8362 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -33,6 +33,7 @@ mln/accu/math/all.hh \ mln/accu/math/count.hh \ mln/accu/math/essential.hh \ mln/accu/math/sum.hh \ +mln/accu/math/sumpow.hh \ mln/accu/max_site.hh \ mln/accu/nil.hh \ mln/accu/p.hh \ @@ -606,6 +607,8 @@ mln/geom/all.hh \ mln/geom/bbox.hh \ mln/geom/chamfer.hh \ mln/geom/complex_geometry.hh \ +mln/geom/crop.hh \ +mln/geom/crop_without_localization.hh \ mln/geom/delta.hh \ mln/geom/essential.hh \ mln/geom/horizontal_symmetry.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 2519bd6..9b496ca 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -125,6 +125,7 @@ mln_accu_math_count \ mln_accu_math_essential \ mln_accu_math_inf \ mln_accu_math_sum \ +mln_accu_math_sumpow \ mln_accu_math_sup \ mln_accu_max_site \ mln_accu_nil \ @@ -720,6 +721,8 @@ mln_geom_all \ mln_geom_bbox \ mln_geom_chamfer \ mln_geom_complex_geometry \ +mln_geom_crop \ +mln_geom_crop_without_localization \ mln_geom_delta \ mln_geom_essential \ mln_geom_horizontal_symmetry \ @@ -1452,6 +1455,7 @@ mln_accu_math_count_SOURCES = mln_accu_math_count.cc mln_accu_math_essential_SOURCES = mln_accu_math_essential.cc mln_accu_math_inf_SOURCES = mln_accu_math_inf.cc mln_accu_math_sum_SOURCES = mln_accu_math_sum.cc +mln_accu_math_sumpow_SOURCES = mln_accu_math_sumpow.cc mln_accu_math_sup_SOURCES = mln_accu_math_sup.cc mln_accu_max_site_SOURCES = mln_accu_max_site.cc mln_accu_nil_SOURCES = mln_accu_nil.cc @@ -2047,6 +2051,8 @@ mln_geom_all_SOURCES = mln_geom_all.cc mln_geom_bbox_SOURCES = mln_geom_bbox.cc mln_geom_chamfer_SOURCES = mln_geom_chamfer.cc mln_geom_complex_geometry_SOURCES = mln_geom_complex_geometry.cc +mln_geom_crop_SOURCES = mln_geom_crop.cc +mln_geom_crop_without_localization_SOURCES = mln_geom_crop_without_localization.cc mln_geom_delta_SOURCES = mln_geom_delta.cc mln_geom_essential_SOURCES = mln_geom_essential.cc mln_geom_horizontal_symmetry_SOURCES = mln_geom_horizontal_symmetry.cc diff --git a/scribo/headers.mk b/scribo/headers.mk index f636d04..1fd5eee 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -5,14 +5,20 @@ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ scribo/binarization/global_threshold_auto.hh \ -scribo/binarization/internal/compute_sauvola_threshold.hh \ +scribo/binarization/internal/compute_local_threshold.hh \ scribo/binarization/internal/first_pass_functor.hh \ -scribo/binarization/internal/sauvola_debug.hh \ +scribo/binarization/internal/local_threshold_debug.hh \ +scribo/binarization/internal/niblack_formula.hh \ +scribo/binarization/internal/sauvola_formula.hh \ scribo/binarization/local_threshold.hh \ +scribo/binarization/niblack.hh \ +scribo/binarization/niblack_threshold.hh \ +scribo/binarization/otsu.hh \ +scribo/binarization/otsu_threshold.hh \ scribo/binarization/sauvola.hh \ scribo/binarization/sauvola_ms.hh \ scribo/binarization/sauvola_ms_split.hh \ -scribo/binarization/sauvola_threshold_image.hh \ +scribo/binarization/sauvola_threshold.hh \ scribo/canvas/integral_browsing.hh \ scribo/convert/from_base64.hh \ scribo/convert/from_qimage.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 667bffa..0318303 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -226,14 +226,20 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ -scribo_binarization_internal_compute_sauvola_threshold \ +scribo_binarization_internal_compute_local_threshold \ scribo_binarization_internal_first_pass_functor \ -scribo_binarization_internal_sauvola_debug \ +scribo_binarization_internal_local_threshold_debug \ +scribo_binarization_internal_niblack_formula \ +scribo_binarization_internal_sauvola_formula \ scribo_binarization_local_threshold \ +scribo_binarization_niblack \ +scribo_binarization_niblack_threshold \ +scribo_binarization_otsu \ +scribo_binarization_otsu_threshold \ scribo_binarization_sauvola \ scribo_binarization_sauvola_ms \ scribo_binarization_sauvola_ms_split \ -scribo_binarization_sauvola_threshold_image \ +scribo_binarization_sauvola_threshold \ scribo_canvas_integral_browsing \ scribo_convert_to_base64 \ scribo_core_all \ @@ -475,14 +481,20 @@ scribo_all_SOURCES = scribo_all.cc scribo_binarization_all_SOURCES = scribo_binarization_all.cc scribo_binarization_global_threshold_SOURCES = scribo_binarization_global_threshold.cc scribo_binarization_global_threshold_auto_SOURCES = scribo_binarization_global_threshold_auto.cc -scribo_binarization_internal_compute_sauvola_threshold_SOURCES = scribo_binarization_internal_compute_sauvola_threshold.cc +scribo_binarization_internal_compute_local_threshold_SOURCES = scribo_binarization_internal_compute_local_threshold.cc scribo_binarization_internal_first_pass_functor_SOURCES = scribo_binarization_internal_first_pass_functor.cc -scribo_binarization_internal_sauvola_debug_SOURCES = scribo_binarization_internal_sauvola_debug.cc +scribo_binarization_internal_local_threshold_debug_SOURCES = scribo_binarization_internal_local_threshold_debug.cc +scribo_binarization_internal_niblack_formula_SOURCES = scribo_binarization_internal_niblack_formula.cc +scribo_binarization_internal_sauvola_formula_SOURCES = scribo_binarization_internal_sauvola_formula.cc scribo_binarization_local_threshold_SOURCES = scribo_binarization_local_threshold.cc +scribo_binarization_niblack_SOURCES = scribo_binarization_niblack.cc +scribo_binarization_niblack_threshold_SOURCES = scribo_binarization_niblack_threshold.cc +scribo_binarization_otsu_SOURCES = scribo_binarization_otsu.cc +scribo_binarization_otsu_threshold_SOURCES = scribo_binarization_otsu_threshold.cc scribo_binarization_sauvola_SOURCES = scribo_binarization_sauvola.cc scribo_binarization_sauvola_ms_SOURCES = scribo_binarization_sauvola_ms.cc scribo_binarization_sauvola_ms_split_SOURCES = scribo_binarization_sauvola_ms_split.cc -scribo_binarization_sauvola_threshold_image_SOURCES = scribo_binarization_sauvola_threshold_image.cc +scribo_binarization_sauvola_threshold_SOURCES = scribo_binarization_sauvola_threshold.cc scribo_canvas_integral_browsing_SOURCES = scribo_canvas_integral_browsing.cc scribo_convert_to_base64_SOURCES = scribo_convert_to_base64.cc scribo_core_all_SOURCES = scribo_core_all.cc -- 1.7.2.5

1 0

olena-2.0-28-g69c3a36 Cleanup Makefiles
by Guillaume Lazzara 28 Nov '11

28 Nov '11

--- Makefile.am | 11 ++++++++--- doc/Makefile.am | 25 +++++++++++++++---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 677a9c3..ef6090a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = build-aux doc external milena +SUBDIRS = build-aux external milena if ENABLE_SWILENA SUBDIRS += swilena @@ -27,6 +27,11 @@ if ENABLE_SCRIBO SUBDIRS += scribo endif ENABLE_SCRIBO +# We rely on Automake to ensure that the documentions are generated in +# the right order. Here, we make sure that the general documentation +# will be generated after milena's and scribo'd documentation. +SUBDIRS += doc + # Target shortcuts delegating the actual action to milena/Makefile. LOCAL_RECURSIVE_TARGETS = pretty-check tests $(LOCAL_RECURSIVE_TARGETS): diff --git a/doc/Makefile.am b/doc/Makefile.am index 099b497..8a45e4e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -35,9 +35,6 @@ TEXI2DVI_FLAGS += \ -I $(srcdir) -I $(srcdir)/outputs -I $(srcdir)/outputs/split \ -I $(srcdir)/img -I $(srcdir)/examples/split -# Additional files for LaTeX compilations. -DOC_PACKAGES = doxyfuns.sty milena.sty - # ----------------------- # # User Reference Manual. # @@ -55,27 +52,38 @@ DOXYFILE_USER = Doxyfile_user # Images -REFMAN_IMAGES = $(srcdir)/images/olena_layers.png -EXTRA_DIST = $(REFMAN_IMAGES) +REFMAN_IMAGES = \ + $(srcdir)/images/olena_layers.png \ + $(srcdir)/images/logo.jpg + +EXTRA_DIST = \ + $(REFMAN_IMAGES) \ + $(srcdir)/images/olena_layers.svg # Documentation content REFMAN_deps = $(srcdir)/footer.html \ $(srcdir)/header.html \ $(srcdir)/doxygen.css \ $(srcdir)/mainpage.dox \ + $(srcdir)/about.dox \ $(srcdir)/DoxygenLayout.xml \ $(srcdir)/modules_list.dox \ $(srcdir)/olena.bib \ + $(srcdir)/lrde.bib \ + $(srcdir)/doc.bib \ $(srcdir)/contributors.dox \ $(srcdir)/bibliography.dox \ $(srcdir)/license.dox \ $(srcdir)/license_commercial.dox \ $(srcdir)/online_resources.dox \ $(srcdir)/get_sources.dox \ + $(srcdir)/subdoc_footer.html \ contributors.html \ lrde_olena.html \ $(REFMAN_IMAGES) + + # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. # @@ -142,13 +150,13 @@ contributors.html: $(top_srcdir)/AUTHORS ## Bibliography. ## ## -------------- ## -# Warning: also generate lrde_olena.cite +# Warning: also generates lrde_olena.cite lrde_olena.bib: bib2bib -s plain -oc lrde_olena.cite -ob lrde_olena.bib -c \ 'project = "Image" or project = "Olena"' \ -s year -r $(srcdir)/lrde.bib -# Warning: also generate lrde_olena_bib.html +# Warning: also generates lrde_olena_bib.html lrde_olena.html: lrde_olena.bib bibtex2html -s plain -nokeywords -citefile lrde_olena.cite \ -noabstract -nofooter -labelname -nodoc -linebreak -nf urllrde PDF lrde_olena.bib @@ -163,11 +171,8 @@ MAINTAINERCLEANFILES += lrde_olena.cite \ ## Cleaning. ## ## ---------- ## -MAINTAINERCLEANFILES += $(dist_pdf_DATA) - maintainer-clean-local: -rm -rf $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) - -rm -rf $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) -for d in $(DATA_html_dirs); do \ rm -rf $$d.tmp $(srcdir)/$$d; \ done -- 1.7.2.5

1 0

olena-2.0-27-gd821327 Move logo
by Guillaume Lazzara 28 Nov '11

28 Nov '11

--- doc/Doxyfile.in | 2 +- doc/{ => images}/logo.jpg | Bin 7477 -> 7477 bytes milena/doc/Doxyfile.in | 2 +- scribo/doc/Doxyfile.in | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename doc/{ => images}/logo.jpg (100%) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 777a6ac..51b712a 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -22,7 +22,7 @@ PROJECT_NAME = "Olena" PROJECT_NUMBER = "@PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" -PROJECT_LOGO = @top_srcdir@/doc/logo.jpg +PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/doc/logo.jpg b/doc/images/logo.jpg similarity index 100% rename from doc/logo.jpg rename to doc/images/logo.jpg diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 5cbaaef..b695b77 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -23,7 +23,7 @@ PROJECT_NAME = "Milena" PROJECT_NUMBER = "@PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" -PROJECT_LOGO = @top_srcdir@/doc/logo.jpg +PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 4207145..1986828 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -22,7 +22,7 @@ PROJECT_NAME = "Scribo" PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" -PROJECT_LOGO = @top_srcdir@/doc/logo.jpg +PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English -- 1.7.2.5

1 0