October 2010 - Olena-patches

last-svn-commit-498-g949f1cb Fix `link' name lookup in Scribo.
by Roland Levillain 20 Oct '10

20 Oct '10

* src/text_in_picture.cc: Help the C++ compiler not to mix up scribo::primitive::link with unistd.h's link(2). --- scribo/ChangeLog | 7 +++++++ scribo/src/text_in_picture.cc | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f9fc04..c4692cb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-10-20 Roland Levillain <roland(a)lrde.epita.fr> + + Fix `link' name lookup in Scribo. + + * src/text_in_picture.cc: Help the C++ compiler not to mix up + scribo::primitive::link with unistd.h's link(2). + 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in Scribo diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 8f530db..5be498a 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -334,7 +334,7 @@ int main(int argc, char* argv[]) /// linking potential components timer_.restart(); mln::util::couple<object_links<L>, object_links<L> > - links = link::left_right(filtered_components); + links = scribo::primitive::link::left_right(filtered_components); object_links<L>& left_link = links.first(); object_links<L>& right_link = links.second(); @@ -370,8 +370,8 @@ int main(int argc, char* argv[]) // Validating left and right links. timer_.restart(); - object_links<L> - merged_links = link::merge_double_link(left_link, right_link); + object_links<L> merged_links = + scribo::primitive::link::merge_double_link(left_link, right_link); t_ = timer_; std::cout << "Right/Left Validation. " << t_ << std::endl; -- 1.5.6.5

1 0

Re: [Olena-patches] [Olena] #43: Fix the initialization of all global constants.
by Olena Trac 18 Oct '10

18 Oct '10

#43: Fix the initialization of all global constants. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: defect | Status: reopened Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Description changed by levill_r: Old description: > * Use extern const ref, not static (really?) > * Move implementation into another file (e.g., `foo.hcc`) > * Provide a `globals.hcc` including all `.hcc` files (convenience > shortcut). > * Tell users (a entry in the FAQ would be useful) to include each > needed `.hcc` file '''once''' per program. New description: * Use extern const ref, not static (really?) * Move implementation into another file (e.g., `foo.hcc`) * Provide a `globals.hcc` including all `.hcc` files (convenience shortcut). * Tell users (a entry in the FAQ would be useful) to include each needed `.hcc` file '''once''' per program. Don't forget to grep the uses of macro `MLN_WO_GLOBAL_VARS` in the code. -- -- Ticket URL: <https://trac.lrde.org/olena/ticket/43#comment:6> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

branch exp/next-build-ok updated: last-svn-commit-491-g396cb06
by lazzara＠lrde.epita.fr 11 Oct '10

11 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 396cb06881fb4ce584e9c9fdfe3bd49ea2e565be (commit) from 6713b18ae5ff02fd54f2496881ccb1118c02f45c (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 ----------------------------------------------------------------- 396cb06 Fix namespace ambiguities. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 8 ++++++++ .../binarization/internal/first_pass_functor.hh | 6 +++--- .../scribo/binarization/sauvola_threshold_image.hh | 2 +- scribo/scribo/subsampling/integral_single_image.hh | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-491-g396cb06 Fix namespace ambiguities.
by Guillaume Lazzara 11 Oct '10

11 Oct '10

* scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola_threshold_image.hh, * scribo/subsampling/integral_single_image.hh: Add mln:: prefix. --- scribo/ChangeLog | 8 ++++++++ .../binarization/internal/first_pass_functor.hh | 6 +++--- .../scribo/binarization/sauvola_threshold_image.hh | 2 +- scribo/scribo/subsampling/integral_single_image.hh | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dc6c426..986678e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2010-10-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix namespace ambiguities. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola_threshold_image.hh, + * scribo/subsampling/integral_single_image.hh: Add mln:: prefix. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/core/line_info.hh: Make stats computation more robust diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index 92ccc55..694779f 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.hh @@ -126,9 +126,9 @@ namespace scribo t_p); # else value::int_u8 t_p; - convert::from_to(sauvola_threshold_formula(mean, stddev, - K_, - SCRIBO_DEFAULT_SAUVOLA_R), + mln::convert::from_to(sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R), t_p); # endif // SCRIBO_SAUVOLA_DEBUG diff --git a/scribo/scribo/binarization/sauvola_threshold_image.hh b/scribo/scribo/binarization/sauvola_threshold_image.hh index 0225d37..beaf06e 100644 --- a/scribo/scribo/binarization/sauvola_threshold_image.hh +++ b/scribo/scribo/binarization/sauvola_threshold_image.hh @@ -437,7 +437,7 @@ namespace scribo for(def::coord row = 0; row < nrows; ++row) for(def::coord col = 0; col < ncols; ++col) - convert::from_to( + mln::convert::from_to( internal::compute_sauvola_threshold(P(row, col), simple, squared, window_size, K, diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index 077172a..fc0c8dd 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -155,7 +155,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + v31*v31 + v32*v32 + v33*v33; - convert::from_to(local_sum / 9, *p_sub++); + mln::convert::from_to(local_sum / 9, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -193,7 +193,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + v31*v31 + v32*v32 + v33*v33; - convert::from_to(local_sum / 9, *p_sub++); + mln::convert::from_to(local_sum / 9, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -284,7 +284,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + v22, local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; - convert::from_to(local_sum / 4, *p_sub++); + mln::convert::from_to(local_sum / 4, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -319,7 +319,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + v22, local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; - convert::from_to(local_sum / 4, *p_sub++); + mln::convert::from_to(local_sum / 4, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; -- 1.5.6.5

1 0